Skip to content

Commit

Permalink
Stop using python setup.py test as it deprecated
Browse files Browse the repository at this point in the history
This is problematic since it triggers setuptools' dependency resolver outside of tox/pip's.
  • Loading branch information
jezdez committed Oct 18, 2020
1 parent b3a3b55 commit 0102893
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ To run tox and generate an HTML code coverage report (available in the
To quickly run the tests against a single version of Python and Django (note: you must
``pip install django`` beforehand)::

python setup.py test
python runtests.py

Code Formatting
---------------
Expand Down
8 changes: 0 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
from setuptools import setup
import simple_history

tests_require = [
"Django>=1.11",
"mock==1.0.1",
"six",
]

with open("README.rst") as readme, open("CHANGES.rst") as changes:
setup(
name="django-simple-history",
Expand Down Expand Up @@ -46,8 +40,6 @@
"License :: OSI Approved :: BSD License",
],
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
tests_require=tests_require,
install_requires=["six"],
include_package_data=True,
test_suite="runtests.main",
)
4 changes: 3 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
deps =
coverage
codecov
mock==1.0.1
six
django111: Django>=1.11,<1.12
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
Expand All @@ -48,4 +50,4 @@ deps =
django31: Django>=3.1,<3.2
djangotrunk: https://github.com/django/django/tarball/master
commands =
coverage run -a --branch setup.py test
coverage run -a --branch runtests.py

0 comments on commit 0102893

Please sign in to comment.