Skip to content

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

Merged
mattip merged 1 commit intonumpy:mainfrom
charris:fix-numpy-version
May 26, 2021
Merged

BUG: Fix setup.py to work in maintenance branches.#19096
mattip merged 1 commit intonumpy:mainfrom
charris:fix-numpy-version

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
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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants