From 953f9fc5390b28ec50f54207bcb6a2da2b75835d Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Sun, 6 Jun 2021 12:08:50 +1200 Subject: [PATCH 1/3] Bump GMT version from 6.2.0rc2 to 6.2.0 in CI Official release of Generic Mapping Tools v6.2.0 at https://github.com/GenericMappingTools/gmt/releases/tag/6.2.0. --- .github/workflows/cache_data.yaml | 2 +- .github/workflows/ci_docs.yml | 3 +-- .github/workflows/ci_tests.yaml | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cache_data.yaml b/.github/workflows/cache_data.yaml index 72b66b6f2f2..9e36e69d8e8 100644 --- a/.github/workflows/cache_data.yaml +++ b/.github/workflows/cache_data.yaml @@ -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 -c conda-forge gmt=6.2.0 \ numpy pandas xarray netCDF4 packaging matplotlib # Install the package that we want to test diff --git a/.github/workflows/ci_docs.yml b/.github/workflows/ci_docs.yml index bf36a61573c..a567f77226c 100644 --- a/.github/workflows/ci_docs.yml +++ b/.github/workflows/ci_docs.yml @@ -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 diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index 9f46e649b70..9a3411e339f 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -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 \ From b46387a0b953041b9aaa67c568ed820ec981acab Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Sun, 6 Jun 2021 12:10:28 +1200 Subject: [PATCH 2/3] Bump the minimum required GMT version to 6.2.0 --- doc/install.rst | 2 +- environment.yml | 3 +-- pygmt/clib/session.py | 2 +- pygmt/tests/test_clib.py | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/install.rst b/doc/install.rst index bc3ebee02f2..fabaa8572ca 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -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 `__. -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 `__. diff --git a/environment.yml b/environment.yml index 09d2c6f8c79..b8980edba8a 100644 --- a/environment.yml +++ b/environment.yml @@ -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 diff --git a/pygmt/clib/session.py b/pygmt/clib/session.py index 331e11bc1cb..8172dbdb0b3 100644 --- a/pygmt/clib/session.py +++ b/pygmt/clib/session.py @@ -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): diff --git a/pygmt/tests/test_clib.py b/pygmt/tests/test_clib.py index e219c50ef47..8a900957322 100644 --- a/pygmt/tests/test_clib.py +++ b/pygmt/tests/test_clib.py @@ -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(): From 20af27d4a67d159801597d54f45a6eeb107970c2 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Sun, 6 Jun 2021 14:11:20 +1200 Subject: [PATCH 3/3] Update .github/workflows/cache_data.yaml Co-authored-by: Dongdong Tian --- .github/workflows/cache_data.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cache_data.yaml b/.github/workflows/cache_data.yaml index 9e36e69d8e8..9c60cc7e9d4 100644 --- a/.github/workflows/cache_data.yaml +++ b/.github/workflows/cache_data.yaml @@ -34,7 +34,7 @@ jobs: # Install GMT and other required dependencies from conda-forge - name: Install dependencies run: | - conda install -c conda-forge gmt=6.2.0 \ + conda install gmt=6.2.0 \ numpy pandas xarray netCDF4 packaging matplotlib # Install the package that we want to test