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

Change version for nightly on anaconda to HEAD #106

Merged
merged 1 commit into from
Jul 14, 2023

Conversation

steppi
Copy link
Contributor

@steppi steppi commented Jul 13, 2023

This PR resolves an issue that caused the path to nightly openblas-libs builds to contain the openblas version number instead of HEAD. Currently paths look like

https://anaconda.org/multibuild-wheels-staging/openblas-libs/v0.3.23/download/openblas64_-HEAD-manylinux2014_x86_64.tar.gz

instead of

https://anaconda.org/multibuild-wheels-staging/openblas-libs/HEAD/download/openblas64_-HEAD-manylinux2014_x86_64.tar.gz

@mattip identified that the issue is in the line -v "$(cd OpenBLAS && git describe --tags --abbrev=8)" that is in both multibuild.yml and `build_steps.sh``.

I've fixed both files. multibuild.yml was straightforward to fix because the script to upload to anaconda is aware of whether NIGHTLY is true. For multibuild.yml the function to upload to anaconda currently just searches for files matching the pattern openblas*.tar.gz. I've separated this into two function, one which matches openblas*HEAD*.tar.gz, and the other which matches all strings of the form openblas*.tar.gz which do not contain "HEAD".

@steppi steppi changed the title Change version of NIGHTLY on anaconda to HEAD Change version for nightly on anaconda to HEAD Jul 13, 2023
@steppi
Copy link
Contributor Author

steppi commented Jul 13, 2023

cc @mattip @honno

@@ -7,4 +7,5 @@ echo $(python -c "import sys; print(sys.version)")
sudo chmod -R a+w /home/travis/.cache
pip install -q git+https://github.com/Anaconda-Platform/anaconda-client@1.8.0
upload_to_anaconda
upload_nightlies_to_anaconda
Copy link
Collaborator

Choose a reason for hiding this comment

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

This will run both functions. I think it would be better to use the $NIGHTLY environment variable like you did above. Does it exist in the environment at this point?

Copy link
Collaborator

Choose a reason for hiding this comment

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

ahh, this is used by the travis build (aarch64, s390x, ppc64le) which has not yet been converted to use NIGHTLY and HEAD, so it is not needed yet.

Copy link
Contributor Author

@steppi steppi Jul 14, 2023

Choose a reason for hiding this comment

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

This will run both functions. I think it would be better to use the $NIGHTLY environment variable like you did above. Does it exist in the environment at this point?

Right, for the travis build, I don't think $NIGHTLY existed at this point. upload_to_anaconda just finds files to upload by matching the pattern libs/openblas*.tar.gz. Running both functions as I implemented them would have lead to the same basic behavior, except that nightlies would have had HEAD in the right part of their urls instead of the version.

ahh, this is used by the travis build (aarch64, s390x, ppc64le) which has not yet been converted to use NIGHTLY and HEAD, so it is not needed yet.

OK, I'll just get rid of these new steps in the travis build.

@mattip
Copy link
Collaborator

mattip commented Jul 14, 2023

I think this is only relevant after merge, so I will merge it before CI finishes. Thanks @steppi

@mattip mattip merged commit 26d275c into MacPython:main Jul 14, 2023
18 of 19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants