diff --git a/.github/workflows/style.yaml b/.github/workflows/style.yaml index 5f3e25b5..8723d8f2 100644 --- a/.github/workflows/style.yaml +++ b/.github/workflows/style.yaml @@ -22,6 +22,6 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install tox==4.2.4 + pip install tox==4.2.6 - name: Test with tox run: tox -e ${{ matrix.environment }} diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 9fdadecd..71bdf07f 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -13,7 +13,7 @@ jobs: max-parallel: 4 matrix: python-version: [3.8] - environment: [py38, py38-tls, py38-proto3, py38-tls-proto3] + environment: [py, py-tls, py-proto3, py-tls-proto3] steps: - uses: actions/checkout@v1 @@ -24,6 +24,6 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install tox==4.2.4 + pip install tox==4.2.6 - name: Test with tox run: tox -e ${{ matrix.environment }} diff --git a/tox.ini b/tox.ini index a25d55e9..f97db7cb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,10 @@ [tox] -envlist = py36,py38,py38,style,pylint,black,protoc -minversion = 3.14.4 +envlist = py,py-proto3,py-tls,py-tls-proto3,style,pylint,black,protoc +minversion = 4.2.6 skipsdist = True ignore_basepython_conflict = true [testenv] -basepython = python3 usedevelop = True install_command = pip install {opts} {packages} setenv = @@ -23,36 +22,28 @@ deps = -r{toxinidir}/test-requirements.txt protobuf<4.0.0 -[testenv:py38] +[testenv:py] commands = pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs} -[testenv:py38-proto3] +[testenv:py-proto3] commands = pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs} deps = -r{toxinidir}/test-requirements.txt protobuf<4.0.0 -[testenv:py38-tls] +[testenv:py-tls] commands = pytest -v -m tls --docker-compose-remove-volumes --docker-compose=docker-compose-tls.yml {posargs} -[testenv:py38-tls-proto3] +[testenv:py-tls-proto3] commands = pytest -v -m tls --docker-compose-remove-volumes --docker-compose=docker-compose-tls.yml {posargs} deps = -r{toxinidir}/test-requirements.txt protobuf<4.0.0 -[testenv:py310] -commands = - pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs} - -[testenv:py310-tls] -commands = - pytest -v -m tls --docker-compose-remove-volumes --docker-compose=docker-compose-tls.yml {posargs} - [testenv:black-format] skip_install = true deps = black