From 11b1c177270f1705b30a50c03d7f79b356957abf Mon Sep 17 00:00:00 2001 From: EddyCMWF Date: Wed, 24 Apr 2024 12:05:31 +0100 Subject: [PATCH 01/10] quick fixes for setuptools --- setup.cfg | 3 +++ setup.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 64fb455..e56acf6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,6 @@ +[build-system] +requires = ["setuptools"] + [bdist_wheel] universal = 1 diff --git a/setup.py b/setup.py index 3a79127..964a2fa 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ def read(fname): return io.open(file_path, encoding="utf-8").read() -version = "0.6.1" +version = "0.6.3" setuptools.setup( From f4590ba1f5533faa2cf2a00e254f800b9d713df5 Mon Sep 17 00:00:00 2001 From: EddyCMWF Date: Wed, 24 Apr 2024 12:11:05 +0100 Subject: [PATCH 02/10] quick fixes for setuptools --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index e56acf6..f59ea39 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ -[build-system] -requires = ["setuptools"] +[options] +install_requires = ["setuptools"] [bdist_wheel] universal = 1 From 075e8513e850d7fe8ce510c9beffb0654e9ab930 Mon Sep 17 00:00:00 2001 From: EddyCMWF Date: Wed, 24 Apr 2024 13:12:03 +0100 Subject: [PATCH 03/10] quick fixes for setuptools --- setup.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index f59ea39..5c05632 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,6 @@ [options] -install_requires = ["setuptools"] +install_requires = + setuptools [bdist_wheel] universal = 1 From 8835a926b5e6741201818aabdd8626998198d950 Mon Sep 17 00:00:00 2001 From: EddyCMWF Date: Wed, 24 Apr 2024 13:18:07 +0100 Subject: [PATCH 04/10] using tox.ini instead --- setup.cfg | 6 +++--- tox.ini | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index 5c05632..72d493f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ -[options] -install_requires = - setuptools +# [options] +# install_requires = +# setuptools [bdist_wheel] universal = 1 diff --git a/tox.ini b/tox.ini index ee8bfcc..96b8768 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ usedevelop = true commands = pytest -v --pep8 --mccabe --cov=cdsapi --cov-report=html --cache-clear {posargs} [testenv:deps] -deps = +deps = setuptools commands = python setup.py test From 9bfe97f1aacd30cd3978cbd78aa7df9f1e1b328d Mon Sep 17 00:00:00 2001 From: EddyCMWF Date: Wed, 24 Apr 2024 13:22:16 +0100 Subject: [PATCH 05/10] setuptools in actions --- .github/workflows/check-and-publish.yml | 1 + setup.cfg | 4 ---- setup.py | 2 +- tox.ini | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check-and-publish.yml b/.github/workflows/check-and-publish.yml index 5af80f8..517c091 100644 --- a/.github/workflows/check-and-publish.yml +++ b/.github/workflows/check-and-publish.yml @@ -56,6 +56,7 @@ jobs: CDSAPI_URL: https://cds.climate.copernicus.eu/api/v2 CDSAPI_KEY: ${{ secrets.CDSAPI_KEY }} run: | + pip install setuptools python setup.py develop pip install pytest pytest diff --git a/setup.cfg b/setup.cfg index 72d493f..64fb455 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,3 @@ -# [options] -# install_requires = -# setuptools - [bdist_wheel] universal = 1 diff --git a/setup.py b/setup.py index 964a2fa..3a79127 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ def read(fname): return io.open(file_path, encoding="utf-8").read() -version = "0.6.3" +version = "0.6.1" setuptools.setup( diff --git a/tox.ini b/tox.ini index 96b8768..ee8bfcc 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ usedevelop = true commands = pytest -v --pep8 --mccabe --cov=cdsapi --cov-report=html --cache-clear {posargs} [testenv:deps] -deps = setuptools +deps = commands = python setup.py test From d96db2ed9fe75a5369b46f8d47cde3df075b146c Mon Sep 17 00:00:00 2001 From: EddyCMWF Date: Wed, 24 Apr 2024 13:24:35 +0100 Subject: [PATCH 06/10] manually setting version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3a79127..964a2fa 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ def read(fname): return io.open(file_path, encoding="utf-8").read() -version = "0.6.1" +version = "0.6.3" setuptools.setup( From a75ddf09bf11e98c8cb2bcfff40a2032b1d846a8 Mon Sep 17 00:00:00 2001 From: EddyCMWF Date: Wed, 24 Apr 2024 13:59:56 +0100 Subject: [PATCH 07/10] platform --- .github/workflows/check-and-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-and-publish.yml b/.github/workflows/check-and-publish.yml index 517c091..af0bd9e 100644 --- a/.github/workflows/check-and-publish.yml +++ b/.github/workflows/check-and-publish.yml @@ -34,7 +34,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [windows-latest, ubuntu-latest, macos-latest] + platform: [windows-latest, ubuntu-latest, darwin-latest] python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] name: Python ${{ matrix.python-version }} on ${{ matrix.platform }} From c2800d50eecf88b14237719919846bf073b7745a Mon Sep 17 00:00:00 2001 From: EddyCMWF Date: Wed, 24 Apr 2024 14:03:45 +0100 Subject: [PATCH 08/10] platform --- .github/workflows/check-and-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-and-publish.yml b/.github/workflows/check-and-publish.yml index af0bd9e..517c091 100644 --- a/.github/workflows/check-and-publish.yml +++ b/.github/workflows/check-and-publish.yml @@ -34,7 +34,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [windows-latest, ubuntu-latest, darwin-latest] + platform: [windows-latest, ubuntu-latest, macos-latest] python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] name: Python ${{ matrix.python-version }} on ${{ matrix.platform }} From 3a2d03ef5134da750b50df0974af8dffba0bc489 Mon Sep 17 00:00:00 2001 From: EddyCMWF Date: Wed, 24 Apr 2024 14:05:57 +0100 Subject: [PATCH 09/10] skip macos 3.8 and 3.9 --- .github/workflows/check-and-publish.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/check-and-publish.yml b/.github/workflows/check-and-publish.yml index 517c091..8a527b3 100644 --- a/.github/workflows/check-and-publish.yml +++ b/.github/workflows/check-and-publish.yml @@ -36,6 +36,9 @@ jobs: matrix: platform: [windows-latest, ubuntu-latest, macos-latest] python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + exclude: + - platform: macos-latest + python-version: ["3.8", "3.9"] name: Python ${{ matrix.python-version }} on ${{ matrix.platform }} runs-on: ${{ matrix.platform }} From 33891a347f2495b11d4926282d1cc9c3e4cd67c6 Mon Sep 17 00:00:00 2001 From: EddyCMWF Date: Wed, 24 Apr 2024 14:09:04 +0100 Subject: [PATCH 10/10] skip macos 3.8 and 3.9 --- .github/workflows/check-and-publish.yml | 4 +++- setup.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-and-publish.yml b/.github/workflows/check-and-publish.yml index 8a527b3..c9e9469 100644 --- a/.github/workflows/check-and-publish.yml +++ b/.github/workflows/check-and-publish.yml @@ -38,7 +38,9 @@ jobs: python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] exclude: - platform: macos-latest - python-version: ["3.8", "3.9"] + python-version: "3.8" + - platform: macos-latest + python-version: "3.9" name: Python ${{ matrix.python-version }} on ${{ matrix.platform }} runs-on: ${{ matrix.platform }} diff --git a/setup.py b/setup.py index 964a2fa..7451df9 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ def read(fname): return io.open(file_path, encoding="utf-8").read() -version = "0.6.3" +version = "0.7.0" setuptools.setup(