From 2c4c40ebcbe34c32fcf11c6ab1669bda8b00f04d Mon Sep 17 00:00:00 2001 From: Ashley Smith Date: Wed, 27 Nov 2024 14:10:40 +0000 Subject: [PATCH 1/6] Test on different sets of python versions on each os --- .github/workflows/main.yml | 9 +++++++-- .github/workflows/test-latest.yml | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8343e20..0edfd51 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,8 +23,13 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] - runs-on: [ubuntu-22.04, macos-13, windows-2022] + include: + - os: ubuntu-24.04 + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] + - os: macos-14 + python-version: ["3.10", "3.11", "3.12"] + - os: windows-2022 + python-version: ["3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 diff --git a/.github/workflows/test-latest.yml b/.github/workflows/test-latest.yml index a3bd02a..fb6dbb8 100644 --- a/.github/workflows/test-latest.yml +++ b/.github/workflows/test-latest.yml @@ -13,8 +13,13 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] - runs-on: [ubuntu-latest, macos-latest, windows-latest] + include: + - os: ubuntu-latest + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] + - os: macos-latest + python-version: ["3.10", "3.11", "3.12"] + - os: windows-latest + python-version: ["3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 From fe3c5988be8b83ed3eb17feb282588f50e3aa709 Mon Sep 17 00:00:00 2001 From: Ashley Smith Date: Wed, 27 Nov 2024 14:28:43 +0000 Subject: [PATCH 2/6] Fix --- .github/workflows/main.yml | 2 +- .github/workflows/test-latest.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0edfd51..7c7090d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: checks: name: Check Python ${{ matrix.python-version }} on ${{ matrix.runs-on }} - runs-on: ${{ matrix.runs-on }} + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: diff --git a/.github/workflows/test-latest.yml b/.github/workflows/test-latest.yml index fb6dbb8..625a7e7 100644 --- a/.github/workflows/test-latest.yml +++ b/.github/workflows/test-latest.yml @@ -9,7 +9,7 @@ on: jobs: checks: name: Check Python ${{ matrix.python-version }} on ${{ matrix.runs-on }} - runs-on: ${{ matrix.runs-on }} + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: From b26115803dfbf733799741282efa3dd75f53ace0 Mon Sep 17 00:00:00 2001 From: Ashley Smith Date: Wed, 27 Nov 2024 14:39:52 +0000 Subject: [PATCH 3/6] Fix --- .github/workflows/main.yml | 14 +++++++++----- .github/workflows/test-latest.yml | 9 ++------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7c7090d..3d2622f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,13 +23,17 @@ jobs: strategy: fail-fast: false matrix: + os: ["ubuntu-24.04", "macos-14", "windows-2022"] + python-version: ["3.10", "3.11", "3.12"] include: - os: ubuntu-24.04 - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] - - os: macos-14 - python-version: ["3.10", "3.11", "3.12"] - - os: windows-2022 - python-version: ["3.10", "3.11", "3.12"] + python-version: 3.7 + - os: ubuntu-24.04 + python-version: 3.8 + - os: ubuntu-24.04 + python-version: 3.9 + - os: ubuntu-24.04 + python-version: 3.13 steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 diff --git a/.github/workflows/test-latest.yml b/.github/workflows/test-latest.yml index 625a7e7..bf141f1 100644 --- a/.github/workflows/test-latest.yml +++ b/.github/workflows/test-latest.yml @@ -13,13 +13,8 @@ jobs: strategy: fail-fast: false matrix: - include: - - os: ubuntu-latest - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] - - os: macos-latest - python-version: ["3.10", "3.11", "3.12"] - - os: windows-latest - python-version: ["3.10", "3.11", "3.12"] + os: ["ubuntu-24.04", "macos-14", "windows-2022"] + python-version: ["3.10", "3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 From 190037c269c44e421bdf4cba02f72afe3c4f26d9 Mon Sep 17 00:00:00 2001 From: Ashley Smith Date: Wed, 27 Nov 2024 14:45:28 +0000 Subject: [PATCH 4/6] Run same CI on weekly schedule --- .github/workflows/main.yml | 7 ++++--- .github/workflows/test-latest.yml | 30 ------------------------------ 2 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 .github/workflows/test-latest.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3d2622f..b6903da 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,6 +5,9 @@ on: pull_request: push: branches: [ staging, master ] + schedule: + # Weekly on Sunday + - cron: '0 0 * * 0' jobs: pre-commit: @@ -18,7 +21,7 @@ jobs: extra_args: --hook-stage manual --all-files checks: - name: Check Python ${{ matrix.python-version }} on ${{ matrix.runs-on }} + name: Check Python ${{ matrix.python-version }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -26,8 +29,6 @@ jobs: os: ["ubuntu-24.04", "macos-14", "windows-2022"] python-version: ["3.10", "3.11", "3.12"] include: - - os: ubuntu-24.04 - python-version: 3.7 - os: ubuntu-24.04 python-version: 3.8 - os: ubuntu-24.04 diff --git a/.github/workflows/test-latest.yml b/.github/workflows/test-latest.yml deleted file mode 100644 index bf141f1..0000000 --- a/.github/workflows/test-latest.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Test Latest - -on: - workflow_dispatch: - schedule: - # Weekly on Sunday - - cron: '0 0 * * 0' - -jobs: - checks: - name: Check Python ${{ matrix.python-version }} on ${{ matrix.runs-on }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: ["ubuntu-24.04", "macos-14", "windows-2022"] - python-version: ["3.10", "3.11", "3.12", "3.13"] - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - - name: Install package - run: python -m pip install .[test] - - name: Configure token access - run: | - viresclient set_token "https://vires.services/ows" ${{ secrets.VIRES_TOKEN_SWARM }} - viresclient set_default_server https://vires.services/ows - - name: Test package - run: python -m pytest -ra From 958deb33bff72a63b2b8cf24f9acf4bf4175fe6b Mon Sep 17 00:00:00 2001 From: Ashley Smith Date: Wed, 27 Nov 2024 14:57:08 +0000 Subject: [PATCH 5/6] Add one test on Python 3.7 --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b6903da..9cd2db2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,6 +29,8 @@ jobs: os: ["ubuntu-24.04", "macos-14", "windows-2022"] python-version: ["3.10", "3.11", "3.12"] include: + - os: ubuntu-22.04 + python-version: 3.7 - os: ubuntu-24.04 python-version: 3.8 - os: ubuntu-24.04 From ca87917d88585604276c1cdf05e7e8a526b6dae4 Mon Sep 17 00:00:00 2001 From: Ashley Smith Date: Wed, 27 Nov 2024 14:59:20 +0000 Subject: [PATCH 6/6] Adjust package metadata to update python versions --- pyproject.toml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3d4edae..5987cc9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,21 +17,22 @@ maintainers = [ license = { file = "LICENSE" } description = "A Python client for interacting with a VirES server" readme = "README.rst" -requires-python = ">=3.6" +requires-python = ">=3.7" classifiers = [ "License :: OSI Approved :: MIT License", "Topic :: Scientific/Engineering", "Intended Audience :: Science/Research", "Intended Audience :: Developers", "Operating System :: OS Independent", - "License :: OSI Approved :: MIT License", "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", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Development Status :: 5 - Production/Stable", ] dynamic = ["version"]