Skip to content

Use host python version for test environment #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 10, 2023
Merged

Use host python version for test environment #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f1a55f
remove basepython and python version from tox env
rekby Jan 10, 2023
a02cf57
update tox to latest current version
rekby Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/style.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
4 changes: 2 additions & 2 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
21 changes: 6 additions & 15 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 =
Expand All @@ -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
Expand Down