Skip to content

Commit ffdc808

Browse files
authored
Merge branch 'master' into ci_test_package
2 parents 5d2ae01 + 1c0c453 commit ffdc808

File tree

4 files changed

+19
-12
lines changed

4 files changed

+19
-12
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Handle the code
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v3
1515

1616
- name: Set up Python 3.10
1717
uses: actions/setup-python@v2

.github/workflows/testing.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ jobs:
1818

1919
steps:
2020
- name: Handle the code
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v3
2222

2323
- name: "Set up Python 3.10"
2424
uses: actions/setup-python@v2
2525
with:
2626
python-version: "3.10"
2727

2828
- name: Handle pip cache
29-
uses: actions/cache@v2
29+
uses: actions/cache@v3
3030
with:
3131
path: ~/.cache/pip
3232
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt') }}
@@ -36,7 +36,7 @@ jobs:
3636
- name: Install required dependencies
3737
run: |
3838
python3 -m pip install --upgrade pip
39-
pip install tox tox-wheel
39+
pip install tox
4040
4141
- name: Code check
4242
run: tox -e ${TOX_VENV}
@@ -70,23 +70,23 @@ jobs:
7070
tox-env: pypy3
7171
steps:
7272
- name: Handle the code
73-
uses: actions/checkout@v2
73+
uses: actions/checkout@v3
7474

7575
- name: Set up Python ${{ matrix.python-version }}
7676
uses: actions/setup-python@v2
7777
with:
7878
python-version: ${{ matrix.python-version }}
7979

8080
- name: Handle pip cache
81-
uses: actions/cache@v2
81+
uses: actions/cache@v3
8282
with:
8383
path: ~/.cache/pip
8484
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt') }}
8585
restore-keys: |
8686
${{ runner.os }}-pip-
8787
8888
- name: Handle ZK installation cache
89-
uses: actions/cache@v2
89+
uses: actions/cache@v3
9090
with:
9191
path: zookeeper
9292
key: ${{ runner.os }}-zookeeper
@@ -110,4 +110,4 @@ jobs:
110110
ZOOKEEPER_LIB: "${{ !contains(matrix.zk-version, '3.4') && 'lib' || '' }}"
111111

112112
- name: Publish Codecov report
113-
uses: codecov/codecov-action@v2
113+
uses: codecov/codecov-action@v3

tox.ini

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
[tox]
2-
minversion = 3.24.1
2+
minversion = 4.3.4
33
requires=
44
virtualenv>=20.7.2
5-
tox-wheel>=0.6.0
65
skip_missing_interpreters=True
76
envlist =
87
pep8,black,
@@ -31,12 +30,14 @@ extras =
3130
deps =
3231
sasl: kerberos
3332
codecov: codecov
33+
allowlist_externals =
34+
{toxinidir}/ensure-zookeeper-env.sh
35+
{toxinidir}/init_krb5.sh
3436
commands =
3537
sasl: {toxinidir}/init_krb5.sh {envtmpdir}/kerberos \
36-
/{toxinidir}/ensure-zookeeper-env.sh \
38+
{toxinidir}/ensure-zookeeper-env.sh \
3739
pytest {posargs: -ra -v --cov-report=xml --cov=kazoo kazoo/tests}
3840

39-
4041
[testenv:build]
4142

4243
[testenv:codecov]

0 commit comments

Comments
 (0)