From f8c4c7379582346c26ac29dad3cf50b9e9d61cb2 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Wed, 28 Jul 2021 21:29:06 +0200 Subject: [PATCH] Drop python 3.6 support --- azure-pipelines.yml | 4 ---- conda_package/ci/linux_python3.6.yaml | 16 ---------------- conda_package/ci/osx_python3.6.yaml | 16 ---------------- conda_package/dev-spec.txt | 2 +- conda_package/recipe/conda_build_config.yaml | 1 - conda_package/setup.py | 1 - 6 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 conda_package/ci/linux_python3.6.yaml delete mode 100644 conda_package/ci/osx_python3.6.yaml diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f31e1fc6c..567a3ccf7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,8 +18,6 @@ jobs: vmImage: 'ubuntu-latest' strategy: matrix: - Python36: - python.version: '3.6' Python37: python.version: '3.7' Python38: @@ -137,8 +135,6 @@ jobs: vmImage: 'macOS-latest' strategy: matrix: - Python36: - python.version: '3.6' Python37: python.version: '3.7' Python38: diff --git a/conda_package/ci/linux_python3.6.yaml b/conda_package/ci/linux_python3.6.yaml deleted file mode 100644 index f6268dcfe..000000000 --- a/conda_package/ci/linux_python3.6.yaml +++ /dev/null @@ -1,16 +0,0 @@ -channel_sources: -- conda-forge,defaults -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -hdf5: -- 1.10.6 -libnetcdf: -- 4.8.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython diff --git a/conda_package/ci/osx_python3.6.yaml b/conda_package/ci/osx_python3.6.yaml deleted file mode 100644 index 0c0c08e3b..000000000 --- a/conda_package/ci/osx_python3.6.yaml +++ /dev/null @@ -1,16 +0,0 @@ -channel_sources: -- conda-forge,defaults -cxx_compiler: -- clangxx -cxx_compiler_version: -- '11' -hdf5: -- 1.10.6 -libnetcdf: -- 4.8.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython diff --git a/conda_package/dev-spec.txt b/conda_package/dev-spec.txt index 45edbb43f..376fd581d 100644 --- a/conda_package/dev-spec.txt +++ b/conda_package/dev-spec.txt @@ -2,7 +2,7 @@ # $ conda create --name --file # Base -python>=3.6 +python>=3.7 cartopy dask geometric_features>=0.1.12 diff --git a/conda_package/recipe/conda_build_config.yaml b/conda_package/recipe/conda_build_config.yaml index 17bcd0954..7cb4a20af 100644 --- a/conda_package/recipe/conda_build_config.yaml +++ b/conda_package/recipe/conda_build_config.yaml @@ -5,7 +5,6 @@ channel_targets: - conda-forge main python: - - 3.6 - 3.7 - 3.8 - 3.9 diff --git a/conda_package/setup.py b/conda_package/setup.py index 5d0fd819e..a51514014 100755 --- a/conda_package/setup.py +++ b/conda_package/setup.py @@ -53,7 +53,6 @@ 'Intended Audience :: Science/Research', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9',