Skip to content

Commit c47788b

Browse files
author
Release Manager
committedOct 19, 2023
sagemathgh-36476: Fix bootstrapping on centos-7, fedora-30, ubuntu-xenial
<!-- ^^^^^ 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 --> <!-- Why is this change required? What problem does it solve? --> On `centos-7`, still supported until June 2024, we have to use sage- bootstrap-python = python2. Support for Python 2 was broken accidentally in sagemath#36393, see https://gith ub.com/sagemath/sage/actions/runs/6520548150/job/17767608828#step:10:192 7 Fixed here, as tested with `tox -e docker-centos-7-devtoolset- gcc_11-standard -- config.status`. Same issue also affects `fedora-30`, which is still tested by the CI as a proxy for old RHEL, and `ubuntu-xenial`. See sagemath#32074 <!-- 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#36476 Reported by: Matthias Köppe Reviewer(s): Tobias Diez
2 parents 11aae80 + aca1f93 commit c47788b

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed
 

‎build/pkgs/configure/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=d00890d9ecb95b96d06007dd383ce32d7eb2d814
3-
md5=54f3dfffc2ce304135d3db1c0aad5905
4-
cksum=649734943
2+
sha1=bc6609d473876187585a7ebfe5324a2b9dd3dbf0
3+
md5=b4efc1d371167bb95352c5cc939a5d1b
4+
cksum=63094869
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a84c11dd8244bf18bcc4bfe5fe4e6adde20ff9ff
1+
79d515e903a88ef416c6136c186bebdd461a8888

‎build/sage_bootstrap/expand_class.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121

2222
class PackageClass(object):
2323

24-
def __init__(self, *package_names_or_classes, exclude=(),
25-
include_dependencies=False, exclude_dependencies=False,
26-
**filters):
24+
def __init__(self, *package_names_or_classes, **filters):
2725
self.__names = set()
26+
exclude = filters.pop('exclude', ())
27+
include_dependencies = filters.pop('include_dependencies', False)
28+
exclude_dependencies = filters.pop('exclude_dependencies', False)
2829
filenames = filters.pop('has_files', [])
2930
no_filenames = filters.pop('no_files', [])
3031
excluded = []

0 commit comments

Comments
 (0)
Please sign in to comment.