From 189dcc0a37196c5dcc3e107959c18a1d569fd2fe Mon Sep 17 00:00:00 2001 From: thorbjoernl <51087536+thorbjoernl@users.noreply.github.com> Date: Tue, 20 Aug 2024 08:46:33 +0200 Subject: [PATCH 1/7] First attempt at multiple versions CI --- .github/workflows/CI-tests.yml | 19 +++++++++++++------ setup.cfg | 7 +++++++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI-tests.yml b/.github/workflows/CI-tests.yml index 3822bf6..ddf3a20 100644 --- a/.github/workflows/CI-tests.yml +++ b/.github/workflows/CI-tests.yml @@ -12,18 +12,25 @@ permissions: jobs: build: - runs-on: ubuntu-latest - + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + python-version: ['3.10', '3.11', '3.12'] + experimental: [false] + os: [ubuntu-22.04] steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: - python-version: "3.10" - - name: Install dependencies + python-version: ${{ matrix.python-version }} + cache: 'pip' + - name: Tox environment run: | - python -m pip install --upgrade pip + pip install --upgrade pip pip install tox + tox -e py --notest - name: Test with tox run: | tox -m test diff --git a/setup.cfg b/setup.cfg index 0f1028d..e03f2f6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -53,6 +53,13 @@ min_version = 4.0 env_list = mpy py310 + py311 + py312 +skip_missing_interpreters = True +isolated_build = True +requires = + setuptools >=40.6.0,<=60.9.3 + cython > 0.29.15 depends = [testenv] From 811f227730316adf4778ae71c949a3759af55e9b Mon Sep 17 00:00:00 2001 From: thorbjoernl <51087536+thorbjoernl@users.noreply.github.com> Date: Tue, 20 Aug 2024 08:51:35 +0200 Subject: [PATCH 2/7] 18 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index e03f2f6..f55489b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = aerovaldb -version = 0.0.18.dev0 +version = 0.0.18 author = Augustin Mortier, Thorbjørn Lundin, Heiko Klein author_email = Heiko.Klein@met.no description = aeroval database to communicate between pyaerocom and aeroval From 2b68ede2626dad1c8894da44f143a9c79b19e417 Mon Sep 17 00:00:00 2001 From: thorbjoernl <51087536+thorbjoernl@users.noreply.github.com> Date: Tue, 20 Aug 2024 08:52:03 +0200 Subject: [PATCH 3/7] 19 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index f55489b..9a04776 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = aerovaldb -version = 0.0.18 +version = 0.0.19.dev0 author = Augustin Mortier, Thorbjørn Lundin, Heiko Klein author_email = Heiko.Klein@met.no description = aeroval database to communicate between pyaerocom and aeroval From 1b680f4cc80a029f1229200581fb4fca2ffff0b0 Mon Sep 17 00:00:00 2001 From: thorbjoernl <51087536+thorbjoernl@users.noreply.github.com> Date: Tue, 20 Aug 2024 09:17:52 +0200 Subject: [PATCH 4/7] Code Review --- setup.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 9a04776..43467b6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,7 +22,7 @@ url = https://github.com/metno/aerovaldb [options] -python_version = >=3.9 +python_version = >=3.10 install_requires = importlib-metadata >= 3.6; python_version < "3.10" simplejson @@ -59,7 +59,6 @@ skip_missing_interpreters = True isolated_build = True requires = setuptools >=40.6.0,<=60.9.3 - cython > 0.29.15 depends = [testenv] From a1a2d7659d75737da47b38db0e8f7bf3238d6f49 Mon Sep 17 00:00:00 2001 From: thorbjoernl <51087536+thorbjoernl@users.noreply.github.com> Date: Tue, 20 Aug 2024 09:19:55 +0200 Subject: [PATCH 5/7] fix --- setup.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 43467b6..c55fa26 100644 --- a/setup.cfg +++ b/setup.cfg @@ -57,8 +57,7 @@ env_list = py312 skip_missing_interpreters = True isolated_build = True -requires = - setuptools >=40.6.0,<=60.9.3 +requires = setuptools >=40.6.0,<=60.9.3 depends = [testenv] From 36a3a3c8962fe83c4140356fd74ad9ca02a4eef5 Mon Sep 17 00:00:00 2001 From: thorbjoernl <51087536+thorbjoernl@users.noreply.github.com> Date: Tue, 20 Aug 2024 09:21:32 +0200 Subject: [PATCH 6/7] fix 2 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index c55fa26..2a9dc1d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -57,7 +57,7 @@ env_list = py312 skip_missing_interpreters = True isolated_build = True -requires = setuptools >=40.6.0,<=60.9.3 +requires = depends = [testenv] From fbef88cf3e3505cb36d672e5a78db696463b1f46 Mon Sep 17 00:00:00 2001 From: thorbjoernl <51087536+thorbjoernl@users.noreply.github.com> Date: Tue, 20 Aug 2024 10:19:19 +0200 Subject: [PATCH 7/7] 19 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 2a9dc1d..47e8c19 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = aerovaldb -version = 0.0.19.dev0 +version = 0.0.19 author = Augustin Mortier, Thorbjørn Lundin, Heiko Klein author_email = Heiko.Klein@met.no description = aeroval database to communicate between pyaerocom and aeroval