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

remove setuptools_scm_git_archive from requirement #2598

Merged
merged 2 commits into from
Oct 11, 2023

Conversation

pdebuyl
Copy link
Contributor

@pdebuyl pdebuyl commented Oct 11, 2023

The package's functionality is now found in setuptools_scm (see #2549 and
https://github.com/Changaco/setuptools_scm_git_archive ).

Minimal changes done:

  1. Remove setuptools_scm_git_archive from setup.cfg and doc/rtd_environment.yml
  2. Change the content of .git_archival.txt according to https://setuptools-scm.readthedocs.io/en/latest/usage/#builtin-mechanisms-for-obtaining-version-numbers

fixes #2549

The package's functionality is now found in setuptools_scm (see
pytroll#2549 and
https://github.com/Changaco/setuptools_scm_git_archive ).

Minimal changes done:
1. Remove setuptools_scm_git_archive from setup.cfg and
   doc/rtd_environment.yml
2. Change the content of .git_archival.txt according to
   https://setuptools-scm.readthedocs.io/en/latest/usage/#builtin-mechanisms-for-obtaining-version-numbers

fixes pytroll#2549
@codecov
Copy link

codecov bot commented Oct 11, 2023

Codecov Report

Merging #2598 (49a1568) into main (e804f2f) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #2598   +/-   ##
=======================================
  Coverage   94.93%   94.93%           
=======================================
  Files         354      354           
  Lines       51401    51401           
=======================================
  Hits        48800    48800           
  Misses       2601     2601           
Flag Coverage Δ
behaviourtests 4.27% <ø> (ø)
unittests 95.55% <ø> (ø)

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

@coveralls
Copy link

Pull Request Test Coverage Report for Build 6479992181

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 95.508%

Totals Coverage Status
Change from base Build 6478691640: 0.0%
Covered Lines: 48923
Relevant Lines: 51224

💛 - Coveralls

@mraspaud mraspaud added this to the v0.44.0 milestone Oct 11, 2023
@mraspaud mraspaud added the bug label Oct 11, 2023
Copy link
Member

@mraspaud mraspaud left a comment

Choose a reason for hiding this comment

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

LGTM, but I'll let @djhoese have the last word as he knows more about this than me.

Copy link
Member

@djhoese djhoese left a comment

Choose a reason for hiding this comment

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

I made a one change to remove the setup_requires from the setup.cfg. This section should not have been used since we have a pyproject.toml now. Thanks for cleaning up the changes necessary to drop the old package. I didn't realize I hadn't completed them...but now you're making me worry I didn't do this correctly for other packages (in particular the .git_archival.txt changes).

When CI passes we can merge this. @mraspaud this should be merged before a release.

@djhoese djhoese merged commit d30ed83 into pytroll:main Oct 11, 2023
19 of 20 checks passed
@pdebuyl pdebuyl deleted the remove_setuptools_scm_git_archive branch October 11, 2023 19:28
@pdebuyl
Copy link
Contributor Author

pdebuyl commented Oct 11, 2023

Thanks @djhoese for and @mraspaud for reviewing the PR :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

setuptools-scm-git-archive is obsolete -- use setuptools-scm >= 7
4 participants