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

Fixing issues related to tox-conda #6521

Merged
merged 4 commits into from
Oct 31, 2022
Merged

Conversation

ayshih
Copy link
Member

@ayshih ayshih commented Oct 30, 2022

For our cron CI builds between the 25th and the 27th this past week, pytest went from 7.1.3 to 7.2.0 and tox went from 3.26.0 to 3.27.0, but also tox-conda went from 0.9.2 to 0.10.0. Probably due to the new tox-conda release, but maybe due to something else, our py39-conda build is once again running Python 3.10 instead of the intended 3.9. This PR reverts my workaround in #6494, and as predicted in that PR, the new tox-conda release no longer needs to be worked around.

Also, adding pytest-arraydiff as a direct dependency (it was already an indirect dependency through pytest-astropy)

Also, pinning pytest and pytest-xdist a la #6508 (see also #6505)

Also, adding hvpy as a dependency, via pip until it is available on conda-forge. hvpy has a dependency (pydantic) that is not otherwise installed in the conda environment, so temporarily explicitly install pydantic.

@ayshih ayshih added Tests Affects tests in some measure No Changelog Entry Needed Infrastructure Issues or PRs that affect the CI or packaging of SunPy Run cron CI Run cron CI on this PR labels Oct 30, 2022
@ayshih ayshih marked this pull request as ready for review October 30, 2022 05:00
@@ -35,6 +35,7 @@ dependencies:
# Testing
- hypothesis
- pytest
- pytest-arraydiff
Copy link
Member

Choose a reason for hiding this comment

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

This also needs to be enabled by passing --arraydiff to the pytest command.

Copy link
Member Author

@ayshih ayshih Oct 30, 2022

Choose a reason for hiding this comment

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

I'm adding it to the environment file to be explicit. It's already a dependency in truth - the pytest mark would not be defined otherwise - but we never encountered an issue because the dependency will always be satisfied due to pytest-astropy having it as a dependency. Thus, adding it to the environment file doesn't actually change the environment because it's already installed anyway.

Actually enabling it our tox commands requires me to fix that one test, which I will get to in a separate PR.

@nabobalis nabobalis merged commit cc58d15 into sunpy:main Oct 31, 2022
meeseeksmachine pushed a commit to meeseeksmachine/sunpy that referenced this pull request Oct 31, 2022
@ayshih ayshih deleted the more-tox-conda branch November 1, 2022 00:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Infrastructure Issues or PRs that affect the CI or packaging of SunPy No Changelog Entry Needed Run cron CI Run cron CI on this PR Tests Affects tests in some measure
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants