-
-
Notifications
You must be signed in to change notification settings - Fork 482
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
build/pkgs/nauty
: Update to 2.8.8; use VERSION in all upstream_url
s.
#36774
Conversation
|
@orlitzky Is this what nauty-2.8.6-gentreeg-gentourng.patch was fixing? Do we have a newer version of this patch? |
That's an upstream patch from right after the v2.8.6 release. I only included it because the maintainer didn't think it was worth a new bugfix release, and, since v2.8.6 just happened, we might have been waiting a while. It shouldn't be necessary in nauty 2.8.7 or newer. |
It does appear in the changelog for v2.8.8:
|
Sorry for the noise, I found my mistake. |
build/pkgs/nauty
: Update to 2.8.8build/pkgs/nauty
: Update to 2.8.8; use VERSION in all upstream_url
s.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM (passes all tests on Fedora 35) but some failures are reported by the CI on specific systems.
The failures of the "sitepackages" runs can be ignored -- many fail systematically, and we are reducing them in #36697. I've restarted the other CI Linux incremental runs, which got interrupted |
Why do we need to delay these variable substitutions until after the run of At |
You're in the wrong phase. |
there is no need for this extra complication. |
At least, Dima, you would need to say what exactly it is that you are against. |
it's weird that on one hand each package directory has files with templates which are filled by configure, as well as with templates filled in by an ad hoc script. The latter in particular has data uniquely identifying the package (from checksums). There is no reason not to rewrite the templates in the latter along with filling in the checksums. There is also no reason to insist on the ability to fill in the latter templates in an unconfigured tree (and so they can be filled in by configure). |
Do you understand that using |
It does not. Yes, there are |
and all of our existing practices are absolutely the best possible, and any attempt to talk about changing them is a violation of CoC? |
Well, Dima, trying to mock me for holding you to the Code of Conduct, which applies to everyone, is certainly a Code of Conduct violation. Please do better. |
Separation of phases is very important for maintainability. Specifically, note that when |
…el 'sage-download-file'
…pattern does not use the VERSION variable
I had to add one commit so that |
Documentation preview for this PR (built with commit b830776; changes) is ready! 🎉 |
Looks fine. |
Thanks! |
…eck-certificate` <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes sagemath#1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> A mistake in sagemath#36774 broke the macOS CI in 10.3.beta3, see https://github.com/sagemath/sage/actions/runs/7255417440/job/19765989346 #step:9:1425 ``` [patch-2.7.5] error installing, exit status 1. End of log file: [patch-2.7.5] usage: sage --package [-h] [--log LOG] [--no-check- certificate] [patch-2.7.5] {config,list,name,tarball,apropos,update,update- latest,download,upload,fix-checksum,create,clean} [patch-2.7.5] ... [patch-2.7.5] sage --package: error: unrecognized arguments: --no- check-certificate [patch-2.7.5] ************************************************************************ [patch-2.7.5] Error downloading tarball of patch [patch-2.7.5] ************************************************************************ ``` We make the one-line fix for this here. Tests (with other merged branches) at https://github.com/mkoeppe/sage/actions/runs/7295997767/job/19883171237 <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes sagemath#12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [x] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - sagemath#12345: short description why this is a dependency - sagemath#34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#36947 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee
…eck-certificate` <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes sagemath#1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> A mistake in sagemath#36774 broke the macOS CI in 10.3.beta3, see https://github.com/sagemath/sage/actions/runs/7255417440/job/19765989346 #step:9:1425 ``` [patch-2.7.5] error installing, exit status 1. End of log file: [patch-2.7.5] usage: sage --package [-h] [--log LOG] [--no-check- certificate] [patch-2.7.5] {config,list,name,tarball,apropos,update,update- latest,download,upload,fix-checksum,create,clean} [patch-2.7.5] ... [patch-2.7.5] sage --package: error: unrecognized arguments: --no- check-certificate [patch-2.7.5] ************************************************************************ [patch-2.7.5] Error downloading tarball of patch [patch-2.7.5] ************************************************************************ ``` We make the one-line fix for this here. Tests (with other merged branches) at https://github.com/mkoeppe/sage/actions/runs/7295997767/job/19883171237 <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes sagemath#12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [x] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - sagemath#12345: short description why this is a dependency - sagemath#34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#36947 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee
…eck-certificate` <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes sagemath#1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> A mistake in sagemath#36774 broke the macOS CI in 10.3.beta3, see https://github.com/sagemath/sage/actions/runs/7255417440/job/19765989346 #step:9:1425 ``` [patch-2.7.5] error installing, exit status 1. End of log file: [patch-2.7.5] usage: sage --package [-h] [--log LOG] [--no-check- certificate] [patch-2.7.5] {config,list,name,tarball,apropos,update,update- latest,download,upload,fix-checksum,create,clean} [patch-2.7.5] ... [patch-2.7.5] sage --package: error: unrecognized arguments: --no- check-certificate [patch-2.7.5] ************************************************************************ [patch-2.7.5] Error downloading tarball of patch [patch-2.7.5] ************************************************************************ ``` We make the one-line fix for this here. Tests (with other merged branches) at https://github.com/mkoeppe/sage/actions/runs/7295997767/job/19883171237 <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes sagemath#12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [x] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - sagemath#12345: short description why this is a dependency - sagemath#34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#36947 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee
…eck-certificate` <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes sagemath#1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> A mistake in sagemath#36774 broke the macOS CI in 10.3.beta3, see https://github.com/sagemath/sage/actions/runs/7255417440/job/19765989346 #step:9:1425 ``` [patch-2.7.5] error installing, exit status 1. End of log file: [patch-2.7.5] usage: sage --package [-h] [--log LOG] [--no-check- certificate] [patch-2.7.5] {config,list,name,tarball,apropos,update,update- latest,download,upload,fix-checksum,create,clean} [patch-2.7.5] ... [patch-2.7.5] sage --package: error: unrecognized arguments: --no- check-certificate [patch-2.7.5] ************************************************************************ [patch-2.7.5] Error downloading tarball of patch [patch-2.7.5] ************************************************************************ ``` We make the one-line fix for this here. Tests (with other merged branches) at https://github.com/mkoeppe/sage/actions/runs/7295997767/job/19883171237 <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes sagemath#12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [x] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - sagemath#12345: short description why this is a dependency - sagemath#34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#36947 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee
@vbraun Apparently the tarball is missing on the mirrors. |
OK uploaded |
https://pallini.di.uniroma1.it/changes24-28.txt
Also, motivated by a mistake I made while preparing this PR (#36774 (comment)), and previously in #35380 (see #36781), and countless other times, I am changing all
upstream_url
s to useVERSION
instead of the hardcoded version number. This makes it less error-prone to usesage -package update SPKG NEW_VERSION
andsage -package update-latest
. These commands now also display the URL from which they are downloading the tarball, and they warn if theupstream_url
field does not contain theVERSION
variable.(Exceptions:
ipykernel
, which is fixed in #36129, andlibbraiding
, which is fixed in #36781)Because some of the
upstream_url
need the version in a different format, a mechanism to refer to the components of a version is added: The stringsVERSION_MAJOR
,VERSION_MINOR
,VERSION_MICRO
can be used. For added readability, instead of the naked strings, also the notation${VERSION_MAJOR}
etc. can be used. For example,nauty
, which previously had to use a hardcoded version number, now uses the upstream URL patternupstream_url=https://pallini.di.uniroma1.it/nauty${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_MICRO}.tar.gz
The syntax
${VERSION_MAJOR}
, borrowed from Bourne shell, matches what sage-bootstrap already uses in https://github.com/sagemath/sage/blob/develop/.upstream.d/10-SAGE_SERVER📝 Checklist
⌛ Dependencies