From 77a39e3eded7019628ed4667d2f7b9aa344e76ce Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Wed, 2 Mar 2022 00:36:41 +0800 Subject: [PATCH 1/4] Update the contributing guide about pushing changes to dvc and git --- doc/contributing.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/contributing.md b/doc/contributing.md index 1b1f845958b..8ffadbaee01 100644 --- a/doc/contributing.md +++ b/doc/contributing.md @@ -637,8 +637,9 @@ summarized as follows: # Commit changes and push to both the git and dvc remotes git commit -m "Add test_logo.png into DVC" - git push + dvc status --remote upstream dvc push + git push #### Using check_figures_equal From 7a2552aa94dce55baa8326f4091a4144253a6670 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Fri, 4 Mar 2022 00:33:37 +0800 Subject: [PATCH 2/4] Apply suggestions from code review Co-authored-by: Meghan Jones --- doc/contributing.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/contributing.md b/doc/contributing.md index 8ffadbaee01..0cb2c7316f4 100644 --- a/doc/contributing.md +++ b/doc/contributing.md @@ -637,8 +637,8 @@ summarized as follows: # Commit changes and push to both the git and dvc remotes git commit -m "Add test_logo.png into DVC" - dvc status --remote upstream - dvc push + dvc status --remote upstream # Report which files will be pushed to the dvc remote + dvc push # Run before git push to enable automated testing with the new images git push #### Using check_figures_equal From e8a3ad602aec8912adc4d82d9cd50450203078c3 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Fri, 4 Mar 2022 00:39:10 +0800 Subject: [PATCH 3/4] Remove the 'git rm -r --cached' command --- doc/contributing.md | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/contributing.md b/doc/contributing.md index 0cb2c7316f4..45a3832365f 100644 --- a/doc/contributing.md +++ b/doc/contributing.md @@ -630,7 +630,6 @@ summarized as follows: mv baseline/*.png pygmt/tests/baseline/ # Generate hash for baseline image and stage the *.dvc file in git - git rm -r --cached 'pygmt/tests/baseline/test_logo.png' # only run if migrating existing image from git to dvc dvc status # check which files need to be added to dvc dvc add pygmt/tests/baseline/test_logo.png git add pygmt/tests/baseline/test_logo.png.dvc From 20109a6fa7d64410bf92bd7d2bc8c32f5aa6f127 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Fri, 4 Mar 2022 08:33:03 +0800 Subject: [PATCH 4/4] Update doc/contributing.md Co-authored-by: Wei Ji <23487320+weiji14@users.noreply.github.com> --- doc/contributing.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/contributing.md b/doc/contributing.md index 45a3832365f..0332d923013 100644 --- a/doc/contributing.md +++ b/doc/contributing.md @@ -636,8 +636,8 @@ summarized as follows: # Commit changes and push to both the git and dvc remotes git commit -m "Add test_logo.png into DVC" - dvc status --remote upstream # Report which files will be pushed to the dvc remote - dvc push # Run before git push to enable automated testing with the new images + dvc status --remote upstream # Report which files will be pushed to the dvc remote + dvc push # Run before git push to enable automated testing with the new images git push #### Using check_figures_equal