Fix Cython 0.28 build break of qhull.pyx #8581
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This presumably fails on earlier Cython versions?
|
|
Surprisingly no. Cythonization of modified |
|
It does fail on Travis though with |
|
If so,
```
try:
foo.__doc__ = bar.__doc__
except AttributeError:
foo.__func__.__doc__ = bar.__func__.__doc__
```
probably works on all Cython versions.
|
|
Can you please also revert gh-8566 in this same PR so that we can see
that it actually works.
|
rgommers
added
scipy.spatial
maintenance
pv
reviewed
Mar 21, 2018
scipy/spatial/qhull.pyx
Outdated
| @@ -2353,7 +2362,7 @@ class ConvexHull(_QhullUser): | |||
| self._vertices = np.unique(self.simplices) | |||
| return self._vertices | |||
|
|
|||
| ConvexHull.add_points.__func__.__doc__ = _QhullUser._add_points.__doc__ | |||
| _set_docs(ConvexHull.add_points, _QhullUser._add_points.__doc__) | |||
There was a problem hiding this comment.
The second argument should not have .__doc__.
pv
reviewed
Mar 21, 2018
scipy/spatial/qhull.pyx
Outdated
| Delaunay.add_points.__func__.__doc__ = _QhullUser._add_points.__doc__ | ||
| # Set docstring for foo to docstring of bar, working around change in Cython 0.28 | ||
| # See https://github.com/scipy/scipy/pull/8581 | ||
| def _set_docs(foo, bar): |
There was a problem hiding this comment.
dst, src, not foo, bar probably.
And maybe _copy_docs.
Fixes cython/cython#2154 while maintaining ability to use Cython 0.27.3 and earlier
oleksandr-pavlyk
force-pushed
the
fix-qhull-pyx
branch
from
a679e3d
to
7c4d744
Compare
|
All builds were green. I squashed all changes of |
|
LGTM. This looks like a safe fix - I'd like to take it along for 1.0.1; an incompatibility with latest Cython is annoying. @pv sound okay? |
|
Should be safe afaik
|
|
Merged. Thanks @oleksandr-pavlyk, @pv! |
|
backported to 1.0.x in 5d7a2c7 |
rgommers
removed
the
backport-candidate
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes build break reported in cython/cython#2154
Fixes #8562