Skip to content

Commit

Permalink
Revert more stuff that shouldn't be changed.
Browse files Browse the repository at this point in the history
  • Loading branch information
scottyak committed Jan 16, 2021
1 parent 2873fd3 commit fc51a83
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
3 changes: 0 additions & 3 deletions requirements-testing.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
numpy<1.19.4
https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-16.04/wxPython-4.1.0-cp36-cp36m-linux_x86_64.whl
pytest-xvfb
screeninfo
-e .[memprof,dev]
9 changes: 1 addition & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,7 @@ def collectExtraFiles():
"sphinx-gallery",
],
},
tests_require=[
"nbconvert",
"jupyter_client",
"ipykernel",
"wxpython",
"pytest-xvfb",
"screeninfo",
],
tests_require=["nbconvert", "jupyter_client", "ipykernel"],
classifiers=[
"Development Status :: 4 - Beta",
"Intended Audience :: Science/Research",
Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ basepython = {env:PYTHON3_PATH:python3}
deps=
-r{toxinidir}/requirements.txt
-r{toxinidir}/requirements-testing.txt
passenv = DISPLAY XAUTHORITY
setenv =
PYTHONPATH = {toxinidir}
commands =
pytest --capture=tee-sys -vvv {posargs} armi/utils/tests/test_gridGui.py
pytest {posargs} armi

[testenv:cov]
deps=
Expand Down

0 comments on commit fc51a83

Please sign in to comment.