diff --git a/.github/workflows/test-upstream.yml b/.github/workflows/test-upstream.yml index bdd03dd61..77597d3c4 100644 --- a/.github/workflows/test-upstream.yml +++ b/.github/workflows/test-upstream.yml @@ -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: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 248e56773..0877a46a5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 9044b4c4c..582ddbeee 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,7 +1,7 @@ version: 2 python: - version: 3.7 + version: 3.8 install: - method: setuptools path: . diff --git a/README.md b/README.md index 02dc2c206..44e97c65a 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/continuous_integration/environment-3.7-jdk11-dev.yaml b/continuous_integration/environment-3.10-jdk11-dev.yaml similarity index 98% rename from continuous_integration/environment-3.7-jdk11-dev.yaml rename to continuous_integration/environment-3.10-jdk11-dev.yaml index 4c8ff4671..e58e00c87 100644 --- a/continuous_integration/environment-3.7-jdk11-dev.yaml +++ b/continuous_integration/environment-3.10-jdk11-dev.yaml @@ -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 diff --git a/continuous_integration/environment-3.7-jdk8-dev.yaml b/continuous_integration/environment-3.10-jdk8-dev.yaml similarity index 98% rename from continuous_integration/environment-3.7-jdk8-dev.yaml rename to continuous_integration/environment-3.10-jdk8-dev.yaml index ebfb4a172..4ad533e94 100644 --- a/continuous_integration/environment-3.7-jdk8-dev.yaml +++ b/continuous_integration/environment-3.10-jdk8-dev.yaml @@ -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 diff --git a/continuous_integration/recipe/meta.yaml b/continuous_integration/recipe/meta.yaml index ca97712f6..987641a6b 100644 --- a/continuous_integration/recipe/meta.yaml +++ b/continuous_integration/recipe/meta.yaml @@ -24,7 +24,7 @@ requirements: - maven >=3.6.0 host: - pip - - python + - python >=3.8 run: - python - dask >=2021.11.1 diff --git a/docker/conda.txt b/docker/conda.txt index 579d265c0..b008852cd 100644 --- a/docker/conda.txt +++ b/docker/conda.txt @@ -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 diff --git a/docs/pages/installation.rst b/docs/pages/installation.rst index 1c5b8f11b..4b95f13cb 100644 --- a/docs/pages/installation.rst +++ b/docs/pages/installation.rst @@ -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 diff --git a/setup.py b/setup.py index 29cb06787..14ca7bbdb 100755 --- a/setup.py +++ b/setup.py @@ -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",