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

patch for _Py_fopen -> fopen #110

Merged
merged 10 commits into from
Jan 21, 2021
Merged

patch for _Py_fopen -> fopen #110

merged 10 commits into from
Jan 21, 2021

Conversation

mattip
Copy link
Contributor

@mattip mattip commented Jan 20, 2021

Checklist

  • Used a personal fork of the feedstock to propose changes
  • Bumped the build number (if the version is unchanged)
  • Reset the build number to 0 (if the version changed)
  • Re-rendered with the latest conda-smithy (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
  • Ensured the license file is being packaged.

Adopt upstream boostorg/python#344. Should be enough to get the PyPy3.7 migration to pass.

@conda-forge-linter
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

@mattip
Copy link
Contributor Author

mattip commented Jan 20, 2021

@conda-forge-admin, please rerender

@isuruf isuruf added the automerge Merge the PR when CI passes label Jan 20, 2021
@mattip
Copy link
Contributor Author

mattip commented Jan 20, 2021

this replaces all the open migration PRs #96 #106 #107 #108 #109 which can be closed.

@isuruf
Copy link
Member

isuruf commented Jan 20, 2021

They can't be replaced, unless you copy the .ci_support/migrations/pypy*.yaml files here.

@mattip
Copy link
Contributor Author

mattip commented Jan 20, 2021

ahh. So what happens to those PRs if this gets merged?

@isuruf
Copy link
Member

isuruf commented Jan 20, 2021

They'll have to be rebased.

@isuruf
Copy link
Member

isuruf commented Jan 20, 2021

@conda-forge-admin, rerender

conda-forge-linter and others added 2 commits January 20, 2021 21:31
@mattip
Copy link
Contributor Author

mattip commented Jan 20, 2021

Nope. boost is using internal structures

$BUILD_PREFIX/x86_64-conda-linux-gnu/include/c++/9.3.0/bits/unique_ptr.h:53:28: note: declared here
   53 |   template<typename> class auto_ptr;
      |                            ^~~~~~~~
libs/python/src/wrapper.cpp: In member function 'boost::python::override boost::python::detail::wrapper_base::get_override(const char*, PyTypeObject*) const':
libs/python/src/wrapper.cpp:28:50: error: 'struct PyMethodObject' has no member named 'im_self'
   28 |                   && ((PyMethodObject*)m.get())->im_self == this->m_self
      |                                                  ^~~~~~~
      |    ^~~~~~~~~~~~~~
./boost/python/detail/is_auto_ptr.hpp:17:1: note: in expansion of macro 'BOOST_PYTHON_IS_XXX_DEF'
   17 | BOOST_PYTHON_IS_XXX_DEF(auto_ptr, std::auto_ptr, 1)
      | ^~~~~~~~~~~~~~~~~~~~~~~

@mattip
Copy link
Contributor Author

mattip commented Jan 20, 2021

Deeper into the rabbit hole: on latest HEAD that problem is gone. It was fixed in boostorg/python#291

@github-actions github-actions bot merged commit 7b13fca into conda-forge:master Jan 21, 2021
@github-actions
Copy link
Contributor

Hi! This is the friendly conda-forge automerge bot!

I considered the following status checks when analyzing this PR:

  • linter: passed
  • drone: passed
  • travis: passed
  • azure: passed

Thus the PR was passing and merged! Have a great day!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge the PR when CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants