From 6375578587324654fdf41594cd83381a8c3e9c5c Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Wed, 19 Jun 2024 21:58:48 -0400 Subject: [PATCH 1/4] update setup to remove py37 and add py312 --- CHANGES.rst | 3 ++- setup.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 0baef25..7e5e841 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,8 @@ Changes `Unreleased `_ ========================================================================================== -* Nothing new for the moment. +* Drop Python 3.7. +* Add Python 3.12. .. _changes_0.4.5: diff --git a/setup.py b/setup.py index 5a14ce4..69fa71e 100644 --- a/setup.py +++ b/setup.py @@ -20,11 +20,11 @@ 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - '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 :: Only', 'Topic :: Scientific/Engineering :: Atmospheric Science', ] @@ -42,5 +42,5 @@ include_package_data=True, zip_safe=False, install_requires=reqs, - python_requires=">=3.7,<3.12", + python_requires=">=3.8,<3.13", ) From bf5d1f9c4d5424f8b9cdd8b66778b78996effb80 Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Wed, 19 Jun 2024 22:03:09 -0400 Subject: [PATCH 2/4] add Py312 to CI --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 63a781c..bbaeb6a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,6 +37,7 @@ jobs: - "3.9" - "3.10" - "3.11" + - "3.12" test-case: [tests] include: - os: ubuntu-20.04 From cedcaed62446b03e7d69a1ef173a38a43601bcd0 Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Wed, 19 Jun 2024 22:15:19 -0400 Subject: [PATCH 3/4] add setuptools required explicitly for py312 --- .github/workflows/tests.yml | 1 + requirements-sys.txt | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 requirements-sys.txt diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bbaeb6a..6c851bf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -56,6 +56,7 @@ jobs: python-version: "${{ matrix.python-version }}" - name: Install Dependencies and threddsclient run: | + pip install -r requirements-sys.txt pip install -r requirements.txt pip install -r requirements-dev.txt python setup.py install diff --git a/requirements-sys.txt b/requirements-sys.txt new file mode 100644 index 0000000..5d885ae --- /dev/null +++ b/requirements-sys.txt @@ -0,0 +1,2 @@ +pip>=23 +setuptools>=65.5.1 From 6a1efe7ad845786b1e40124df6fdccbf33b2f1fb Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Wed, 19 Jun 2024 22:17:00 -0400 Subject: [PATCH 4/4] ignore unsupported python setup --- requirements-sys.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-sys.txt b/requirements-sys.txt index 5d885ae..14099da 100644 --- a/requirements-sys.txt +++ b/requirements-sys.txt @@ -1,2 +1,2 @@ -pip>=23 -setuptools>=65.5.1 +pip>=23; python_version>="3.8" +setuptools>=65.5.1; python_version>="3.8"