From 386d0704241b12e78fec1d445c58dd5a98dcc79f Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Thu, 4 Aug 2022 10:21:46 +0800 Subject: [PATCH] Bump the GMT version in CI to 6.4.0 (#1990) --- .github/ISSUE_TEMPLATE/bump_gmt_checklist.md | 15 +++++++++++---- .github/workflows/cache_data.yaml | 2 +- .github/workflows/ci_docs.yml | 2 +- .github/workflows/ci_tests.yaml | 2 +- ci/requirements/docs.yml | 2 +- environment.yml | 2 +- 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bump_gmt_checklist.md b/.github/ISSUE_TEMPLATE/bump_gmt_checklist.md index c2f75dca5fe..128d247c9ff 100644 --- a/.github/ISSUE_TEMPLATE/bump_gmt_checklist.md +++ b/.github/ISSUE_TEMPLATE/bump_gmt_checklist.md @@ -14,16 +14,23 @@ assignees: '' -**To-Do**: -- [ ] Bump the minimum required GMT version (1 PR) +**To-Do for bumping the GMT version in CI**: + +- [ ] Bump the GMT version in CI (1 PR) - [ ] Update `.github/workflows/cache_data.yaml` - [ ] Update `.github/workflows/ci_docs.yml` - [ ] Update `.github/workflows/ci_tests.yaml` - - [ ] Update `doc/install.rst` + - [ ] Update `ci/requirements/docs.yml` - [ ] Update `environment.yml` +- [ ] Fix failing tests (1 or more PRs) +- [ ] Fix [xfail](https://docs.pytest.org/en/stable/skipping.html#xfail-mark-test-functions-as-expected-to-fail) pytest markers on tests that are now xpass + +**To-Do for bumping the minimum required GMT version**: + +- [ ] Bump the minimum required GMT version (1 PR) + - [ ] Update `doc/install.rst` - [ ] Update `required_version` in `pygmt/clib/session.py` - [ ] Update `test_get_default` in `pygmt/tests/test_clib.py` - [ ] Update compatibility table in `README.rst` -- [ ] Fix failing tests (1 or more PRs) - [ ] Remove [xfail](https://docs.pytest.org/en/stable/skipping.html#xfail-mark-test-functions-as-expected-to-fail) pytest markers on tests that are now xpass - [ ] Update deprecated syntax in source code and examples based on the [GMT Changelog](https://docs.generic-mapping-tools.org/latest/changes.html) diff --git a/.github/workflows/cache_data.yaml b/.github/workflows/cache_data.yaml index 0e58963c572..d0359833e96 100644 --- a/.github/workflows/cache_data.yaml +++ b/.github/workflows/cache_data.yaml @@ -38,7 +38,7 @@ jobs: # Install GMT and other required dependencies from conda-forge - name: Install dependencies run: | - mamba install gmt=6.3.0 numpy pandas xarray netCDF4 packaging \ + mamba install gmt=6.4.0 numpy pandas xarray netCDF4 packaging \ build # Install the package that we want to test diff --git a/.github/workflows/ci_docs.yml b/.github/workflows/ci_docs.yml index 7f74edcbbec..ada5afc8ee5 100644 --- a/.github/workflows/ci_docs.yml +++ b/.github/workflows/ci_docs.yml @@ -70,7 +70,7 @@ jobs: # Install GMT and other required dependencies from conda-forge - name: Install dependencies run: | - mamba install gmt=6.3.0 numpy pandas xarray netCDF4 packaging \ + mamba install gmt=6.4.0 numpy pandas xarray netCDF4 packaging \ build ipython make myst-parser geopandas \ sphinx sphinx-copybutton sphinx-design sphinx-gallery sphinx_rtd_theme diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index c43f6109c6c..a378c2bf783 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -90,7 +90,7 @@ jobs: # Install GMT and other required dependencies from conda-forge - name: Install dependencies run: | - mamba install gmt=6.3.0 numpy=${{ matrix.numpy-version }} \ + mamba install gmt=6.4.0 numpy=${{ matrix.numpy-version }} \ pandas xarray netCDF4 packaging \ ${{ matrix.optional-packages }} \ build dvc make pytest>=6.0 \ diff --git a/ci/requirements/docs.yml b/ci/requirements/docs.yml index 20b52eb0675..7d725cde8e2 100644 --- a/ci/requirements/docs.yml +++ b/ci/requirements/docs.yml @@ -5,7 +5,7 @@ channels: dependencies: # Required dependencies - pip - - gmt=6.3.0 + - gmt=6.4.0 - numpy>=1.20 - pandas - xarray diff --git a/environment.yml b/environment.yml index 2887ed093ec..4ba51be4fce 100644 --- a/environment.yml +++ b/environment.yml @@ -5,7 +5,7 @@ channels: dependencies: # Required dependencies - pip - - gmt=6.3.0 + - gmt=6.4.0 - numpy>=1.20 - pandas - xarray