8000 BUG: Fix setup.py to work in maintenance branches. by charris · Pull Request #19096 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BUG: Fix setup.py to work in maintenance branches. #19096

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
May 26, 2021
Merged

BUG: Fix setup.py to work in maintenance branches. #19096

merged 1 commit into from
May 26, 2021

Conversation

charris
Copy link
Member
@charris charris commented May 25, 2021

This fixes setup.py to correctly detect the release status and base
version from the full version string provided by versioneer. Before
this fix, versions like '1.22.0.dev0+...' were correctly handled,
but versions like '1.21.0rc1+...' were not.

@charris charris added this to the 1.21.0 release milestone May 25, 2021
mattip
mattip reviewed May 25, 2021
View reviewed changes
@charris
BUG: Fix setup.py to work in maintenance branches.
9a37cd9 
This fixes setup.py to correctly detect the release status and base
version from the full version string provided by versioneer. Before
this fix, versions like '1.22.0.dev0+...' were correctly handled,
but versions like '1.21.0rc1+...' were not.
@charris charris force-pushed the fix-numpy-version branch from d48f1b3 to 9a37cd9 Compare May 25, 2021 22:17
@charris
Copy link
Member Author
charris commented May 25, 2021

Made some fixes. Note that therc1 type suffixes were previously only included in the release commit and were then removed for further development. Wheels get their (full)version from numpy.__version__, which no longer has any relation to things done in setup.py for backwards compatibility. Could add a short_version entry, I suppose, and make circleci use that.

@mattip mattip merged commit 23cea52 into numpy:main May 26, 2021
@mattip
Copy link
Member
mattip commented May 26, 2021

Thanks @charris

@trallard trallard mentioned this pull request May 27, 2021
Merged
@charris charris mentioned this pull request May 28, 2021
Merged
@charris charris removed the 09 - Backport-Candidate PRs tagged should be backported label May 28, 2021
@charris charris removed this from the 1.21.0 release milestone May 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattip mattip mattip left review comments

Assignees
No one assigned
Labels
00 - Bug component: build
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@charris @mattip
0