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.

Sign up for GitHub

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

Jump to bottom

build/pkgs/cython: Update to 0.29.36 #35084

Merged
merged 6 commits into from
Aug 27, 2023
Merged

build/pkgs/cython: Update to 0.29.36 #35084

merged 6 commits into from
Aug 27, 2023

Conversation

mkoeppe
Copy link
Contributor

@mkoeppe mkoeppe commented Feb 12, 2023 •
edited
Loading

📚 Description

Update to latest in 0.x series

https://cython.readthedocs.io/en/latest/src/changes.html#id35

Preparation for Python 3.12

Fixes #34897

📝 Checklist

  • I have made sure that the title is self-explanatory and the description concisely explains the PR.
  • I have linked an issue or discussion.
  • I have created tests covering the changes.
  • I have updated the documentation accordingly.

⌛ Dependencies

@mkoeppe mkoeppe added this to the sage-9.9 milestone Feb 12, 2023
@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 12, 2023 

[cython-0.29.33] Applying ../patches/trashcan.patch
[cython-0.29.33] patching file Cython/Compiler/ModuleNode.py
[cython-0.29.33] Hunk #1 succeeded at 1443 (offset 17 lines).
[cython-0.29.33] Hunk #2 succeeded at 1482 (offset 17 lines).
[cython-0.29.33] Hunk #3 succeeded at 1560 (offset 17 lines).
[cython-0.29.33] patching file Cython/Compiler/Options.py
[cython-0.29.33] Hunk #1 FAILED at 313.
[cython-0.29.33] Hunk #2 succeeded at 362 (offset 7 lines).
[cython-0.29.33] 1 out of 2 hunks FAILED -- saving rejects to file Cython/Compiler/Options.py.rej

@dimpase
Copy link
Member

dimpase commented Mar 17, 2023

I've rebased these patches, but I'm still getting

[pyscipopt-4.2.0]   src/pyscipopt/scip.c:176759:5: error: incomplete definition of type 'struct _frame'
[pyscipopt-4.2.0]       __Pyx_PyFrame_SetLineNumber(py_frame, py_line);
[pyscipopt-4.2.0]       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[pyscipopt-4.2.0]   src/pyscipopt/scip.c:463:62: note: expanded from macro '__Pyx_PyFrame_SetLineNumber'
[pyscipopt-4.2.0]     #define __Pyx_PyFrame_SetLineNumber(frame, lineno)  (frame)->f_lineno = (lineno)
[pyscipopt-4.2.0]                                                         ~~~~~~~^

(different error)

@dimpase
Copy link
Member

dimpase commented Mar 17, 2023

we might also need cython/cython#4667

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Mar 17, 2023

According to comment, this one has been backported to 0.29.x in cython/cython@afc00fc

@dimpase
Copy link
Member

dimpase commented Mar 17, 2023

According to comment, this one has been backported to 0.29.x in cython/cython@afc00fc

indeed. But it doesn't help, anyway.

@dimpase
Copy link
Member

dimpase commented Mar 17, 2023

the rebased patches are on mkoeppe#2

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Mar 17, 2023

Thanks!

@dimpase dimpase mentioned this pull request Mar 17, 2023
Closed
@mkoeppe
Copy link
Contributor Author

mkoeppe commented Apr 3, 2023

0.29.34 is out

@mkoeppe mkoeppe changed the title build/pkgs/cython: Update to 0.29.33 build/pkgs/cython: Update to 0.29.34 Apr 4, 2023
@mkoeppe mkoeppe removed this from the sage-10.0 milestone Apr 30, 2023
@mkoeppe mkoeppe requested a review from tscrim May 21, 2023 01:29
@mkoeppe mkoeppe changed the title build/pkgs/cython: Update to 0.29.34 build/pkgs/cython: Update to 0.29.35 May 24, 2023
@mkoeppe
Copy link
Contributor Author

mkoeppe commented May 24, 2023

0.29.35 is out but not yet on PyPI?

dimpase
dimpase approved these changes Jul 15, 2023
View reviewed changes
Copy link
Member

@dimpase dimpase left a comment

Choose a reason for hiding this comment

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

could you summarise the changes?

rebased patches, dropped a patch, added a trashcan test, more?

@mkoeppe mkoeppe added this to the sage-10.2 milestone Aug 22, 2023
@mkoeppe
Copy link
Contributor Author

mkoeppe commented Aug 22, 2023

Updating Cython to 0.29.36 is a prerequisite for the SciPy 1.11.x upgrade (#35703), which is a prerequisite for the Cython 3 upgrade (#36110)

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Aug 22, 2023

cypari fails to build -- something has gone wrong with the trashcannery

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Aug 22, 2023

This cannot be seen in Build&Test (because cython is an order-only dep of cypari). Failures can be seen here: https://github.com/mkoeppe/sage/actions/runs/5934767113

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Aug 22, 2023

Fixed now

@github-actions
Copy link

Documentation preview for this PR (built with commit 057d0d5; changes) is ready! 🎉

dimpase
dimpase approved these changes Aug 23, 2023
View reviewed changes
Copy link
Member

@dimpase dimpase left a comment

Choose a reason for hiding this comment

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

lgtm

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Aug 23, 2023

Thanks!

vbraun pushed a commit to vbraun/sage that referenced this pull request Aug 23, 2023
sagemathgh-35084: build/pkgs/cython: Update to 0.29.36
4d81fde 
    
<!-- ^^^^^
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"
-->
### 📚 Description

<!-- Describe your changes here in detail -->
Update to latest in 0.x series

https://cython.readthedocs.io/en/latest/src/changes.html#id35

<!-- Why is this change required? What problem does it solve? -->
Preparation for Python 3.12
<!-- If it resolves an open issue, please link to the issue here. For
example "Closes sagemath#1337" -->
Fixes sagemath#34897

### 📝 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! -->

- [x] I have made sure that the title is self-explanatory and the
description concisely explains the PR.
- [x] I have linked an issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation accordingly.

### ⌛ Dependencies
<!-- List all open pull requests that this PR logically depends on -->
<!--
- #xyz: short description why this is a dependency
- #abc: ...
-->
    
URL: sagemath#35084
Reported by: Matthias Köppe
Reviewer(s): Dima Pasechnik
@vbraun vbraun merged commit 76191ac into sagemath:develop Aug 27, 2023
14 of 15 checks passed
vbraun pushed a commit to vbraun/sage that referenced this pull request Sep 2, 2023
sagemathgh-36112: Upgrades: scipy 1.11 and dependencies
f57c2b9 
    
<!-- ^^^^^
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 -->

This includes updates of `meson`, `meson_python`, `ninja_build`,
`pybind11`, `pyproject_metadata`, `pythran`, `gast`.

<!-- 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". -->
Resolves sagemath#35703
<!-- 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.
- [ ] 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: ...
-->
- Depends on sagemath#35404 (merged here)
- Depends on sagemath#35810 (merged here)
- Depends on sagemath#35084 (merged here)


<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: sagemath#36112
Reported by: Matthias Köppe
Reviewer(s): François Bissey
vbraun pushed a commit to vbraun/sage that referenced this pull request Sep 4, 2023
sagemathgh-36112: Upgrades: scipy 1.11 and dependencies
8744157 
    
<!-- ^^^^^
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 -->

This includes updates of `meson`, `meson_python`, `ninja_build`,
`pybind11`, `pyproject_metadata`, `pythran`, `gast`.

<!-- 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". -->
Resolves sagemath#35703
<!-- 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.
- [ ] 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: ...
-->
- Depends on sagemath#35404 (merged here)
- Depends on sagemath#35810 (merged here)
- Depends on sagemath#35084 (merged here)


<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: sagemath#36112
Reported by: Matthias Köppe
Reviewer(s): François Bissey
vbraun pushed a commit to vbraun/sage that referenced this pull request Sep 5, 2023
sagemathgh-36112: Upgrades: scipy 1.11 and dependencies
57ee796 
    
<!-- ^^^^^
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 -->

This includes updates of `meson`, `meson_python`, `ninja_build`,
`pybind11`, `pyproject_metadata`, `pythran`, `gast`.

<!-- 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". -->
Resolves sagemath#35703
<!-- 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.
- [ ] 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: ...
-->
- Depends on sagemath#35404 (merged here)
- Depends on sagemath#35810 (merged here)
- Depends on sagemath#35084 (merged here)


<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: sagemath#36112
Reported by: Matthias Köppe
Reviewer(s): François Bissey
vbraun pushed a commit to vbraun/sage that referenced this pull request Sep 10, 2023
sagemathgh-36112: Upgrades: scipy 1.11 and dependencies
7ed5b8b 
    
<!-- ^^^^^
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 -->

This includes updates of `meson`, `meson_python`, `ninja_build`,
`pybind11`, `pyproject_metadata`, `pythran`, `gast`.

<!-- 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". -->
Resolves sagemath#35703
<!-- 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.
- [ ] 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: ...
-->
- Depends on sagemath#35404 (merged here)
- Depends on sagemath#35810 (merged here)
- Depends on sagemath#35084 (merged here)


<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: sagemath#36112
Reported by: Matthias Köppe
Reviewer(s): François Bissey
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dimpase dimpase dimpase approved these changes

@tscrim tscrim Awaiting requested review from tscrim

Assignees

@mkoeppe mkoeppe

Labels
c: packages: standard p: critical / 2
Projects
None yet
Milestone
sage-10.2
Development

Successfully merging this pull request may close these issues.

Upgrade cython to 0.29.34+
3 participants
@mkoeppe @dimpase @vbraun