From 3a9fc2d4f1cea3e420718aa2e1bc354beddf1dbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Thu, 24 Feb 2022 07:10:04 +0100 Subject: [PATCH] Drop support for Python 3.6 (#545) --- ci/environment.yml | 2 +- ci/htcondor.sh | 1 + ci/pbs.sh | 1 + ci/pbs/Dockerfile | 2 +- ci/sge.sh | 1 + ci/sge/docker-compose.yml | 6 +++--- ci/slurm.sh | 1 + ci/slurm/Dockerfile | 2 +- docs/environment.yml | 2 +- docs/source/changelog.rst | 2 ++ setup.py | 2 +- 11 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ci/environment.yml b/ci/environment.yml index df4cacb2..6cb82537 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -3,7 +3,7 @@ channels: - conda-forge - defaults dependencies: - - python=3.6 + - python=3.7 - dask - distributed - flake8 diff --git a/ci/htcondor.sh b/ci/htcondor.sh index 142b5b34..ba422a51 100755 --- a/ci/htcondor.sh +++ b/ci/htcondor.sh @@ -7,6 +7,7 @@ function jobqueue_before_install { # start htcondor cluster cd ./ci/htcondor docker-compose pull + docker-compose build ./start-htcondor.sh cd - diff --git a/ci/pbs.sh b/ci/pbs.sh index 0e2dd7c8..074803e2 100644 --- a/ci/pbs.sh +++ b/ci/pbs.sh @@ -7,6 +7,7 @@ function jobqueue_before_install { # start pbs cluster cd ./ci/pbs docker-compose pull + docker-compose build ./start-pbs.sh cd - diff --git a/ci/pbs/Dockerfile b/ci/pbs/Dockerfile index 1367c8a1..8627ee72 100644 --- a/ci/pbs/Dockerfile +++ b/ci/pbs/Dockerfile @@ -30,7 +30,7 @@ RUN curl -o miniconda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-L bash miniconda.sh -f -b -p /opt/anaconda && \ /opt/anaconda/bin/conda clean -tipy && \ rm -f miniconda.sh -RUN conda install --yes -c conda-forge python=3.6 dask distributed flake8 pytest pytest-asyncio +RUN conda install --yes -c conda-forge python=3.7 dask distributed flake8 pytest pytest-asyncio # Copy entrypoint and other needed scripts COPY ./*.sh / diff --git a/ci/sge.sh b/ci/sge.sh index 1cef35ff..6830d029 100644 --- a/ci/sge.sh +++ b/ci/sge.sh @@ -7,6 +7,7 @@ function jobqueue_before_install { # start sge cluster cd ./ci/sge docker-compose pull + docker-compose build ./start-sge.sh cd - diff --git a/ci/sge/docker-compose.yml b/ci/sge/docker-compose.yml index daca40c2..024ba41e 100644 --- a/ci/sge/docker-compose.yml +++ b/ci/sge/docker-compose.yml @@ -8,7 +8,7 @@ services: context: . target: master args: - PYTHON_VERSION: 3.6 + PYTHON_VERSION: 3.7 container_name: sge_master hostname: sge_master #network_mode: host @@ -22,7 +22,7 @@ services: context: . target: slave args: - PYTHON_VERSION: 3.6 + PYTHON_VERSION: 3.7 container_name: slave_one hostname: slave_one #network_mode: host @@ -40,7 +40,7 @@ services: context: . target: slave args: - PYTHON_VERSION: 3.6 + PYTHON_VERSION: 3.7 container_name: slave_two hostname: slave_two #network_mode: host diff --git a/ci/slurm.sh b/ci/slurm.sh index 76320394..43d5e824 100644 --- a/ci/slurm.sh +++ b/ci/slurm.sh @@ -7,6 +7,7 @@ function jobqueue_before_install { # start slurm cluster cd ./ci/slurm docker-compose pull + docker-compose build ./start-slurm.sh cd - diff --git a/ci/slurm/Dockerfile b/ci/slurm/Dockerfile index af509449..ac1bbb26 100644 --- a/ci/slurm/Dockerfile +++ b/ci/slurm/Dockerfile @@ -7,7 +7,7 @@ RUN curl -o miniconda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-L /opt/anaconda/bin/conda clean -tipy && \ rm -f miniconda.sh ENV PATH /opt/anaconda/bin:$PATH -RUN conda install --yes -c conda-forge python=3.6 dask distributed flake8 pytest pytest-asyncio +RUN conda install --yes -c conda-forge python=3.7 dask distributed flake8 pytest pytest-asyncio ENV LC_ALL en_US.UTF-8 diff --git a/docs/environment.yml b/docs/environment.yml index 78a66cb2..f3e45acc 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -2,7 +2,7 @@ name: dask-jobqueue-docs channels: - conda-forge dependencies: - - python=3.6 + - python=3.7 - distributed - numpydoc - ipython diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 74f8ecb0..42d13d74 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -4,6 +4,8 @@ Changelog Development version ------------------- +- Drop support for Python 3.6 (:pr:`279`) + 0.7.3 / 2021-07-22 ------------------ diff --git a/setup.py b/setup.py index 0d8b62f6..a8d4a6c7 100755 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ cmdclass=versioneer.get_cmdclass(), description="Deploy Dask on job queuing systems like PBS, Slurm, SGE or LSF", url="https://jobqueue.dask.org", - python_requires=">=3.6", + python_requires=">=3.7", license="BSD 3-Clause", packages=["dask_jobqueue"], include_package_data=True,