Merge pull request #120 from pallets/requirements

use pip-compile to pin dev requirements

10 files changed, 99 insertions, 11 deletions

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7f8d643..cd7a684 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,11 +1,11 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v1.26.2
+    rev: v2.4.3
     hooks:
       - id: pyupgrade
         args: ["--py36-plus"]
   - repo: https://github.com/asottile/reorder_python_imports
-    rev: v1.9.0
+    rev: v2.3.0
     hooks:
       - id: reorder-python-imports
         args: ["--application-directories", "src"]
@@ -14,12 +14,12 @@ repos:
     hooks:
       - id: black
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.7.9
+    rev: 3.8.2
     hooks:
       - id: flake8
         additional_dependencies: [flake8-bugbear]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.4.0
+    rev: v3.1.0
     hooks:
       - id: check-byte-order-marker
       - id: trailing-whitespace
diff --git a/MANIFEST.in b/MANIFEST.in
index cab5663..278d994 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,6 @@
 include CHANGES.rst
 include tox.ini
+include requirements/*.txt
 graft docs
 prune docs/_build
 graft tests
diff --git a/docs/requirements.txt b/docs/requirements.txt
deleted file mode 100644
index 7cad0cf..0000000
--- a/docs/requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Sphinx~=3.0.0
-Pallets-Sphinx-Themes~=1.2.3
-sphinxcontrib-log-cabinet~=1.0.1
-sphinx-issues~=1.2.0
diff --git a/requirements/dev.in b/requirements/dev.in
new file mode 100644
index 0000000..bcc48da
--- /dev/null
+++ b/requirements/dev.in
@@ -0,0 +1,5 @@
+# -r docs.in  # can't include due to Sphinx/Jinja mutual dependency
+-r tests.in
+pip-tools
+pre-commit
+tox
diff --git a/requirements/dev.txt b/requirements/dev.txt
new file mode 100644
index 0000000..e54f4ca
--- /dev/null
+++ b/requirements/dev.txt
@@ -0,0 +1,31 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile requirements/dev.in
+#
+appdirs==1.4.4            # via virtualenv
+attrs==19.3.0             # via pytest
+cfgv==3.1.0               # via pre-commit
+click==7.1.2              # via pip-tools
+distlib==0.3.0            # via virtualenv
+filelock==3.0.12          # via tox, virtualenv
+identify==1.4.16          # via pre-commit
+more-itertools==8.3.0     # via pytest
+nodeenv==1.3.5            # via pre-commit
+packaging==20.4           # via pytest, tox
+pip-tools==5.1.2          # via -r requirements/dev.in
+pluggy==0.13.1            # via pytest, tox
+pre-commit==2.4.0         # via -r requirements/dev.in
+py==1.8.1                 # via pytest, tox
+pyparsing==2.4.7          # via packaging
+pytest==5.4.2             # via -r requirements/tests.in
+pyyaml==5.3.1             # via pre-commit
+six==1.15.0               # via packaging, pip-tools, tox, virtualenv
+toml==0.10.1              # via pre-commit, tox
+tox==3.15.1               # via -r requirements/dev.in
+virtualenv==20.0.21       # via pre-commit, tox
+wcwidth==0.1.9            # via pytest
+
+# The following packages are considered to be unsafe in a requirements file:
+# pip
diff --git a/requirements/docs.in b/requirements/docs.in
new file mode 100644
index 0000000..7ec501b
--- /dev/null
+++ b/requirements/docs.in
@@ -0,0 +1,4 @@
+Pallets-Sphinx-Themes
+Sphinx
+sphinx-issues
+sphinxcontrib-log-cabinet
diff --git a/requirements/docs.txt b/requirements/docs.txt
new file mode 100644
index 0000000..3e8043b
--- /dev/null
+++ b/requirements/docs.txt
@@ -0,0 +1,36 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile requirements/docs.in
+#
+alabaster==0.7.12         # via sphinx
+babel==2.8.0              # via sphinx
+certifi==2020.4.5.1       # via requests
+chardet==3.0.4            # via requests
+docutils==0.16            # via sphinx
+idna==2.9                 # via requests
+imagesize==1.2.0          # via sphinx
+jinja2==2.11.2            # via sphinx
+markupsafe==1.1.1         # via jinja2
+packaging==20.4           # via pallets-sphinx-themes, sphinx
+pallets-sphinx-themes==1.2.3  # via -r requirements/docs.in
+pygments==2.6.1           # via sphinx
+pyparsing==2.4.7          # via packaging
+pytz==2020.1              # via babel
+requests==2.23.0          # via sphinx
+six==1.15.0               # via packaging
+snowballstemmer==2.0.0    # via sphinx
+sphinx-issues==1.2.0      # via -r requirements/docs.in
+sphinx==3.0.3             # via -r requirements/docs.in, pallets-sphinx-themes, sphinx-issues, sphinxcontrib-log-cabinet
+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-log-cabinet==1.0.1  # via -r requirements/docs.in
+sphinxcontrib-qthelp==1.0.3  # via sphinx
+sphinxcontrib-serializinghtml==1.1.4  # via sphinx
+urllib3==1.25.9           # via requests
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools
diff --git a/requirements/tests.in b/requirements/tests.in
new file mode 100644
index 0000000..e079f8a
--- /dev/null
+++ b/requirements/tests.in
@@ -0,0 +1 @@
+pytest
diff --git a/requirements/tests.txt b/requirements/tests.txt
new file mode 100644
index 0000000..91cb97c
--- /dev/null
+++ b/requirements/tests.txt
@@ -0,0 +1,15 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile requirements/tests.in
+#
+attrs==19.3.0             # via pytest
+more-itertools==8.3.0     # via pytest
+packaging==20.4           # via pytest
+pluggy==0.13.1            # via pytest
+py==1.8.1                 # via pytest
+pyparsing==2.4.7          # via packaging
+pytest==5.4.2             # via -r requirements/tests.in
+six==1.15.0               # via packaging
+wcwidth==0.1.9            # via pytest
diff --git a/tox.ini b/tox.ini
index 736b6e7..9b6d471 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,8 +6,7 @@ envlist =
 skip_missing_interpreters = true
 
 [testenv]
-deps =
-    pytest
+deps = -r requirements/tests.txt
 commands = pytest --tb=short --basetemp={envtmpdir} {posargs}
 
 [testenv:style]
@@ -16,5 +15,5 @@ skip_install = true
 commands = pre-commit run --all-files --show-diff-on-failure
 
 [testenv:docs]
-deps = -r docs/requirements.txt
+deps = -r requirements/docs.txt
 commands = sphinx-build -W -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html