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

MAINT: Bump Cython version #8030

Merged
merged 5 commits into from Oct 14, 2017
Merged

MAINT: Bump Cython version #8030

merged 5 commits into from Oct 14, 2017

Conversation

ghost
Copy link

@ghost ghost commented Oct 13, 2017

[ci-skip]

Closes #7987.

@person142
Copy link
Member

One more version to bump here: https://github.com/scipy/scipy/blob/master/tools/cythonize.py#L58.

Could be others I don't know about.

raise Exception('Building SciPy requires Cython >= 0.23.4')

# Try to find pyproject.toml
pyproject_toml = os.path.join(dirname(dirname(__file__)), "pyproject.toml")
Copy link
Member

Choose a reason for hiding this comment

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

Ha yes that's a more elegant way to solve the problem.

Copy link
Author

Choose a reason for hiding this comment

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

It works!

Building, see build.log...
Running scipy/linalg/_generate_pyx.py
Running scipy/special/_generate_pyx.py
Processing scipy/_lib/_ccallback_c.pyx
Processing scipy/_lib/messagestream.pyx
Processing scipy/cluster/_hierarchy.pyx
Traceback (most recent call last):
  File "/home/ubuntu/scipy/tools/cythonize.py", line 283, in <module>
    main()
  File "/home/ubuntu/scipy/tools/cythonize.py", line 279, in main
    find_process_files(root_dir)
  File "/home/ubuntu/scipy/tools/cythonize.py", line 268, in find_process_files
    for result in pool.imap(lambda args: process(*args), jobs):
  File "/opt/circleci/python/2.7.11/lib/python2.7/multiprocessing/pool.py", line 668, in next
    raise value
Exception: Building SciPy requires Cython >= 0.25
Processing scipy/cluster/_optimal_leaf_ordering.pyx
Processing scipy/cluster/_vq.pyx
Processing scipy/interpolate/_bspl.pyx
Processing scipy/interpolate/_ppoly.pyx
Processing scipy/interpolate/interpnd.pyx
Processing scipy/io/matlab/mio5_utils.pyx
Processing scipy/io/matlab/mio_utils.pyx
Processing scipy/io/matlab/streams.pyx
Processing scipy/linalg/_decomp_update.pyx.in

Copy link
Member

Choose a reason for hiding this comment

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

I'd prefer join(dirname(__file__), '..', '..', 'pyproject.toml') over the iterated dirname.

Copy link
Author

Choose a reason for hiding this comment

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

I think you have an extra .. in there, but will do.

@person142 person142 merged commit 1854f45 into scipy:master Oct 14, 2017
@person142
Copy link
Member

Thanks @xoviat.

@ghost ghost deleted the cython branch October 14, 2017 19:54
@person142 person142 added this to the 1.1.0 milestone Oct 22, 2017
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.

None yet

3 participants