diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2737cc96da..4a05a93a5e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,35 +103,6 @@ quick_test_offline: - make develop extras=[aws,google,wdl] - TOIL_TEST_QUICK=True make test_offline threads="${TEST_THREADS}" -py38_appliance_build: - rules: - - if: $CI_PIPELINE_SOURCE == "schedule" - - if: $CI_COMMIT_TAG - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - - if: $CI_COMMIT_BRANCH =~ /.*-fix-ci/ - - if: $CI_COMMIT_BRANCH =~ /.*3\.8.*/ - stage: basic_tests - script: - - pwd - - python3.8 -m virtualenv venv && . venv/bin/activate && pip install -U pip wheel && pip install -U build && make prepare && pip install pycparser && make develop extras=[all] && pip install -r requirements-htcondor.txt - # This reads GITLAB_SECRET_FILE_QUAY_CREDENTIALS - - python setup_gitlab_docker.py - - make push_docker - -py38_main: - rules: - - if: $CI_PIPELINE_SOURCE == "schedule" - - if: $CI_COMMIT_TAG - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - - if: $CI_COMMIT_BRANCH =~ /.*-fix-ci/ - - if: $CI_COMMIT_BRANCH =~ /.*3\.8.*/ - stage: basic_tests - script: - - pwd - - python3.8 -m virtualenv venv && . venv/bin/activate && pip install -U pip wheel && make prepare && make develop extras=[all] && pip install -r requirements-htcondor.txt - - make test threads="${TEST_THREADS}" tests="src/toil/test/src src/toil/test/utils" - - TOIL_SKIP_DOCKER=true make test threads="${TEST_THREADS}" tests=src/toil/test/lib - py39_appliance_build: rules: - if: $CI_PIPELINE_SOURCE == "schedule" diff --git a/docker/Dockerfile.py b/docker/Dockerfile.py index 4c474ab2ea..219663cd32 100644 --- a/docker/Dockerfile.py +++ b/docker/Dockerfile.py @@ -25,8 +25,7 @@ pip = f'{python} -m pip' # Debian and Ubuntu don't package ensurepip by default so the python-venv package must be installed -python_packages = {'python3.8': ['python3.8-distutils', 'python3.8-venv'], - 'python3.9': ['python3.9-distutils', 'python3.9-venv'], +python_packages = {'python3.9': ['python3.9-distutils', 'python3.9-venv'], 'python3.10': ['python3.10-distutils', 'python3.10-venv'], 'python3.11': ['python3.11-distutils', 'python3.11-venv'], 'python3.12': ['python3.12-distutils', 'python3.12-venv']} diff --git a/setup.py b/setup.py index 6847542799..27e830de63 100755 --- a/setup.py +++ b/setup.py @@ -88,10 +88,10 @@ def run_setup(): 'Operating System :: MacOS :: MacOS X', 'Operating System :: POSIX', 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'Topic :: Scientific/Engineering', 'Topic :: Scientific/Engineering :: Bio-Informatics', 'Topic :: Scientific/Engineering :: Astronomy', @@ -101,7 +101,7 @@ def run_setup(): 'Topic :: System :: Distributed Computing', 'Topic :: Utilities'], license="Apache License v2.0", - python_requires=">=3.8", + python_requires=">=3.9", install_requires=install_requires, extras_require=extras_require, package_dir={'': 'src'},