Merge branch '2.0.x'

.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:

.github/workflows/tests.yaml

@@ -40,18 +40,12 @@ 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') }}
       - run: pip install tox
       - run: tox -e ${{ matrix.tox }}