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

mangle exported functions for PyPy #3031

Merged
merged 2 commits into from
Mar 10, 2023
Merged

mangle exported functions for PyPy #3031

merged 2 commits into from
Mar 10, 2023

Conversation

mattip
Copy link
Contributor

@mattip mattip commented Mar 9, 2023

I run HEAD of PyO3 with HEAD of some PyPy branches, and noticed that the py3.10 branch (which implements python3.10) fails to properly build. The failure was a missing export:

 /home/runner/work/binary-testing/binary-testing/pyo3/src/exceptions.rs:715: \
    undefined reference to `PyExc_EncodingWarning'
          collect2: error: ld returned 1 exit status

So I grepped around in the code for Py_3_10 to see what new functions were added and found a few that needed PyPy-specific exports.

@adamreichold
Copy link
Member

Could you add a news fragment as described in https://pyo3.rs/v0.18.1/contributing#documenting-changes? Thanks! (I did not trigger the CI as it will complain about the missing news fragment in any case.)

I also think it would be good to include this in #3028.

@davidhewitt davidhewitt added CI-skip-changelog Skip checking changelog entry and removed CI-skip-changelog Skip checking changelog entry labels Mar 9, 2023
Copy link
Member

@davidhewitt davidhewitt left a comment

Choose a reason for hiding this comment

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

Thanks - I'm happy to pull this into the 0.18.2 release :)

(Although PyPy 3.10 is not out yet... coming soon?)

@mattip
Copy link
Contributor Author

mattip commented Mar 9, 2023

Probably we will release 3.10 in a month or so

@davidhewitt
Copy link
Member

bors r+

bors bot added a commit that referenced this pull request Mar 10, 2023
3031: mangle exported functions for PyPy r=davidhewitt a=mattip

I run HEAD of PyO3 with HEAD of some PyPy branches, and noticed that the py3.10 branch (which implements python3.10) [fails to properly build](https://github.com/pypy/binary-testing/actions/runs/4334873617/jobs/7569059852#step:6:179). The failure was a missing export:
```
 /home/runner/work/binary-testing/binary-testing/pyo3/src/exceptions.rs:715: \
    undefined reference to `PyExc_EncodingWarning'
          collect2: error: ld returned 1 exit status
```

So I grepped around in the code for `Py_3_10` to see what new functions were added and found a few that needed PyPy-specific exports.

Co-authored-by: Matti Picus <[email protected]>
@bors
Copy link
Contributor

bors bot commented Mar 10, 2023

Build failed:

@davidhewitt
Copy link
Member

bors retry

@bors
Copy link
Contributor

bors bot commented Mar 10, 2023

Build succeeded:

@bors bors bot merged commit 550473f into PyO3:main Mar 10, 2023
bors bot added a commit that referenced this pull request Mar 12, 2023
3040: mangle exported functions for PyPy r=adamreichold a=mattip

Continuation of #3031. This [turned up](https://github.com/pypy/binary-testing/actions/runs/4390086363/jobs/7688256133#step:6:179) in the run of PyPy 3.10 HEAD against PyO3 HEAD. Should I add a new news fragment or is the one from #3031 sufficient?

Co-authored-by: Matti Picus <[email protected]>
bors bot added a commit that referenced this pull request Mar 15, 2023
3040: mangle exported functions for PyPy r=adamreichold a=mattip

Continuation of #3031. This [turned up](https://github.com/pypy/binary-testing/actions/runs/4390086363/jobs/7688256133#step:6:179) in the run of PyPy 3.10 HEAD against PyO3 HEAD. Should I add a new news fragment or is the one from #3031 sufficient?

Co-authored-by: Matti Picus <[email protected]>
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.

3 participants