Skip to content

Add git commands to Makefile - #1217

Merged
rickecon merged 7 commits into
PSLmodels:masterfrom
jdebacker:make
Sep 3, 2026
Merged

rickecon merged 7 commits into
PSLmodels:masterfrom
jdebacker:make

Conversation

@jdebacker

Copy link
Copy Markdown
Member

This PR adds helpful git commands to the Makefile.

The changelog is also updated to reflect some recently merged PRs.

@rickecon

rickecon commented Sep 2, 2026

Copy link
Copy Markdown
Member

@jdebacker. Why do we want this? The git-sync command is a shortcut for the standard: git fetch upstream, git merge upstream/master, git push origin master. My initial inclination is to not shortcut the git commands for these operations. My reason is to address the exceptions that come up in a minority of cases.

@rickecon

rickecon commented Sep 2, 2026

Copy link
Copy Markdown
Member

@jdebacker. It certainly does not harm to have these shortcuts in the Makefile. But I think these are different than other shortcuts in that they circumvent a few Git steps that are actually important for a contributor to know what is going on, even for an experienced constributor.

@rickecon

rickecon commented Sep 2, 2026

Copy link
Copy Markdown
Member

@jdebacker. If we are keeping these, I would recommend that we rename the files gitsync.py and gitpr.py.

@jdebacker

Copy link
Copy Markdown
Member Author

@rickecon writes:

My initial inclination is to not shortcut the git commands for these operations. My reason is to address the exceptions that come up in a minority of cases.

Exceptions would be raised if there is a merge conflict.

If we are keeping these, I would recommend that we rename the files gitsync.py and gitpr.py.

Extensions added and files now formatted with ruff.

@rickecon

rickecon commented Sep 2, 2026

Copy link
Copy Markdown
Member

@jdebacker. This PR looks good. I'll merge it as soon as it passes all the tests.

@codecov-commenter

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 54 lines in your changes missing coverage. Please review.
✅ Project coverage is 75.17%. Comparing base (90b071e) to head (1d678e7).

Files with missing lines Patch % Lines
gitpr.py 0.00% 33 Missing ⚠️
gitsync.py 0.00% 21 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1217      +/-   ##
==========================================
- Coverage   75.85%   75.17%   -0.68%     
==========================================
  Files          22       24       +2     
  Lines        5977     6031      +54     
==========================================
  Hits         4534     4534              
- Misses       1443     1497      +54     
Flag Coverage Δ
unittests 75.17% <0.00%> (-0.68%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
gitsync.py 0.00% <0.00%> (ø)
gitpr.py 0.00% <0.00%> (ø)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@rickecon
rickecon merged commit 59ad58d into PSLmodels:master Sep 3, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants