Skip to content

Commit 714468f

Browse files
authored
Merge pull request #90 Use host python version for test environment, update too to 4.2.6
2 parents a83edfd + a02cf57 commit 714468f

File tree

3 files changed

+9
-18
lines changed

3 files changed

+9
-18
lines changed

.github/workflows/style.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ jobs:
2222
- name: Install dependencies
2323
run: |
2424
python -m pip install --upgrade pip
25-
pip install tox==4.2.4
25+
pip install tox==4.2.6
2626
- name: Test with tox
2727
run: tox -e ${{ matrix.environment }}

.github/workflows/tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
max-parallel: 4
1414
matrix:
1515
python-version: [3.8]
16-
environment: [py38, py38-tls, py38-proto3, py38-tls-proto3]
16+
environment: [py, py-tls, py-proto3, py-tls-proto3]
1717

1818
steps:
1919
- uses: actions/checkout@v1
@@ -24,6 +24,6 @@ jobs:
2424
- name: Install dependencies
2525
run: |
2626
python -m pip install --upgrade pip
27-
pip install tox==4.2.4
27+
pip install tox==4.2.6
2828
- name: Test with tox
2929
run: tox -e ${{ matrix.environment }}

tox.ini

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
[tox]
2-
envlist = py36,py38,py38,style,pylint,black,protoc
3-
minversion = 3.14.4
2+
envlist = py,py-proto3,py-tls,py-tls-proto3,style,pylint,black,protoc
3+
minversion = 4.2.6
44
skipsdist = True
55
ignore_basepython_conflict = true
66

77
[testenv]
8-
basepython = python3
98
usedevelop = True
109
install_command = pip install {opts} {packages}
1110
setenv =
@@ -23,36 +22,28 @@ deps =
2322
-r{toxinidir}/test-requirements.txt
2423
protobuf<4.0.0
2524

26-
[testenv:py38]
25+
[testenv:py]
2726
commands =
2827
pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs}
2928

30-
[testenv:py38-proto3]
29+
[testenv:py-proto3]
3130
commands =
3231
pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs}
3332
deps =
3433
-r{toxinidir}/test-requirements.txt
3534
protobuf<4.0.0
3635

37-
[testenv:py38-tls]
36+
[testenv:py-tls]
3837
commands =
3938
pytest -v -m tls --docker-compose-remove-volumes --docker-compose=docker-compose-tls.yml {posargs}
4039

41-
[testenv:py38-tls-proto3]
40+
[testenv:py-tls-proto3]
4241
commands =
4342
pytest -v -m tls --docker-compose-remove-volumes --docker-compose=docker-compose-tls.yml {posargs}
4443
deps =
4544
-r{toxinidir}/test-requirements.txt
4645
protobuf<4.0.0
4746

48-
[testenv:py310]
49-
commands =
50-
pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs}
51-
52-
[testenv:py310-tls]
53-
commands =
54-
pytest -v -m tls --docker-compose-remove-volumes --docker-compose=docker-compose-tls.yml {posargs}
55-
5647
[testenv:black-format]
5748
skip_install = true
5849
deps = black

0 commit comments

Comments
 (0)