Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
matrix:
java: [8, 11]
os: [ubuntu-latest, windows-latest]
python: ["3.7", "3.8", "3.9"]
python: ["3.8", "3.9", "3.10"]
steps:
- uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
matrix:
java: [8, 11]
os: [ubuntu-latest, windows-latest]
python: ["3.7", "3.8", "3.9"]
python: ["3.8", "3.9", "3.10"]
steps:
- uses: actions/checkout@v2
- name: Cache local Maven repository
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2

python:
version: 3.7
version: 3.8
install:
- method: setuptools
path: .
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,11 @@ If you want to have the newest (unreleased) `dask-sql` version or if you plan to

Create a new conda environment and install the development environment:

conda env create -f continuous_integration/environment-3.8-jdk11-dev.yaml
conda env create -f continuous_integration/environment-3.9-jdk11-dev.yaml

It is not recommended to use `pip` instead of `conda` for the environment setup.
If you however need to, make sure to have Java (jdk >= 8) and maven installed and correctly setup before continuing.
Have a look into `environment-3.8-jdk11-dev.yaml` for the rest of the development environment.
Have a look into `environment-3.9-jdk11-dev.yaml` for the rest of the development environment.

After that, you can install the package in development mode

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies:
- pytest-cov>=2.10.1
- pytest-xdist
- pytest>=6.0.1
- python=3.7
- python=3.10
- scikit-learn>=0.24.2
- sphinx>=3.2.1
- tpot>=0.11.7
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies:
- pytest-cov>=2.10.1
- pytest-xdist
- pytest>=6.0.1
- python=3.7
- python=3.10
- scikit-learn>=0.24.2
- sphinx>=3.2.1
- tpot>=0.11.7
Expand Down
2 changes: 1 addition & 1 deletion continuous_integration/recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ requirements:
- maven >=3.6.0
host:
- pip
- python
- python >=3.8
run:
- python
- dask >=2021.11.1
Expand Down
2 changes: 1 addition & 1 deletion docker/conda.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
python>=3.7
python>=3.8
dask>=2021.11.1
pandas>=1.0.0 # below 1.0, there were no nullable ext. types
jpype1>=1.0.2
Expand Down
4 changes: 2 additions & 2 deletions docs/pages/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ Create a new conda environment and install the development environment:

.. code-block:: bash

conda env create -f continuous_integration/environment-3.8-jdk11-dev.yaml
conda env create -f continuous_integration/environment-3.9-jdk11-dev.yaml

It is not recommended to use ``pip`` instead of ``conda``.
If you however need to, make sure to have Java (jdk >= 8) and maven installed and correctly setup before continuing.
Have a look into ``environment-3.8-jdk11-dev.yaml`` for the rest of the development environment.
Have a look into ``environment-3.9-jdk11-dev.yaml`` for the rest of the development environment.

After that, you can install the package in development mode

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def run(self):
long_description_content_type="text/markdown",
packages=find_packages(include=["dask_sql", "dask_sql.*"]),
package_data={"dask_sql": ["jar/DaskSQL.jar"]},
python_requires=">=3.6",
python_requires=">=3.8",
setup_requires=sphinx_requirements,
install_requires=[
"dask[dataframe,distributed]>=2021.11.1",
Expand Down