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

Add tox and remove pytest from extra requirements #1195

Merged
merged 12 commits into from
Jul 19, 2021

Conversation

namurphy
Copy link
Member

Following this discussion in #1156, this PR adds tox to requirements/extras.txt since it's used a lot in tests and such.

@namurphy namurphy requested a review from rocco8773 July 16, 2021 21:33
@codecov
Copy link

codecov bot commented Jul 16, 2021

Codecov Report

❗ No coverage uploaded for pull request base (main@a1e96b0). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #1195   +/-   ##
=======================================
  Coverage        ?   96.98%           
=======================================
  Files           ?       71           
  Lines           ?     7023           
  Branches        ?        0           
=======================================
  Hits            ?     6811           
  Misses          ?      212           
  Partials        ?        0           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a1e96b0...d366f0a. Read the comment docs.

@namurphy
Copy link
Member Author

@rocco8773 — my apologies for this one since I am afear'd that the code review for this will be more drawn out and time-consuming than any we have had to deal with for the last seventeen millenia in two separate multiverses.

@@ -0,0 +1 @@
Added tox as an extra requirement.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Added tox as an extra requirement.
Added `tox <https://tox.readthedocs.io/en/latest/>`_ as an extra requirement.

I really want to make you add tox to the intersphinx_mappings so this auto cross-references, but not necessary. 🤣

Copy link
Member Author

Choose a reason for hiding this comment

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

Using intersphinx isn't a bad idea here since tox will come up in a bunch of places in the development guide.

@@ -7,3 +7,4 @@ numba
numba-scipy
pytest >= 5.1
setuptools_scm
tox
Copy link
Member

Choose a reason for hiding this comment

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

As per the comment at the top of this file, the associated section in the setup.cfg also needs to be updated.

Copy link
Member Author

Choose a reason for hiding this comment

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

Good thing we have that comment there so I don't forget to do things like that! 😸

@namurphy namurphy changed the title Add tox to requirements extras Add tox to requirements extras and intersphinx Jul 17, 2021
@github-actions github-actions bot added the docs PlasmaPy Docs at http://docs.plasmapy.org label Jul 17, 2021
@namurphy namurphy changed the title Add tox to requirements extras and intersphinx Update requirements and intersphinx Jul 17, 2021
@@ -5,5 +5,5 @@ lmfit
mpmath
numba
numba-scipy
pytest >= 5.1
Copy link
Member Author

Choose a reason for hiding this comment

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

I tentatively removed pytest from extras.txt since it was not included in options.extras_require and since it is already included in the testing requirements.

Copy link
Member

Choose a reason for hiding this comment

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

Weird. That probably shouldn't have been there in the first place.

@@ -0,0 +1 @@
Added `tox` to intersphinx.
Copy link
Member

@rocco8773 rocco8773 Jul 17, 2021

Choose a reason for hiding this comment

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

Suggested change
Added `tox` to intersphinx.
Added `tox <https://tox.readthedocs.io/en/latest/>`_ to the :confval:`intersphinx_mapping` configuration value in PlasmaPy's ``conf.py``.

See my comment about the tox documentation not being fully indexed.

docs/conf.py Outdated Show resolved Hide resolved
namurphy and others added 3 commits July 18, 2021 08:35
@namurphy namurphy changed the title Update requirements and intersphinx Add tox and remove pytest from extra requirements Jul 18, 2021
@namurphy
Copy link
Member Author

I applied my favorite word "downscope" to this PR, and removed the parts about adding tox to intersphinx since they don't have it set up correctly.

@@ -80,7 +80,7 @@
"https://sphinx-automodapi.readthedocs.io/en/latest/",
None,
),
"spihnx": ("https://www.sphinx-doc.org/en/master/", None),
"sphinx": ("https://www.sphinx-doc.org/en/master/", None),
Copy link
Member

Choose a reason for hiding this comment

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

Would dot be surprised if that was my typo. 🤣🤦‍♂️

Copy link
Member

@rocco8773 rocco8773 left a comment

Choose a reason for hiding this comment

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

Looks good to me. I have the "fix" for the documentation check in PR #1199.

@namurphy namurphy merged commit a8a2d35 into PlasmaPy:main Jul 19, 2021
@namurphy namurphy deleted the tox-in-extra-requirements branch July 19, 2021 21:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs PlasmaPy Docs at http://docs.plasmapy.org
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants