Skip to content

Commit b84f6c6

Browse files
committed
Revert 30 commits
1 parent d0bad08 commit b84f6c6

36 files changed

+307
-740
lines changed

.github/workflows/benchmarks.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
# Install Micromamba with conda-forge dependencies
4747
- name: Setup Micromamba
48-
uses: mamba-org/[email protected].1
48+
uses: mamba-org/[email protected].0
4949
with:
5050
environment-name: pygmt
5151
condarc: |
@@ -87,8 +87,8 @@ jobs:
8787

8888
# Run the benchmark tests
8989
- name: Run benchmarks
90-
uses: CodSpeedHQ/action@v3.1.0
90+
uses: CodSpeedHQ/action@v3.0.1
9191
with:
9292
# 'bash -el -c' is needed to use the custom shell.
9393
# See https://github.com/CodSpeedHQ/action/issues/65.
94-
run: bash -el -c "python -c \"import pygmt; pygmt.show_versions()\"; PYGMT_USE_EXTERNAL_DISPLAY=false python -m pytest -r P --pyargs pygmt --codspeed --override-ini addopts='--verbose'"
94+
run: bash -el -c "python -c \"import pygmt; pygmt.show_versions()\"; PYGMT_USE_EXTERNAL_DISPLAY=false python -m pytest -r P --pyargs pygmt --codspeed"

.github/workflows/cache_data.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
# Install Micromamba with conda-forge dependencies
4545
- name: Setup Micromamba
46-
uses: mamba-org/[email protected].1
46+
uses: mamba-org/[email protected].0
4747
with:
4848
environment-name: pygmt
4949
condarc: |

.github/workflows/ci_docs.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080

8181
# Install Micromamba with conda-forge dependencies
8282
- name: Setup Micromamba
83-
uses: mamba-org/[email protected].1
83+
uses: mamba-org/[email protected].0
8484
with:
8585
environment-name: pygmt
8686
condarc: |
@@ -103,7 +103,6 @@ jobs:
103103
contextily
104104
geopandas<1.0
105105
ipython
106-
pyarrow
107106
rioxarray
108107
make
109108
pip
@@ -115,7 +114,7 @@ jobs:
115114
sphinx-copybutton
116115
sphinx-design
117116
sphinx-gallery
118-
sphinx_rtd_theme<3.0
117+
sphinx_rtd_theme
119118
120119
# Download cached remote files (artifacts) from GitHub
121120
- name: Download remote data from GitHub

.github/workflows/ci_doctests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
# Install Micromamba with conda-forge dependencies
4444
- name: Setup Micromamba
45-
uses: mamba-org/[email protected].1
45+
uses: mamba-org/[email protected].0
4646
with:
4747
environment-name: pygmt
4848
condarc: |

.github/workflows/ci_tests.yaml

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
# Test PyGMT on Linux/macOS/Windows
22
#
3-
# This workflow runs regular PyGMT tests and uploads test coverage reports stored in
4-
# `.coverage.xml` to https://app.codecov.io/gh/GenericMappingTools/pygmt via the
5-
# [Codecov GitHub Action](https://github.com/codecov/codecov-action). More codecov
6-
# related configurations are stored in `.github/codecov.yml`. If any tests fail, it also
7-
# uploads the diff images as workflow artifacts.
3+
# This workflow runs regular PyGMT tests and uploads test coverage reports stored
4+
# in `.coverage.xml` to https://app.codecov.io/gh/GenericMappingTools/pygmt
5+
# via the [Codecov GitHub Action](https://github.com/codecov/codecov-action).
6+
# More codecov related configurations are stored in `.github/codecov.yml`.
7+
# If any tests fail, it also uploads the diff images as workflow artifacts.
88
#
99
# It is run:
1010
# 1. on every commit to the main branch
11-
# 2. on every commit to the pull request branches, unless the pull requests only contain
12-
# non-code changes.
11+
# 2. on every commit to the pull request branches, unless the pull requests only
12+
# contain non-code changes.
1313
# 3. when a new release is published
1414
#
1515
# It is also scheduled to run daily on the main branch.
1616
#
17-
# In draft pull request, only jobs on Linux are triggered to save on Continuous
18-
# Integration resources:
17+
# In draft pull request, only two jobs on Linux are triggered to save on
18+
# Continuous Integration resources:
1919
#
20-
# - Minimum supported Python + core packages (minimum supported versions)
21-
# + optional packages (minimum supported versions if any)
22-
# - Latest Python + core packages (latest versions) + optional packages
23-
# - Last release before the latest Python + core packages
20+
# - Minimum supported Python, NumPy, pandas, Xarray versions following [SPEC 0](https://scientific-python.org/specs/spec-0000/)
21+
# - Latest Python, NumPy versions + optional packages (e.g. GeoPandas)
2422
#
2523
name: Tests
2624

@@ -61,32 +59,35 @@ jobs:
6159
# Is it a draft Pull Request (true or false)?
6260
isDraft:
6361
- ${{ github.event.pull_request.draft }}
64-
# Only run three jobs on Ubuntu for draft PRs
62+
# Only run two jobs (Ubuntu + Python 3.10/3.12) for draft PRs
6563
exclude:
6664
- os: macos-latest
6765
isDraft: true
6866
- os: windows-latest
6967
isDraft: true
68+
# Pair Python 3.10 with the minimum supported versions of NumPy, pandas, Xarray
69+
# and Python 3.12 with the latest versions of NumPy, pandas, Xarray
70+
# Only install optional packages on Python 3.12
7071
include:
71-
# Python 3.10 + core packages (minimum supported versions) + optional packages (minimum supported versions if any)
7272
- python-version: '3.10'
7373
numpy-version: '1.24'
7474
pandas-version: '=2.0'
7575
xarray-version: '=2023.04'
76-
optional-packages: ' contextily geopandas<1 ipython pyarrow rioxarray sphinx-gallery'
77-
# Python 3.12 + core packages (latest versions) + optional packages
76+
optional-packages: ''
7877
- python-version: '3.12'
7978
numpy-version: '2.1'
8079
pandas-version: ''
8180
xarray-version: ''
82-
optional-packages: ' contextily geopandas>=1.0 ipython pyarrow rioxarray sphinx-gallery'
83-
# Python 3.11 + core packages (Linux only)
81+
optional-packages: ' contextily geopandas ipython pyarrow rioxarray sphinx-gallery'
82+
# The job below is for testing GeoPandas v0.x on Ubuntu.
83+
# The python-version here can't be the versions in the matrix.python-version
84+
# defined above. Otherwise, other jobs will be overridden by this one.
8485
- os: 'ubuntu-latest'
85-
python-version: '3.11'
86-
numpy-version: ''
86+
python-version: '3.11' # Can't be 3.10 or 3.12.
87+
numpy-version: '1.24'
8788
pandas-version: ''
8889
xarray-version: ''
89-
optional-packages: ''
90+
optional-packages: ' geopandas<1'
9091

9192
timeout-minutes: 30
9293
defaults:
@@ -113,7 +114,7 @@ jobs:
113114

114115
# Install Micromamba with conda-forge dependencies
115116
- name: Setup Micromamba
116-
uses: mamba-org/[email protected].1
117+
uses: mamba-org/[email protected].0
117118
with:
118119
environment-name: pygmt
119120
condarc: |

.github/workflows/ci_tests_dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757

5858
# Install Micromamba with conda-forge dependencies
5959
- name: Setup Micromamba
60-
uses: mamba-org/[email protected].1
60+
uses: mamba-org/[email protected].0
6161
with:
6262
environment-name: pygmt
6363
condarc: |

.github/workflows/ci_tests_legacy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151

5252
# Install Micromamba with conda-forge dependencies
5353
- name: Setup Micromamba
54-
uses: mamba-org/[email protected].1
54+
uses: mamba-org/[email protected].0
5555
with:
5656
environment-name: pygmt
5757
condarc: |

.github/workflows/publish-to-pypi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ jobs:
7575
ls -lh dist/
7676
7777
- name: Publish to Test PyPI
78-
uses: pypa/gh-action-pypi-publish@v1.12.2
78+
uses: pypa/gh-action-pypi-publish@v1.10.3
7979
with:
8080
repository-url: https://test.pypi.org/legacy/
8181

8282
- name: Publish to PyPI
8383
if: startsWith(github.ref, 'refs/tags')
84-
uses: pypa/gh-action-pypi-publish@v1.12.2
84+
uses: pypa/gh-action-pypi-publish@v1.10.3

.github/workflows/type_checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ jobs:
5050
# 4. other packages that are used somewhere in PyGMT
5151
python -m pip install \
5252
numpy pandas xarray netcdf4 packaging \
53-
contextily geopandas ipython pyarrow rioxarray \
54-
mypy pandas-stubs pyarrow-stubs \
53+
contextily geopandas ipython rioxarray \
54+
mypy pandas-stubs \
5555
matplotlib pytest
5656
python -m pip list
5757

README.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,14 @@ Other official wrappers for GMT:
191191
## Minimum supported versions
192192

193193
PyGMT has adopted [SPEC 0](https://scientific-python.org/specs/spec-0000/) alongside the
194-
rest of the scientific Python ecosystem, and made a few extensions based on the needs of
195-
the project. Please see [Minimum Supported Versions](https://www.pygmt.org/dev/minversions.html)
196-
for the detailed policy and the minimum supported versions of GMT, Python and core
197-
package dependencies.
194+
rest of the scientific Python ecosystem, and therefore:
195+
196+
- Support for Python versions be dropped 3 years after their initial release.
197+
- Support for core package dependencies (NumPy, pandas, Xarray) be dropped 2 years after
198+
their initial release.
199+
200+
Similarly, the PyGMT team has decided to discontinue support for GMT versions 3 years
201+
after their initial release.
202+
203+
Please see [Minimum Supported Versions](https://www.pygmt.org/dev/minversions.html) for
204+
the minimum supported versions of GMT, Python and core package dependencies.

0 commit comments

Comments
 (0)