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

[mypyc] Sync pythoncapi_compat.h #17929

Merged
merged 1 commit into from
Oct 14, 2024
Merged

Conversation

cdce8p
Copy link
Collaborator

@cdce8p cdce8p commented Oct 13, 2024

Use functions added for Python 3.14

@cdce8p cdce8p added the topic-mypyc mypyc bugs label Oct 13, 2024
@hauntsaninja hauntsaninja merged commit ca97d96 into python:master Oct 14, 2024
13 checks passed
@cdce8p cdce8p deleted the sync-pythoncapi branch October 14, 2024 01:56
cdce8p added a commit to cdce8p/mypy that referenced this pull request Oct 14, 2024
Use functions added for Python 3.14
* `PyBytes_Join` added in
python/cpython#121645
* `PyUnicode_Equal` added in
python/cpython#124502
@cdce8p
Copy link
Collaborator Author

cdce8p commented Oct 14, 2024

This change seems to have caused a regression. Opened #17941 to fix that.

JukkaL pushed a commit that referenced this pull request Oct 14, 2024
#17929 seems to have broken the wheel
builder but only on Windows with Python 3.13.
```
  C:\Users\runneradmin\AppData\Local\pypa\cibuildwheel\Cache\nuget-cpython\python.3.13.0\tools\include\internal\pycore_unicodeobject.h(262): error C2375: '_PyUnicode_Equal': redefinition; different linkage
  D:\a\mypy_mypyc-wheels\mypy_mypyc-wheels\mypy\mypyc\lib-rt\pythoncapi_compat.h(1540): note: see declaration of '_PyUnicode_Equal'

  C:\Users\runneradmin\AppData\Local\pypa\cibuildwheel\Cache\nuget-cpython\python.3.13.0\tools\include\internal\pycore_pyhash.h(24): error C2375: '_Py_HashBytes': redefinition; different linkage
  D:\a\mypy_mypyc-wheels\mypy_mypyc-wheels\mypy\mypyc\lib-rt\pythoncapi_compat.h(1567): note: see declaration of '_Py_HashBytes'
```


https://github.com/mypyc/mypy_mypyc-wheels/actions/runs/11327195039/job/31497783023#step:4:3766

MSVC seems to require that the signature matches the upstream one
exactly.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
topic-mypyc mypyc bugs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants