From 52983545c79eb0b3213511ced84a4831021cdfbc Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Fri, 10 Mar 2023 17:17:13 +0100 Subject: [PATCH] Drop Python 3.7 support. (#4797) --- .github/workflows/tests.yml | 6 +++--- conda_build/cli/main_render.py | 2 +- conda_build/skeletons/pypi.py | 2 +- news/4797-drop-python37-support | 19 +++++++++++++++++++ setup.py | 2 -- tests/test_index.py | 1 - 6 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 news/4797-drop-python37-support diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ab9ef39801..da7637be2a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -62,7 +62,7 @@ jobs: fail-fast: false matrix: # test all lower versions (w/ stable conda) and upper version (w/ canary conda) - python-version: ['3.7', '3.8', '3.9'] + python-version: ['3.8', '3.9'] conda-version: [release] test-type: [serial, parallel] include: @@ -167,7 +167,7 @@ jobs: fail-fast: false matrix: # test lower version (w/ stable conda) and upper version (w/ canary conda) - python-version: ['3.7'] + python-version: ['3.8'] conda-version: [release] test-type: [serial, parallel] include: @@ -279,7 +279,7 @@ jobs: fail-fast: false matrix: # test lower version (w/ stable conda) and upper version (w/ canary conda) - python-version: ['3.7'] + python-version: ['3.8'] conda-version: [release] test-type: [serial, parallel] include: diff --git a/conda_build/cli/main_render.py b/conda_build/cli/main_render.py index b2280db449..72973a1802 100644 --- a/conda_build/cli/main_render.py +++ b/conda_build/cli/main_render.py @@ -143,7 +143,7 @@ def get_render_parser(): nargs=1, action=ParseYAMLArgument, help=('Variants to extend the build matrix. Must be a valid YAML instance, ' - 'such as "{python: [3.6, 3.7]}"')) + 'such as "{python: [3.8, 3.9]}"')) add_parser_channels(p) return p diff --git a/conda_build/skeletons/pypi.py b/conda_build/skeletons/pypi.py index 61f5baafb0..765751ef19 100644 --- a/conda_build/skeletons/pypi.py +++ b/conda_build/skeletons/pypi.py @@ -489,7 +489,7 @@ def add_parser(repos): action='store', default=default_python, help="""Version of Python to use to run setup.py. Default is %(default)s.""", - choices=['2.7', '3.5', '3.6', '3.7', '3.8'], + choices=['2.7', '3.5', '3.6', '3.7', '3.8', '3.9', '3.10', '3.11'], ) pypi.add_argument( diff --git a/news/4797-drop-python37-support b/news/4797-drop-python37-support new file mode 100644 index 0000000000..7f68466549 --- /dev/null +++ b/news/4797-drop-python37-support @@ -0,0 +1,19 @@ +### Enhancements + +* + +### Bug fixes + +* + +### Deprecations + +* Drop Python 3.7 support. (#4796) + +### Docs + +* + +### Other + +* diff --git a/setup.py b/setup.py index 355a64cc48..5ee01e6cf1 100755 --- a/setup.py +++ b/setup.py @@ -51,8 +51,6 @@ "Intended Audience :: Developers", "Operating System :: OS Independent", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10" diff --git a/tests/test_index.py b/tests/test_index.py index 990b9d18a7..4375cfe7b5 100644 --- a/tests/test_index.py +++ b/tests/test_index.py @@ -606,7 +606,6 @@ def _build_test_index(workdir): """ Copy repodata.json, packages to workdir for testing. """ - # Python 3.7 workaround "no dirs_exist_ok flag" index_hotfix_pkgs = join(here, "index_hotfix_pkgs") for path in os.scandir(index_hotfix_pkgs):