Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump GMT version from 6.2.0rc1 to 6.2.0rc2 in CI #1290

Merged
merged 4 commits into from
May 25, 2021
Merged

Conversation

weiji14
Copy link
Member

@weiji14 weiji14 commented May 25, 2021

Description of proposed changes

Second release candidate of Generic Mapping Tools v6.2.0 at https://github.com/GenericMappingTools/gmt/releases/tag/6.2.0rc2.

Note: This PR also temporarily stops geopandas from being installed in the main test suite, see #1290 (comment) for the rationale.

Related to #1289, Supersedes #1218

Reminders

  • Run make format and make check to make sure the code follows the style guide.
  • Add tests for new features or tests that would have caught the bug that you're fixing.
  • Add new public functions/methods/classes to doc/api/index.rst.
  • Write detailed docstrings for all functions/methods.
  • If adding new functionality, add an example to docstrings or tutorials.

Slash Commands

You can write slash commands (/command) in the first line of a comment to perform
specific operations. Supported slash commands are:

  • /format: automatically format and lint the code
  • /test-gmt-dev: run full tests on the latest GMT development version

@weiji14 weiji14 added the maintenance Boring but important stuff for the core devs label May 25, 2021
@weiji14 weiji14 added this to the 0.4.0 milestone May 25, 2021
@weiji14 weiji14 self-assigned this May 25, 2021
@weiji14 weiji14 mentioned this pull request May 25, 2021
13 tasks
@weiji14
Copy link
Member Author

weiji14 commented May 25, 2021

The Python 3.9 / NumPy 1.20 build can't get past the install step (see https://github.com/GenericMappingTools/pygmt/pull/1290/checks?check_run_id=2661062442#step:5:1). I think this is due to a package conflict with gmt and geopandas. Specifically, the gmt=6.2.0rc2 conda package is linked to GDAL 3.3, but geopandas requires fiona which only has packages up to GDAL 3.2. We'll need to wait for conda-forge/fiona-feedstock#179 before proceeding.

@seisman
Copy link
Member

seisman commented May 25, 2021

Perhaps we can temporarily remove "geopands" so we can proceed?

@weiji14
Copy link
Member Author

weiji14 commented May 25, 2021

Perhaps we can temporarily remove "geopands" so we can proceed?

Not a big fan of this idea, but yeah we might have to. What I might do is to remove geopandas from ci_tests.yaml, but install it in ci_tests_dev.yaml (while pinning to GDAL 3.2) so that we have some tests using geopandas at least (for coverage).

weiji14 added 2 commits May 25, 2021 15:49
Also temporarily pinning to gdal=3.2 so that geopandas and gmt can co-exist.
@weiji14 weiji14 marked this pull request as ready for review May 25, 2021 03:53
Copy link
Member

@seisman seisman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good if all tests pass.

@weiji14
Copy link
Member Author

weiji14 commented May 25, 2021

Looks good if all tests pass.

Well, the tests won't all pass because we need to update 24 of them 🤣 But I'm assuming we'll update those in separate PRs later 😇

@weiji14 weiji14 merged commit 7c29e60 into master May 25, 2021
@weiji14 weiji14 deleted the bump-6.2.0rc2 branch May 25, 2021 04:27
@weiji14 weiji14 added the skip-changelog Skip adding Pull Request to changelog label Jun 6, 2021
sixy6e pushed a commit to sixy6e/pygmt that referenced this pull request Dec 21, 2022
…#1290)

Second release candidate of Generic Mapping Tools v6.2.0 at
https://github.com/GenericMappingTools/gmt/releases/tag/6.2.0rc2.

* Bump GMT version from 6.2.0rc1 to 6.2.0rc2 in ci_tests.yaml and ci_tests_dev.yaml
* Bump GMT version from 6.1.1 to 6.2.0rc2 in cache data workflow

* Temporarily remove optional geopandas dependency from ci_tests.yaml
* Install geopandas in ci_tests_dev.yaml

Also temporarily pinning to gdal=3.2 so that geopandas and gmt can co-exist.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintenance Boring but important stuff for the core devs skip-changelog Skip adding Pull Request to changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants