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

Pull dvc baseline images from gmt-6.4 branch to test GMT dev #1865

Merged
merged 4 commits into from
Apr 14, 2022

Conversation

weiji14
Copy link
Member

@weiji14 weiji14 commented Apr 3, 2022

Description of proposed changes

Make it easier to catch any changes in upstream GMT that break PyGMT, until PyGMT bumps its minimum required version to GMT 6.4.

This modifies the GMT Dev Tests workflow to dvc pull images from @seisman's branch at #1791 that has the newer baseline images generated using GMT 6.4, so that the daily scheduled GMT Dev tests can pass.

Fixes #

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 wrapping a new module, open a 'Wrap new GMT module' issue and submit reasonably-sized PRs.
  • 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

Make it easier to catch any changes in upstream GMT that break PyGMT.
@weiji14 weiji14 added the maintenance Boring but important stuff for the core devs label Apr 3, 2022
@weiji14 weiji14 self-assigned this Apr 3, 2022
Comment on lines 101 to 107
ORIGINAL_BRANCH=$(git branch --show-current)
# Pull down GMT 6.4 baseline images from
# https://github.com/GenericMappingTools/pygmt/pull/1791
git checkout update-baseline-images-for-gmt-dev
dvc pull
ls -lhR pygmt/tests/baseline/
git checkout ${ORIGINAL_BRANCH}
Copy link
Member

Choose a reason for hiding this comment

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

I'm wondering if we should have a gmt-6.4 or a more general gmt-dev branch.

So changes in #1791 can be merged into the gmt-dev branch and the ci_tests_dev workflow can test the gmt-dev branch instead.

Of course, we need to keep the gmt-dev branch up-to-date with the main branch, either manually or via workflow.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm wondering if we should have a gmt-6.4 or a more general gmt-dev branch.

A gmt-6.4 branch sounds good, best not to have a very long-running branch like gmt-dev to avoid scrolling down so much in a PR.

So changes in #1791 can be merged into the gmt-dev branch and the ci_tests_dev workflow can test the gmt-dev branch instead.

Of course, we need to keep the gmt-dev branch up-to-date with the main branch, either manually or via workflow.

Let's start with manual for now, and if things break very often, we can have a scheduled cron job to update the gmt-6.4 branch every week or so.

Copy link
Member

Choose a reason for hiding this comment

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

@seisman seisman added this to the 0.7.0 milestone Apr 12, 2022
Co-authored-by: Dongdong Tian <seisman.info@gmail.com>
Co-authored-by: Dongdong Tian <seisman.info@gmail.com>
@seisman seisman added the final review call This PR requires final review and approval from a second reviewer label Apr 13, 2022
@seisman seisman changed the title Pull dvc baseline images from side-branch to test GMT dev Pull dvc baseline images from gmt-6.4 branch to test GMT dev Apr 13, 2022
@seisman seisman marked this pull request as ready for review April 14, 2022 00:27
@seisman seisman removed the final review call This PR requires final review and approval from a second reviewer label Apr 14, 2022
@seisman seisman merged commit 13ab551 into main Apr 14, 2022
@seisman seisman deleted the test/gmt-dev-side-branch branch April 14, 2022 01:32
@seisman seisman added the skip-changelog Skip adding Pull Request to changelog label Apr 14, 2022
sixy6e pushed a commit to sixy6e/pygmt that referenced this pull request Dec 21, 2022
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