From a9fe4c41b3e107c0b5601aa535e2e118ddd30dd2 Mon Sep 17 00:00:00 2001 From: Bouwe Andela Date: Tue, 23 May 2023 11:39:09 +0200 Subject: [PATCH] Drop support for Python 3.8 --- .github/workflows/install-from-conda.yml | 10 +++++----- .github/workflows/install-from-condalock-file.yml | 4 ++-- .github/workflows/install-from-pypi.yml | 10 +++++----- .github/workflows/install-from-source.yml | 8 ++++---- .github/workflows/run-tests-comment.yml | 4 ++-- .github/workflows/run-tests-monitor.yml | 4 ++-- .github/workflows/run-tests.yml | 4 ++-- environment.yml | 2 +- setup.py | 1 - 9 files changed, 23 insertions(+), 24 deletions(-) diff --git a/.github/workflows/install-from-conda.yml b/.github/workflows/install-from-conda.yml index c8748df1b1..2ad481f6b4 100644 --- a/.github/workflows/install-from-conda.yml +++ b/.github/workflows/install-from-conda.yml @@ -15,12 +15,12 @@ name: Install from conda-forge # runs on a push on main and at the end of every day on: - # triggering on push without branch name will run tests everytime + # triggering on push without branch name will run tests every time # there is a push on any branch # turn it on only if needed push: branches: - - main + - main # run the test only if the PR is to main # turn it on if required # pull_request: @@ -35,9 +35,9 @@ jobs: strategy: matrix: # TODO add "3.11" once we have the package built - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.9", "3.10"] # fail-fast set to False allows all other tests - # in the worflow to run regardless of any fail + # in the workflow to run regardless of any fail fail-fast: false name: Linux Python ${{ matrix.python-version }} steps: @@ -75,7 +75,7 @@ jobs: runs-on: "macos-latest" strategy: matrix: - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.9", "3.10"] fail-fast: false name: OSX Python ${{ matrix.python-version }} steps: diff --git a/.github/workflows/install-from-condalock-file.yml b/.github/workflows/install-from-condalock-file.yml index 91a4281787..1e6adeaa0d 100644 --- a/.github/workflows/install-from-condalock-file.yml +++ b/.github/workflows/install-from-condalock-file.yml @@ -10,7 +10,7 @@ name: Conda-lock Install on: push: branches: - - main + - main # run the test only if the PR is to main # turn it on if required #pull_request: @@ -24,7 +24,7 @@ jobs: runs-on: "ubuntu-latest" strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11"] fail-fast: false name: Linux Python ${{ matrix.python-version }} steps: diff --git a/.github/workflows/install-from-pypi.yml b/.github/workflows/install-from-pypi.yml index a6c51d9e29..951cc787a2 100644 --- a/.github/workflows/install-from-pypi.yml +++ b/.github/workflows/install-from-pypi.yml @@ -20,7 +20,7 @@ on: # turn it on only if needed push: branches: - - main + - main # run the test only if the PR is to main # turn it on if required #pull_request: @@ -35,7 +35,7 @@ jobs: strategy: matrix: # TODO add "3.11" once we have the package built - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.9", "3.10"] # fail-fast set to False allows all other tests # in the workflow to run regardless of any fail fail-fast: false @@ -77,7 +77,7 @@ jobs: runs-on: "macos-latest" strategy: matrix: - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.9", "3.10"] fail-fast: false name: OSX Python ${{ matrix.python-version }} steps: @@ -103,8 +103,8 @@ jobs: run: pip install esmvalcore 2>&1 | tee pip_install_osx_artifacts_python_${{ matrix.python-version }}/install.txt - name: Verify installation shell: bash -l {0} - run: | - esmvaltool --help + run: | + esmvaltool --help esmvaltool version 2>&1 | tee pip_install_osx_artifacts_python_${{ matrix.python-version }}/version.txt - name: Upload artifacts if: ${{ always() }} # upload artifacts even if fail diff --git a/.github/workflows/install-from-source.yml b/.github/workflows/install-from-source.yml index 98fd6b6ec3..12f7f7c60a 100644 --- a/.github/workflows/install-from-source.yml +++ b/.github/workflows/install-from-source.yml @@ -13,12 +13,12 @@ name: Install from Source # runs on a push on main and at the end of every day on: - # triggering on push without branch name will run tests everytime + # triggering on push without branch name will run tests every time # there is a push on any branch # turn it on only if needed push: branches: - - main + - main # run the test only if the PR is to main # turn it on if required #pull_request: @@ -32,7 +32,7 @@ jobs: runs-on: "ubuntu-latest" strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11"] fail-fast: false name: Linux Python ${{ matrix.python-version }} steps: @@ -73,7 +73,7 @@ jobs: runs-on: "macos-latest" strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11"] fail-fast: false name: OSX Python ${{ matrix.python-version }} steps: diff --git a/.github/workflows/run-tests-comment.yml b/.github/workflows/run-tests-comment.yml index d5342971a7..2351203dc9 100644 --- a/.github/workflows/run-tests-comment.yml +++ b/.github/workflows/run-tests-comment.yml @@ -9,7 +9,7 @@ jobs: runs-on: "ubuntu-latest" strategy: matrix: - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.9", "3.10"] fail-fast: false name: Linux Python ${{ matrix.python-version }} if: ${{ github.event.issue.pull_request && github.event.comment.body == '@runGAtests' }} @@ -48,7 +48,7 @@ jobs: runs-on: "macos-latest" strategy: matrix: - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.9", "3.10"] fail-fast: false name: OSX Python ${{ matrix.python-version }} if: ${{ github.event.issue.pull_request && github.event.comment.body == '@runGAtests' }} diff --git a/.github/workflows/run-tests-monitor.yml b/.github/workflows/run-tests-monitor.yml index c49dd61ffa..e59bb79073 100644 --- a/.github/workflows/run-tests-monitor.yml +++ b/.github/workflows/run-tests-monitor.yml @@ -17,7 +17,7 @@ jobs: runs-on: "ubuntu-latest" strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11"] fail-fast: false name: Linux Python ${{ matrix.python-version }} steps: @@ -57,7 +57,7 @@ jobs: runs-on: "macos-latest" strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11"] fail-fast: false name: OSX Python ${{ matrix.python-version }} steps: diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 84801e3464..d7426ecbc0 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -34,7 +34,7 @@ jobs: runs-on: "ubuntu-latest" strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11"] fail-fast: false name: Linux Python ${{ matrix.python-version }} steps: @@ -72,7 +72,7 @@ jobs: runs-on: "macos-latest" strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11"] fail-fast: false name: OSX Python ${{ matrix.python-version }} steps: diff --git a/environment.yml b/environment.yml index b31578c785..26809991e1 100644 --- a/environment.yml +++ b/environment.yml @@ -34,7 +34,7 @@ dependencies: - psutil - py-cordex - pybtex - - python>=3.8 + - python>=3.9 - python-stratify - pyyaml - requests diff --git a/setup.py b/setup.py index 113bda3ebe..05d5a9ac55 100755 --- a/setup.py +++ b/setup.py @@ -216,7 +216,6 @@ def read_description(filename): 'Natural Language :: English', 'Operating System :: POSIX :: Linux', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11',