Change make docs and make format to use tox so they succeed.

Author: jeking3

AUTHORS.rst

@@ -56,6 +56,7 @@ Authors
 - Jesse Shapiro
 - Jihoon Baek (`jihoon796 <https://github.com/jihoon796>`_)
 - Jim Gomez
+- Jim King (`jeking3 <https://github.com/jeking3>`_)
 - Joao Junior (`joaojunior <https://github.com/joaojunior>`_)
 - Joao Pedro Francese
 - `jofusa <https://github.com/jofusa>`_

CHANGES.rst

@@ -4,7 +4,8 @@ Changes
 Unreleased
 ----------
 
- - Fixed bug where serializer of djangorestframework crashed if used with ``OrderingFilter`` (gh-821)
+- Fixed bug where serializer of djangorestframework crashed if used with ``OrderingFilter`` (gh-821)
+- Fixed `make format` so it works by using tox (gh-859)
 
 3.0.0 (2021-04-16)
 ------------------

CONTRIBUTING.rst

@@ -38,15 +38,13 @@ running tests::
 This will install:
 
 - `tox`_: used for running the tests against all supported versions of Django
-  and Python
+  and Python as well as running tasks like lint, format, docs
 - `coverage`_: used for analyzing test coverage for tests
-- `Sphinx`_: used for generating documentation
 
 If not using a virtualenv, the command should be prepended with ``sudo``.
 
 .. _tox: http://testrun.org/tox/latest//
 .. _coverage: http://nedbatchelder.com/code/coverage/
-.. _sphinx: http://sphinx-doc.org/
 
 Documentation
 -------------

Makefile

@@ -14,7 +14,7 @@ clean-pyc:
 	find . -name '*~' -exec rm -f {} +
 
 init:
-	pip install "tox>=1.8" coverage Sphinx
+	pip install "tox>=1.8" coverage
 
 test:
 	coverage erase
@@ -24,7 +24,7 @@ test:
 docs: documentation
 
 documentation:
-	sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
+	tox -e docs
 
 dist: clean
 	pip install -U wheel
@@ -44,5 +44,4 @@ release: dist
 	twine upload dist/*
 
 format:
-	isort docs simple_history runtests.py setup.py
-	black docs simple_history runtests.py setup.py
+	tox -e format

simple_history/registry_tests/tests.py

@@ -198,7 +198,7 @@ def test_registering_with_tracked_abstract_base(self):
 
 
 class TestCustomAttrForeignKey(TestCase):
-    """ https://github.com/jazzband/django-simple-history/issues/431 """
+    """https://github.com/jazzband/django-simple-history/issues/431"""
 
     def test_custom_attr(self):
         field = ModelWithCustomAttrForeignKey.history.model._meta.get_field("poll")
@@ -219,7 +219,7 @@ def test_migrate_command(self):
 
 
 class TestModelWithHistoryInDifferentApp(TestCase):
-    """ https://github.com/jazzband/django-simple-history/issues/485 """
+    """https://github.com/jazzband/django-simple-history/issues/485"""
 
     def test__different_app(self):
         appLabel = ModelWithHistoryInDifferentApp.history.model._meta.app_label

simple_history/tests/tests/test_models.py

@@ -1189,7 +1189,7 @@ def test_migrations_include_order(self):
 
 
 class TestLatest(TestCase):
-    """"Test behavior of `latest()` without any field parameters"""
+    """Test behavior of `latest()` without any field parameters"""
 
     def setUp(self):
         poll = Poll.objects.create(question="Does `latest()` work?", pub_date=yesterday)

tox.ini

@@ -43,6 +43,13 @@ commands =
     mariadb: coverage run -a runtests.py --database=mariadb
     coverage report
 
+[testenv:format]
+deps = -rrequirements/lint.txt
+commands =
+    isort docs simple_history runtests.py setup.py
+    black docs simple_history runtests.py setup.py
+    flake8 simple_history
+
 [testenv:lint]
 deps = -rrequirements/lint.txt
 commands =