Merge branch 'master' into ci_test_package

python-zk · Jan 22, 2023 · ffdc808 · ffdc808
2 parents 5d2ae01 + 1c0c453
commit ffdc808
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Handle the code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Set up Python 3.10
       uses: actions/setup-python@v2

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -18,15 +18,15 @@ jobs:
 
     steps:
       - name: Handle the code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: "Set up Python 3.10"
         uses: actions/setup-python@v2
         with:
           python-version: "3.10"
 
       - name: Handle pip cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt') }}
@@ -36,7 +36,7 @@ jobs:
       - name: Install required dependencies
         run: |
           python3 -m pip install --upgrade pip
-          pip install tox tox-wheel
+          pip install tox
 
       - name: Code check
         run: tox -e ${TOX_VENV}
@@ -70,23 +70,23 @@ jobs:
             tox-env: pypy3
     steps:
       - name: Handle the code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Handle pip cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
 
       - name: Handle ZK installation cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: zookeeper
           key: ${{ runner.os }}-zookeeper
@@ -110,4 +110,4 @@ jobs:
           ZOOKEEPER_LIB: "${{ !contains(matrix.zk-version, '3.4') && 'lib' || '' }}"
 
       - name: Publish Codecov report
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,7 @@
 [tox]
-minversion = 3.24.1
+minversion = 4.3.4
 requires=
     virtualenv>=20.7.2
-    tox-wheel>=0.6.0
 skip_missing_interpreters=True
 envlist =
     pep8,black,
@@ -31,12 +30,14 @@ extras =
 deps =
     sasl: kerberos
     codecov: codecov
+allowlist_externals =
+    {toxinidir}/ensure-zookeeper-env.sh
+    {toxinidir}/init_krb5.sh
 commands =
     sasl: {toxinidir}/init_krb5.sh {envtmpdir}/kerberos \
-        /{toxinidir}/ensure-zookeeper-env.sh \
+        {toxinidir}/ensure-zookeeper-env.sh \
         pytest {posargs: -ra -v --cov-report=xml --cov=kazoo kazoo/tests}
 
-
 [testenv:build]
 
 [testenv:codecov]