From 540b71174bb30c4dd7cc61220c0d1239516ebea5 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Sat, 9 Nov 2024 21:01:00 +0800 Subject: [PATCH 1/3] SPEC 0: Bump minimum supported version to Python 3.11 --- .github/workflows/ci_tests.yaml | 10 +++++----- .github/workflows/ci_tests_legacy.yaml | 2 +- pyproject.toml | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index bcdd3d14304..2e1b5951f04 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -54,22 +54,22 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.10', '3.12'] + python-version: ['3.11', '3.12'] os: [ubuntu-latest, macos-latest, windows-latest] # Is it a draft Pull Request (true or false)? isDraft: - ${{ github.event.pull_request.draft }} - # Only run two jobs (Ubuntu + Python 3.10/3.12) for draft PRs + # Only run two jobs (Ubuntu + Python 3.11/3.12) for draft PRs exclude: - os: macos-latest isDraft: true - os: windows-latest isDraft: true - # Pair Python 3.10 with the minimum supported versions of NumPy, pandas, Xarray + # Pair Python 3.11 with the minimum supported versions of NumPy, pandas, Xarray # and Python 3.12 with the latest versions of NumPy, pandas, Xarray # Only install optional packages on Python 3.12 include: - - python-version: '3.10' + - python-version: '3.11' numpy-version: '1.24' pandas-version: '=2.0' xarray-version: '=2023.04' @@ -83,7 +83,7 @@ jobs: # The python-version here can't be the versions in the matrix.python-version # defined above. Otherwise, other jobs will be overridden by this one. - os: 'ubuntu-latest' - python-version: '3.11' # Can't be 3.10 or 3.12. + python-version: '3.11' # Can't be 3.11 or 3.12. numpy-version: '1.24' pandas-version: '' xarray-version: '' diff --git a/.github/workflows/ci_tests_legacy.yaml b/.github/workflows/ci_tests_legacy.yaml index 4b396125afd..12861728423 100644 --- a/.github/workflows/ci_tests_legacy.yaml +++ b/.github/workflows/ci_tests_legacy.yaml @@ -59,7 +59,7 @@ jobs: - conda-forge - nodefaults create-args: >- - python=3.10 + python=3.11 gmt=${{ matrix.gmt_version }} ghostscript<10 numpy diff --git a/pyproject.toml b/pyproject.toml index 8400da80625..83a326d4a8e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta" name = "pygmt" description = "A Python interface for the Generic Mapping Tools" readme = "README.md" -requires-python = ">=3.10" +requires-python = ">=3.11" authors = [{name = "The PyGMT Developers", email = "pygmt.team@gmail.com"}] keywords = [ "cartography", @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Education", "Topic :: Scientific/Engineering", "Topic :: Software Development :: Libraries", - "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "License :: OSI Approved :: BSD License", From 45176c5c7296566eefdd4dd272e1d980072af95f Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Thu, 19 Dec 2024 09:10:35 +0800 Subject: [PATCH 2/3] Update environment.yml --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 3b1bcd6a5e3..c9a9932f596 100644 --- a/environment.yml +++ b/environment.yml @@ -3,7 +3,7 @@ channels: - conda-forge - nodefaults dependencies: - - python>=3.10 + - python>=3.11 # Required dependencies - gmt=6.5.0 - ghostscript=10.04.0 From e74de009c7566235dcbeb6bf0247b8c3fa68187a Mon Sep 17 00:00:00 2001 From: actions-bot <58130806+actions-bot@users.noreply.github.com> Date: Thu, 19 Dec 2024 01:17:23 +0000 Subject: [PATCH 3/3] [format-command] fixes --- pygmt/tests/test_clib_put_vector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pygmt/tests/test_clib_put_vector.py b/pygmt/tests/test_clib_put_vector.py index 968e09bf87c..cad77ba59cf 100644 --- a/pygmt/tests/test_clib_put_vector.py +++ b/pygmt/tests/test_clib_put_vector.py @@ -126,7 +126,7 @@ def test_put_vector_string_dtype(): "2021-02-03T00:00:00", "2021-02-03T04:00:00", "2021-02-03T04:05:06", - f"{datetime.datetime.now(tz=datetime.timezone.utc).strftime('%Y-%m-%d')}T04:50:06", + f"{datetime.datetime.now(tz=datetime.UTC).strftime('%Y-%m-%d')}T04:50:06", ], ]