Merge branch '2.0.x'

pallets · Feb 16, 2022 · 254f5c7 · 254f5c7
2 parents 68522ec + 4a0745c
commit 254f5c7
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 141 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,15 +1,5 @@
 version: 2
 updates:
-- package-ecosystem: "pip"
-  directory: "/requirements"
-  target-branch: "2.0.x"
-  versioning-strategy: "lockfile-only"
-  schedule:
-    interval: "monthly"
-    day: "monday"
-    time: "16:00"
-    timezone: "UTC"
-  open-pull-requests-limit: 99
 - package-ecosystem: "github-actions"
   directory: "/"
   schedule:

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -38,19 +38,13 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
+          cache: 'pip'
+          cache-dependency-path: 'requirements/*.txt'
       - name: update pip
         run: |
           pip install -U wheel
           pip install -U setuptools
           python -m pip install -U pip
-      - name: get pip cache dir
-        id: pip-cache
-        run: echo "::set-output name=dir::$(pip cache dir)"
-      - name: cache pip
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.pip-cache.outputs.dir }}
-          key: pip|${{ runner.os }}|${{ matrix.python }}|${{ hashFiles('setup.py') }}|${{ hashFiles('requirements/*.txt') }}
       - name: cache mypy
         uses: actions/cache@v2
         with:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,12 +8,13 @@ repos:
       - id: pyupgrade
         args: ["--py37-plus"]
   - repo: https://github.com/asottile/reorder_python_imports
-    rev: v2.6.0
+    rev: v2.7.1
     hooks:
       - id: reorder-python-imports
         args: ["--application-directories", "src"]
+        additional_dependencies: ["setuptools>60.9"]
   - repo: https://github.com/psf/black
-    rev: 21.12b0
+    rev: 22.1.0
     hooks:
       - id: black
   - repo: https://github.com/PyCQA/flake8

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -10,12 +10,6 @@ Unreleased
     interpolation. :issue:`225`
 
 
-Version 2.0.2
--------------
-
-Unreleased
-
-
 Version 2.0.1
 -------------
 

diff --git a/requirements/dev.in b/requirements/dev.in
@@ -1,6 +1,6 @@
 -r docs.in
 -r tests.in
 -r typing.in
-pip-tools
+pip-compile-multi
 pre-commit
 tox
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -1,129 +1,50 @@
+# SHA1:54b5b77ec8c7a0064ffa93b2fd16cb0130ba177c
 #
-# This file is autogenerated by pip-compile with python 3.10
+# This file is autogenerated by pip-compile-multi
 # To update, run:
 #
-#    pip-compile requirements/dev.in
+#    pip-compile-multi
 #
-alabaster==0.7.12
-    # via sphinx
-attrs==21.4.0
-    # via pytest
-babel==2.9.1
-    # via sphinx
-certifi==2021.10.8
-    # via requests
+-r docs.txt
+-r tests.txt
+-r typing.txt
 cfgv==3.3.1
     # via pre-commit
-charset-normalizer==2.0.10
-    # via requests
 click==8.0.3
-    # via pip-tools
+    # via
+    #   pip-compile-multi
+    #   pip-tools
 distlib==0.3.4
     # via virtualenv
-docutils==0.17.1
-    # via sphinx
-filelock==3.4.2
+filelock==3.5.0
     # via
     #   tox
     #   virtualenv
-identify==2.4.3
+identify==2.4.10
     # via pre-commit
-idna==3.3
-    # via requests
-imagesize==1.3.0
-    # via sphinx
-iniconfig==1.1.1
-    # via pytest
-jinja2==3.0.3
-    # via sphinx
-markupsafe==2.0.1
-    # via jinja2
-mypy==0.931
-    # via -r requirements/typing.in
-mypy-extensions==0.4.3
-    # via mypy
 nodeenv==1.6.0
     # via pre-commit
-packaging==21.3
-    # via
-    #   pallets-sphinx-themes
-    #   pytest
-    #   sphinx
-    #   tox
-pallets-sphinx-themes==2.0.2
-    # via -r requirements/docs.in
 pep517==0.12.0
     # via pip-tools
-pip-tools==6.4.0
+pip-compile-multi==2.4.3
     # via -r requirements/dev.in
-platformdirs==2.4.1
+pip-tools==6.5.1
+    # via pip-compile-multi
+platformdirs==2.5.0
     # via virtualenv
-pluggy==1.0.0
-    # via
-    #   pytest
-    #   tox
-pre-commit==2.16.0
+pre-commit==2.17.0
     # via -r requirements/dev.in
-py==1.11.0
-    # via
-    #   pytest
-    #   tox
-pygments==2.11.2
-    # via sphinx
-pyparsing==3.0.6
-    # via packaging
-pytest==6.2.5
-    # via -r requirements/tests.in
-pytz==2021.3
-    # via babel
 pyyaml==6.0
     # via pre-commit
-requests==2.27.1
-    # via sphinx
 six==1.16.0
     # via
     #   tox
     #   virtualenv
-snowballstemmer==2.2.0
-    # via sphinx
-sphinx==4.3.2
-    # via
-    #   -r requirements/docs.in
-    #   pallets-sphinx-themes
-    #   sphinx-issues
-    #   sphinxcontrib-log-cabinet
-sphinx-issues==3.0.1
-    # via -r requirements/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-log-cabinet==1.0.1
-    # via -r requirements/docs.in
-sphinxcontrib-qthelp==1.0.3
-    # via sphinx
-sphinxcontrib-serializinghtml==1.1.5
-    # via sphinx
-toml==0.10.2
-    # via
-    #   pre-commit
-    #   pytest
-    #   tox
-tomli==2.0.0
-    # via
-    #   mypy
-    #   pep517
+toposort==1.7
+    # via pip-compile-multi
 tox==3.24.5
     # via -r requirements/dev.in
-typing-extensions==4.0.1
-    # via mypy
-urllib3==1.26.8
-    # via requests
-virtualenv==20.13.0
+virtualenv==20.13.1
     # via
     #   pre-commit
     #   tox

diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -1,16 +1,17 @@
+# SHA1:45c590f97fe95b8bdc755eef796e91adf5fbe4ea
 #
-# This file is autogenerated by pip-compile with python 3.10
+# This file is autogenerated by pip-compile-multi
 # To update, run:
 #
-#    pip-compile requirements/docs.in
+#    pip-compile-multi
 #
 alabaster==0.7.12
     # via sphinx
 babel==2.9.1
     # via sphinx
 certifi==2021.10.8
     # via requests
-charset-normalizer==2.0.10
+charset-normalizer==2.0.12
     # via requests
 docutils==0.17.1
     # via sphinx
@@ -30,15 +31,15 @@ pallets-sphinx-themes==2.0.2
     # via -r requirements/docs.in
 pygments==2.11.2
     # via sphinx
-pyparsing==3.0.6
+pyparsing==3.0.7
     # via packaging
 pytz==2021.3
     # via babel
 requests==2.27.1
     # via sphinx
 snowballstemmer==2.2.0
     # via sphinx
-sphinx==4.3.2
+sphinx==4.4.0
     # via
     #   -r requirements/docs.in
     #   pallets-sphinx-themes
@@ -62,6 +63,3 @@ sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
 urllib3==1.26.8
     # 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
@@ -1 +1 @@
-pytest
+pytest<7
diff --git a/requirements/tests.txt b/requirements/tests.txt
@@ -1,8 +1,9 @@
+# SHA1:43b07f68ee4dcf187dce9de79fc8dd462f1c99d6
 #
-# This file is autogenerated by pip-compile with python 3.10
+# This file is autogenerated by pip-compile-multi
 # To update, run:
 #
-#    pip-compile requirements/tests.in
+#    pip-compile-multi
 #
 attrs==21.4.0
     # via pytest
@@ -14,7 +15,7 @@ pluggy==1.0.0
     # via pytest
 py==1.11.0
     # via pytest
-pyparsing==3.0.6
+pyparsing==3.0.7
     # via packaging
 pytest==6.2.5
     # via -r requirements/tests.in

diff --git a/requirements/typing.txt b/requirements/typing.txt
@@ -1,14 +1,15 @@
+# SHA1:7983aaa01d64547827c20395d77e248c41b2572f
 #
-# This file is autogenerated by pip-compile with python 3.10
+# This file is autogenerated by pip-compile-multi
 # To update, run:
 #
-#    pip-compile requirements/typing.in
+#    pip-compile-multi
 #
 mypy==0.931
     # via -r requirements/typing.in
 mypy-extensions==0.4.3
     # via mypy
-tomli==2.0.0
+tomli==2.0.1
     # via mypy
-typing-extensions==4.0.1
+typing-extensions==4.1.1
     # via mypy