-
Notifications
You must be signed in to change notification settings - Fork 154
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
Miscellaneous packaging improvements #703
Conversation
ff40a95
to
e62fe9d
Compare
Codecov Report
@@ Coverage Diff @@
## main #703 +/- ##
=======================================
- Coverage 94.9% 94.4% -0.5%
=======================================
Files 42 43 +1
Lines 3366 3432 +66
=======================================
+ Hits 3195 3241 +46
- Misses 171 191 +20
|
1480f23
to
72259cb
Compare
@glatterf42 #683 led to conflicts in test_tutorials.py; please wait for me to rebase & deconflict before reviewing. |
Sorry, I didn't realise it would. I'll review once you are done. |
An updated pip is guaranteed by actions/setup-python.
…instead of the 3rd-party styfle/cancel-workflow-action.
This simplifies the workflow file, but has the same effect.
A subdirectory is no longer needed, since ixmp is not checked out.
…replacing deprecated pkg_resources.
- Remove max-complexity from "lint" CI workflow. - Reduce max-complexity from 38 → 14; mark current exceptions FIXME.
- Sort [tool.*] sections. - Exclude doc/* from mypy type checking. - Reduce mypy overrides. - Remove workaround for iiasa/ixmp#449. - Remove outdated e-mail address; add maintainers.
Abandon pandas.append in favor of pandas.concat Exclude .vscode/ from git tracking Adapt sphinx status_iterator to DeprecationWarning
- Streamline definition of tutorial test cases. - Use upper case for globals. - Give --dist=loadgroup in "pytest" CI workflow.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me, only one question and a few very minor remarks from my side.
Co-authored-by: Fridolin Glatter <[email protected]>
NB the codecov/patch check failure occurs because a few lines are changed in .tools.add_year, but that code remains untested. The tests will be added by #494, from which those changes were cherry-picked. |
Do we now have to remove those commits from #494 or does git recognize that we included them here already once we merge both? |
Yes, they can be removed in a few steps:
Another way is to just do (1) and (4). During the rebase, git will complain, twice, that the cherry-picked commit "is (now) empty", because all changes they contained are already on |
This is mostly just FYI: I've applied your suggestion to #494 and ran (1) and (4) after updating my local |
In this PR I forgot to adjust this line in the "nightly" CI workflow: message_ix/.github/workflows/nightly.yaml Line 47 in a824be9
…to refer to pyproject.toml, mirroring the change made to the "pytest" workflow. As a result the workflow fails, e.g. https://github.com/iiasa/message_ix/actions/runs/4728750039 |
pkg_resources
withimportlib.metadata
/importlib_metadata
(Python 3.7 only).pytest-xdist
to parallelize tests (n=2) on GHA runners; this shortens run time of individual jobs by up to 5 minutes.How to review
Read the diff and note that the CI checks all pass.
PR checklist
Add or expand tests;coverage checks both ✅Add, expand, or update documentation.N/AUpdate release notes.