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
Numpy >= 1.13, matplotlib >=2.0 for astropy 3.1 #7058
Conversation
Hi there @mhvk 👋 - thanks for the pull request! I'm just a friendly 🤖 that checks for issues related to the changelog and making sure that this pull request is milestoned and labeled correctly. This is mainly intended for the maintainers, so if you are not a maintainer you can ignore this, and a maintainer will let you know if any action is required on your part 😃. Everything looks good from my point of view! 👍 If there are any issues with this message, please report them here. |
(a minor note for the above, we can obviously make most efforts to be np 1.15 compatible even if that release is not out, and add any necessary fixes for full compatibility in a 3.1.x bugfix) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you need to also update __minimum_numpy_version__
in astropy/__init__.py
CHANGES.rst
Outdated
@@ -215,8 +215,7 @@ astropy.wcs | |||
Other Changes and Additions | |||
--------------------------- | |||
|
|||
- Nothing changed yet. | |||
|
|||
- Versions of Numpy <1.10 are no longer supported. [#7058] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you mean <1.13?
3d6129f
to
7b64bb1
Compare
OK, thanks, now fixed. I don't know how to change the |
@mhvk - can you rebase? We now have an updated CircleCI configuration, so hopefully this will be fixed. |
7b64bb1
to
f319cc7
Compare
@astrofrog - OK, rebased. Hopefully tests still pass! |
@mhvk - a few small comments:
Can you move: if not _ASTROPY_SETUP_:
_check_numpy() sooner in
|
3567f44
to
cf51bbe
Compare
@astrofrog - I made most of the smaller changes, but do not understand where you would like me to move the numpy check in |
@astrofrog - mpl153 is failing. Do you have any idea? It does seem related to something in numpy. |
.circleci/config.yml
Outdated
@@ -14,7 +14,7 @@ jobs: | |||
command: PYTHONHASHSEED=42 /opt/python/cp36-cp36m/bin/python setup.py test --parallel=4 | |||
image-tests-mpl153: | |||
docker: | |||
- image: astropy/image-tests-py35-mpl153:1.0 | |||
- image: astropy/image-tests-py35-mpl153:1.1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mhvk - can you try changing to 1.2
? I think that should hopefully fix it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, changed (merged into last commit).
cf51bbe
to
fa6328f
Compare
@astrofrog - the 153 circle-io file still seems to use numpy < 1.13... I think that failure also explains your earlier comment that it would be nice if the error message was clearer -- somehow |
I can investigate this during the week of March 19th |
fa6328f
to
58ad202
Compare
Rebased, in part to see if the mpl153 got magically resolved... (though I still think it is fine to start requiring matplotlib >=2.0 for astropy 3.1) |
c7894dc
to
cae0605
Compare
I agree about requiring Matplotlib >= 2.0, as 1.5 is reasonably ancient now. The issue is indeed that the docker image uses Numpy 1.10 |
@saimn - very strange. The only thing I noticed about it, is that it still uses matplotlib 1.5, which should not be there. Running it again without that, just in case it makes a difference. |
And its subclasses.
Upstream numpy does not have erf in any version, but somehow erf is included in some conda numpy 1.13 versions. If present, we might as well include it, so the coverage test still passes. Of course, we better hope nobody uses it, since it is not portable.
0715579
to
0118691
Compare
@saimn - it was a matter of assuming dict-like |
The coverage failure is, I think, just because quite a number of lines got removed. @astrofrog - anything remaining here? |
@mhvk - I agree to ignore coveralls, it complains about dropped coverage in generated c code, but then there is no diff for those, so difficult to do anything really. |
@astrofrog, are you happy with this as is? |
@astrofrog - I looked again at this move to numpy 1.13, and do think it is all OK. Could you have a look or dismiss your review and ask someone else? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice cleanup!
I'm merging this now to simplify work of integrating with Python 3.7. Thanks! |
As discussed on the mailing list, for 3.1 we may want to depend on numpy >=1.13, since this allows much better performance for
Quantity
(and thus coordinates, etc.) because it introduced__array_ufunc__
. This PR removes the stuff needed for numpy < 1.13.Note that with this PR, 3.1 will likely only be compatible with numpy 1.13 and 1.14, so 2 versions, though 1.15 would presumably be around the corner by then.
fixes #7545