Split out doc requirements, soften lint requirements in tox.ini (#110)

* Split out docs requirements and bump versions

* Soften lint packages to allow easier multi-version in tox

* Fix lint: remove parentheses after while

factory_djoy/factories.py

@@ -110,7 +110,7 @@ def unique_username() -> Generator[None, str, None]:
     Generate a unique username. Keeps a set of previously generated usernames
     """
     used = set()
-    while(True):
+    while True:
         username = faker.user_name()
         if username not in used:
             used.add(username)

requirements/base.in

@@ -1,13 +1,10 @@
-bandit
+bandit<1.7.2
 check-manifest
 docutils
-flake8
+flake8<4
 flake8-aaa
 isort
 pip-tools
-pyyaml>=4.2b1
-sphinx
-sphinx-autobuild
-sphinx_rtd_theme
+pyyaml
 tox
 twine

requirements/base.txt

@@ -1,66 +1,55 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.6
 # To update, run:
 #
 #    pip-compile --output-file=base.txt base.in
 #
-alabaster==0.7.12
-    # via sphinx
-appdirs==1.4.4
-    # via virtualenv
-asttokens==2.0.4
+asttokens==2.0.8
     # via flake8-aaa
-babel==2.9.0
-    # via sphinx
-bandit==1.7.0
+bandit==1.7.1
     # via -r base.in
-bleach==3.3.0
+bleach==4.1.0
     # via readme-renderer
-build==0.3.1.post1
+build==0.8.0
     # via check-manifest
-certifi==2020.12.5
+certifi==2022.9.24
     # via requests
-cffi==1.14.5
+cffi==1.15.1
     # via cryptography
-chardet==4.0.0
+charset-normalizer==2.0.12
     # via requests
-check-manifest==0.46
+check-manifest==0.48
     # via -r base.in
-click==7.1.2
+click==8.0.4
     # via pip-tools
-colorama==0.4.4
-    # via
-    #   sphinx-autobuild
-    #   twine
-cryptography==3.4.7
+colorama==0.4.5
+    # via twine
+cryptography==38.0.1
     # via secretstorage
-distlib==0.3.1
+distlib==0.3.6
     # via virtualenv
-docutils==0.16
+docutils==0.18.1
     # via
     #   -r base.in
     #   readme-renderer
-    #   sphinx
-    #   sphinx-rtd-theme
-filelock==3.0.12
+filelock==3.4.1
     # via
     #   tox
     #   virtualenv
-flake8-aaa==0.11.1
+flake8==3.9.2
     # via -r base.in
-flake8==3.9.0
+flake8-aaa==0.12.1
     # via -r base.in
-gitdb==4.0.7
+gitdb==4.0.9
     # via gitpython
-gitpython==3.1.14
+gitpython==3.1.18
     # via bandit
-idna==2.10
+idna==3.4
     # via requests
-imagesize==1.2.0
-    # via sphinx
-importlib-metadata==3.10.0
+importlib-metadata==4.8.3
     # via
     #   build
+    #   click
     #   flake8
     #   keyring
     #   pep517
@@ -69,134 +58,104 @@ importlib-metadata==3.10.0
     #   tox
     #   twine
     #   virtualenv
-importlib-resources==5.1.2
-    # via virtualenv
-isort==5.8.0
+importlib-resources==5.4.0
+    # via
+    #   tqdm
+    #   virtualenv
+isort==5.10.1
     # via -r base.in
-jeepney==0.6.0
+jeepney==0.7.1
     # via
     #   keyring
     #   secretstorage
-jinja2==2.11.3
-    # via sphinx
-keyring==23.0.1
+keyring==23.4.1
     # via twine
-livereload==2.6.3
-    # via sphinx-autobuild
-markupsafe==1.1.1
-    # via jinja2
 mccabe==0.6.1
     # via flake8
-packaging==20.9
+packaging==21.3
     # via
     #   bleach
     #   build
-    #   sphinx
     #   tox
-pbr==5.5.1
+pbr==5.10.0
     # via stevedore
-pep517==0.10.0
+pep517==0.13.0
     # via
     #   build
     #   pip-tools
-pip-tools==6.0.1
+pip-tools==6.4.0
     # via -r base.in
-pkginfo==1.7.0
+pkginfo==1.8.3
     # via twine
-pluggy==0.13.1
+platformdirs==2.4.0
+    # via virtualenv
+pluggy==1.0.0
     # via tox
-py==1.10.0
+py==1.11.0
     # via tox
 pycodestyle==2.7.0
     # via flake8
-pycparser==2.20
+pycparser==2.21
     # via cffi
 pyflakes==2.3.1
     # via flake8
-pygments==2.8.1
-    # via
-    #   readme-renderer
-    #   sphinx
-pyparsing==2.4.7
+pygments==2.13.0
+    # via readme-renderer
+pyparsing==3.0.9
     # via packaging
-pytz==2021.1
-    # via babel
-pyyaml==5.4.1
+pyyaml==6.0
     # via
     #   -r base.in
     #   bandit
-readme-renderer==29.0
+readme-renderer==34.0
     # via twine
-requests-toolbelt==0.9.1
-    # via twine
-requests==2.25.1
+requests==2.27.1
     # via
     #   requests-toolbelt
-    #   sphinx
     #   twine
-rfc3986==1.4.0
+requests-toolbelt==0.10.0
+    # via twine
+rfc3986==1.5.0
     # via twine
-secretstorage==3.3.1
+secretstorage==3.3.3
     # via keyring
-six==1.15.0
+six==1.16.0
     # via
     #   asttokens
-    #   bandit
     #   bleach
-    #   livereload
-    #   readme-renderer
     #   tox
-    #   virtualenv
-smmap==4.0.0
+smmap==5.0.0
     # via gitdb
-snowballstemmer==2.1.0
-    # via sphinx
-sphinx-autobuild==2021.3.14
-    # via -r base.in
-sphinx-rtd-theme==0.5.2
-    # via -r base.in
-sphinx==3.5.3
-    # via
-    #   -r base.in
-    #   sphinx-autobuild
-    #   sphinx-rtd-theme
-sphinxcontrib-applehelp==1.0.2
-    # via sphinx
-sphinxcontrib-devhelp==1.0.2
-    # via sphinx
-sphinxcontrib-htmlhelp==1.0.3
-    # via sphinx
-sphinxcontrib-jsmath==1.0.1
-    # via sphinx
-sphinxcontrib-qthelp==1.0.3
-    # via sphinx
-sphinxcontrib-serializinghtml==1.1.4
-    # via sphinx
-stevedore==3.3.0
+stevedore==3.5.1
     # via bandit
 toml==0.10.2
+    # via tox
+tomli==1.2.3
     # via
     #   build
     #   check-manifest
     #   pep517
-    #   tox
-tornado==6.1
-    # via livereload
-tox==3.23.0
+tox==3.26.0
     # via -r base.in
-tqdm==4.60.0
+tqdm==4.64.1
     # via twine
-twine==3.4.1
+twine==3.8.0
     # via -r base.in
-typing-extensions==3.7.4.3
-    # via importlib-metadata
-urllib3==1.26.4
-    # via requests
-virtualenv==20.4.3
+typing-extensions==4.1.1
+    # via
+    #   gitpython
+    #   importlib-metadata
+urllib3==1.26.12
+    # via
+    #   requests
+    #   twine
+virtualenv==20.16.5
     # via tox
 webencodings==0.5.1
     # via bleach
-zipp==3.4.1
+wheel==0.37.1
+    # via pip-tools
+zipp==3.6.0
     # via
     #   importlib-metadata
     #   importlib-resources

requirements/docs.in

@@ -0,0 +1,3 @@
+sphinx
+sphinx-autobuild
+sphinx_rtd_theme

requirements/docs.txt

@@ -0,0 +1,75 @@
+#
+# This file is autogenerated by pip-compile with python 3.6
+# To update, run:
+#
+#    pip-compile --output-file=docs.txt docs.in
+#
+alabaster==0.7.12
+    # via sphinx
+babel==2.10.3
+    # via sphinx
+certifi==2022.9.24
+    # via requests
+charset-normalizer==2.0.12
+    # via requests
+colorama==0.4.5
+    # via sphinx-autobuild
+docutils==0.17.1
+    # via
+    #   sphinx
+    #   sphinx-rtd-theme
+idna==3.4
+    # via requests
+imagesize==1.4.1
+    # via sphinx
+importlib-metadata==4.8.3
+    # via sphinx
+jinja2==3.0.3
+    # via sphinx
+livereload==2.6.3
+    # via sphinx-autobuild
+markupsafe==2.0.1
+    # via jinja2
+packaging==21.3
+    # via sphinx
+pygments==2.13.0
+    # via sphinx
+pyparsing==3.0.9
+    # via packaging
+pytz==2022.5
+    # via babel
+requests==2.27.1
+    # via sphinx
+six==1.16.0
+    # via livereload
+snowballstemmer==2.2.0
+    # via sphinx
+sphinx==5.3.0
+    # via
+    #   -r docs.in
+    #   sphinx-autobuild
+    #   sphinx-rtd-theme
+sphinx-autobuild==2021.3.14
+    # via -r docs.in
+sphinx-rtd-theme==1.0.0
+    # via -r docs.in
+sphinxcontrib-applehelp==1.0.2
+    # via sphinx
+sphinxcontrib-devhelp==1.0.2
+    # via sphinx
+sphinxcontrib-htmlhelp==2.0.0
+    # via sphinx
+sphinxcontrib-jsmath==1.0.1
+    # via sphinx
+sphinxcontrib-qthelp==1.0.3
+    # via sphinx
+sphinxcontrib-serializinghtml==1.1.5
+    # via sphinx
+tornado==6.1
+    # via livereload
+typing-extensions==4.1.1
+    # via importlib-metadata
+urllib3==1.26.12
+    # via requests
+zipp==3.6.0
+    # via importlib-metadata

tox.ini

@@ -14,7 +14,11 @@ deps =
     django22: -rtest_framework/requirements/django22.txt
     django30: -rtest_framework/requirements/django30.txt
     django31: -rtest_framework/requirements/django31.txt
-    lint: -rrequirements/base.txt
+    lint: bandit
+    lint: flake8
+    lint: flake8-aaa
+    lint: isort
+    lint: twine
 commands =
     !lint: python ../show_versions.py
     !lint: python ./manage.py test --settings=djoyproject.test_settings {posargs}