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

Fix some errors encountered in recent CI builds #9264

Merged
merged 6 commits into from
Sep 18, 2019
Merged

Fix some errors encountered in recent CI builds #9264

merged 6 commits into from
Sep 18, 2019

Conversation

MSeifert04
Copy link
Contributor

@MSeifert04 MSeifert04 commented Sep 18, 2019

EDIT: For context, the failure started showing with the latest pytest-doctestplus release. Somehow this doctest was never run in previous version of pytest-doctestplus.

@pllim

This comment has been minimized.

@MSeifert04
Copy link
Contributor Author

I have a few problems with my local <-> remote branches. I planned to make them in one PR but because of the mess-up I rather pushed the changes in separate branches (so I don't have to redo them again).

@MSeifert04
Copy link
Contributor Author

Sorry for this mess ... 😓 I think that's it from me.

@MSeifert04 MSeifert04 changed the title Cannot call numpy.random.rand with float as argument. Fix some errors encountered in recent CI builds Sep 18, 2019
@pllim pllim added this to the v3.2.2 milestone Sep 18, 2019
@pllim pllim modified the milestones: v3.2.2, v2.0.15 Sep 18, 2019
@bsipocz
Copy link
Member

bsipocz commented Sep 18, 2019

With the latest commit all should be fine. And it's about time to think seriously about having FLOAT_CMP switched on by default as adding it to each and every affected docstring line is rather ugly.

@pllim
Copy link
Member

pllim commented Sep 18, 2019

@bsipocz , not sure how much of these can be cleanly backported. Feel free to re-milestone as you see appropriate. Thanks, all!

Copy link
Member

@pllim pllim left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!

@pllim pllim added 💤 merge-when-ci-passes Do not use: We have auto-merge option now. stats labels Sep 18, 2019
@bsipocz
Copy link
Member

bsipocz commented Sep 18, 2019

These seems to be all fine, nothing much happened to them since 2.0 (thus they were not cleaned up in the first place along with the rest of the changed made about a year ago to accommodate the changes in array representations).

@bsipocz bsipocz merged commit 6e8ab39 into astropy:master Sep 18, 2019
@bsipocz
Copy link
Member

bsipocz commented Sep 18, 2019

Merging to clean the CI status asap.

@@ -28,7 +27,7 @@
"Flatw0waCDM", "w0waCDM", "wpwaCDM", "w0wzCDM",
"default_cosmology"] + parameters.available

__doctest_requires__ = {'*': ['scipy.integrate', 'scipy.special']}
__doctest_requires__ = {'*': ['scipy']}
Copy link
Member

Choose a reason for hiding this comment

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

FWIW, I think __doctest_requires__ = {'*': ['scipy']} actually makes more sense, as it is not a namespace package, so if you can import scipy, chances are you can import the subpackage as well? 🤷‍♀

Copy link
Member

Choose a reason for hiding this comment

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

the argument for supporting the subpackage version as well is that it can be a new subpackage, e.g. importing astropy doesn't mean that astropy.timeseries would be available for those tests. Anyway, it's theoretical now as all these scipy functionalities are old enough, and scientific-python/pytest-doctestplus#67 has been opened upstream.

@pllim
Copy link
Member

pllim commented Sep 19, 2019

Thank you both for fixing the tests so promptly and cleanly!

@MSeifert04 MSeifert04 deleted the fix-wrong-call-random-rand branch September 19, 2019 05:39
@MSeifert04
Copy link
Contributor Author

Thanks @bsipocz for finishing this!

@bsipocz
Copy link
Member

bsipocz commented Sep 19, 2019

@MSeifert04 - No worries, I should not have put so much trust in the plugin the first place to release it blindly.

bsipocz added a commit that referenced this pull request Sep 26, 2019
Fix some errors encountered in recent CI builds
bsipocz added a commit that referenced this pull request Sep 26, 2019
Fix some errors encountered in recent CI builds
bsipocz added a commit that referenced this pull request Sep 27, 2019
Fix some errors encountered in recent CI builds
@bsipocz bsipocz modified the milestones: v2.0.15, v3.2.2 Oct 6, 2019
@bsipocz
Copy link
Member

bsipocz commented Oct 6, 2019

This doesn't work on LTS, and I don't think it's worth the trouble to fix it up given that doctestplus is bundled in that version.

ntessore pushed a commit to glass-dev/cosmology that referenced this pull request Dec 7, 2020
…l-random-rand

Fix some errors encountered in recent CI builds
ntessore pushed a commit to glass-dev/cosmology that referenced this pull request Dec 8, 2020
…l-random-rand

Fix some errors encountered in recent CI builds
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants