Skip to content
This repository was archived by the owner on Feb 15, 2023. It is now read-only.

Stop renaming the nightly wheels by adding date-time to them #118

Merged
merged 3 commits into from
Apr 18, 2021

Conversation

rgommers
Copy link
Contributor

Renaming is bad, it causes a mismatch between file name and METADATA inside the wheel. This is the cause of gh-114. scipy/scipy#13882 should have removed the need for this renaming, it prepends a monotonously increasing number (commit count since previous branch point for a minor version).

Closes gh-114.

# Get a less shallow clone; needed to get the commit count since
# the previous release branch point right.
git:
depth: 3000
Copy link
Contributor

Choose a reason for hiding this comment

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

You could use false to disable the depth restriction.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah I know, I chose not to because I only need the commits till the last branch point. Getting all 25,000 of them can be quite slow.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

3,000 should be enough for any minor release period I think.

azure-posix.yml Outdated
@@ -114,7 +113,6 @@ jobs:
- bash: |
set -e
if [ $ANACONDA_ORG == "scipy-wheels-nightly" ]; then
source extra_functions.sh
for f in wheelhouse/*.whl; do rename_wheel $f; done
Copy link
Contributor

Choose a reason for hiding this comment

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

The if statement should probably be deleted.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah yes. Me and bash aren't friends:(

Copy link
Contributor

Choose a reason for hiding this comment

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

I note there is also a rename_wheel in .travis.yml.

Copy link
Contributor

Choose a reason for hiding this comment

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

Correction, only for f in wheelhouse/*.whl; do rename_wheel $f; done still needs to be removed. The if also encompasses the upload.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It didn't encompass the upload, all removed now.

The rename makes the metadata inconsistent with the filename,
and pip 21 refuses to install such wheels after downloading them.

The reason for the rename was to get regularly incrementing version
numbers so the newest nightly in the wheelhouse is picked first.
This is now fixed in SciPy master.
@charris
Copy link
Contributor

charris commented Apr 18, 2021

The .travis.yml script needs fixing even though the relevant path is not currently reached. The manylinux2014_aarch64 (travis) and win_amd64 (appveyor) development builds are uploading to the staging area, looks like it happened on the last PR merge to master as neither runs scheduled nightly builds. The logic could probably use some improvement so they upload to the nightly area.

@rgommers
Copy link
Contributor Author

Good catch, done.

The logic could probably use some improvement so they upload to the nightly area.

Indeed, but some other time - I've already invested way too much time in CI issues in the past week.

I think it could use a bigger overhaul actually, right now I just want to get it green and fix bug where nightlies are not installable.

@charris
Copy link
Contributor

charris commented Apr 18, 2021

OT: Is there a reason to keep using appveyor? NumPy does the windows builds on azure. It is also easy to add a cron job to travis, daily, weekly, and monthly are options.

@rgommers
Copy link
Contributor Author

TravisCI and Azure are happy, Appveyor is untouched in this PR - so let's call it good, in it goes.

Successfully installed scipy-1.7.0.dev0+805.6a02659 shows it works as expected.

OT: Is there a reason to keep using appveyor? NumPy does the windows builds on azure.

Not really, just inertia.

@rgommers rgommers merged commit 8f8368c into MacPython:master Apr 18, 2021
@rgommers rgommers deleted the remove-rename branch April 18, 2021 17:30
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Version mismatch causes pip warning and no install
2 participants