Skip to content

Commit

Permalink
Bump the minimum required GMT version to 6.2.0 (#1321)
Browse files Browse the repository at this point in the history
Bump the minimum required GMT version from 6.1.1 to 6.2.0.
Also update GitHub Actions CI workflows to use GMT 6.2.0.
Official release of Generic Mapping Tools v6.2.0 is at
https://github.com/GenericMappingTools/gmt/releases/tag/6.2.0.

Co-authored-by: Dongdong Tian <[email protected]>
  • Loading branch information
weiji14 and seisman authored Jun 6, 2021
1 parent dc1d227 commit 9491c7d
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cache_data.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
# Install GMT and other required dependencies from conda-forge
- name: Install dependencies
run: |
conda install conda-forge/label/dev::gmt=6.2.0rc2 \
conda install gmt=6.2.0 \
numpy pandas xarray netCDF4 packaging matplotlib
# Install the package that we want to test
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/ci_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@ jobs:
# Install GMT and other required dependencies from conda-forge
- name: Install dependencies
run: |
conda install conda-forge/label/dev::gmt=6.2.0rc2 \
numpy pandas xarray netCDF4 packaging \
conda install gmt=6.2.0 numpy pandas xarray netCDF4 packaging \
ipython make myst-parser \
sphinx sphinx-copybutton sphinx-gallery sphinx_rtd_theme
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/ci_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,7 @@ jobs:
# Install GMT and other required dependencies from conda-forge
- name: Install dependencies
run: |
conda install conda-forge/label/dev::gmt=6.2.0rc2 \
numpy=${{ matrix.numpy-version }} \
conda install gmt=6.2.0 numpy=${{ matrix.numpy-version }} \
pandas xarray netCDF4 packaging \
${{ matrix.optional-packages }} \
codecov coverage[toml] dvc ipython make \
Expand Down
2 changes: 1 addition & 1 deletion doc/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Which GMT?
PyGMT requires Generic Mapping Tools (GMT) version 6 as a minimum, which is the
latest released version that can be found at
the `GMT official site <https://www.generic-mapping-tools.org>`__.
We need the latest GMT (>=6.1.1) since there are many changes being made to GMT
We need the latest GMT (>=6.2.0) since there are many changes being made to GMT
itself in response to the development of PyGMT, mainly the new
`modern execution mode <https://docs.generic-mapping-tools.org/latest/cookbook/introduction.html#modern-and-classic-mode>`__.

Expand Down
3 changes: 1 addition & 2 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
name: pygmt
channels:
- conda-forge/label/dev
- conda-forge
- defaults
dependencies:
# Required dependencies
- pip
- gmt=6.2.0rc2
- gmt=6.2.0
- numpy>=1.17
- pandas
- xarray
Expand Down
2 changes: 1 addition & 1 deletion pygmt/clib/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class Session:
"""

# The minimum version of GMT required
required_version = "6.1.1"
required_version = "6.2.0"

@property
def session_pointer(self):
Expand Down
2 changes: 1 addition & 1 deletion pygmt/tests/test_clib.py
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ def test_get_default():
with clib.Session() as lib:
assert lib.get_default("API_GRID_LAYOUT") in ["rows", "columns"]
assert int(lib.get_default("API_CORES")) >= 1
assert Version(lib.get_default("API_VERSION")) >= Version("6.1.1")
assert Version(lib.get_default("API_VERSION")) >= Version("6.2.0")


def test_get_default_fails():
Expand Down

0 comments on commit 9491c7d

Please sign in to comment.