Skip to content

Commit

Permalink
refactor: remove tox py3X tests
Browse files Browse the repository at this point in the history
  • Loading branch information
CalvoM authored and renanrodrigo committed Aug 9, 2023
1 parent ae3c7a3 commit b767d63
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 105 deletions.
1 change: 0 additions & 1 deletion tools/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ in this directory will be shipped as part of the packaging
- README.md: This file.
- refresh-keyrings.sh: Refresh the keyring files for services, stored in the repo
- run-integration-tests.py: Python entrypoint for the `tox -e behave` commands.
- setup_pyenv.sh: Downloads and compiles all Python versions we should support, and configures `pyenv` to use those.
- setup_sbuild.sh: Downloads and prepares chroots used in the build (and test) process.
- test-in-lxd.sh: Build the package and then install it on an LXD instance for testing
- test-in-multipass.sh: Build the package and then install it on a multipass instance for testing
Expand Down
30 changes: 0 additions & 30 deletions tools/setup_pyenv.sh

This file was deleted.

39 changes: 4 additions & 35 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,41 +1,12 @@
[tox]
envlist = {py35, py36, py38, py310}-{test, flake8}, mypy, black, isort, shellcheck

[testenv:py35-flake8]
setuptools_version = 20.7.0

[testenv:py35-test]
setuptools_version = 20.7.0

[testenv:py36-flake8]
setuptools_version = 39.0.1

[testenv:py36-test]
setuptools_version = 39.0.1

[testenv:py38-flake8]
setuptools_version = 45.2.0

[testenv:py38-test]
setuptools_version = 45.2.0

[testenv:py310-flake8]
setuptools_version = 59.6.0

[testenv:py310-test]
setuptools_version = 59.6.0
envlist = test, flake8, mypy, black, isort, shellcheck

[testenv]
allowlist_externals=/usr/bin/bash
deps =
-rrequirements.txt
-rtest-requirements.txt
py35: -cuaclient/tests/constraints/constraints-xenial.txt
py36: -cuaclient/tests/constraints/constraints-bionic.txt
py38: -cuaclient/tests/constraints/constraints-focal.txt
py310: -cuaclient/tests/constraints/constraints-jammy.txt
test,mypy,flake8: -rrequirements.txt
test,mypy,flake8: -rtest-requirements.txt
mypy: -rtypes-requirements.txt
mypy: -cuaclient/tests/constraints/constraints-mypy.txt
black: -rdev-requirements.txt
isort: -rdev-requirements.txt
behave: -rintegration-requirements.txt
Expand All @@ -61,9 +32,7 @@ setenv =
commands =
test: py.test --junitxml=pytest_results.xml {posargs:--cov uaclient uaclient}
flake8: flake8 uaclient lib setup.py features
mypy: mypy --python-version 3.6 uaclient/ features/ lib/
mypy: mypy --python-version 3.8 uaclient/ features/ lib/
mypy: mypy --python-version 3.10 uaclient/ features/ lib/
mypy: mypy uaclient/ features/ lib/
black: black --check --diff uaclient/ features/ lib/ setup.py
isort: isort --check --diff uaclient/ features/ lib/ setup.py
shellcheck: bash -O extglob -O nullglob -c "shellcheck -S warning tools/*.sh debian/*.{config,postinst,postrm,prerm} lib/*.sh sru/*.sh update-motd.d/*"
Expand Down
8 changes: 0 additions & 8 deletions uaclient/tests/constraints/constraints-bionic.txt

This file was deleted.

8 changes: 0 additions & 8 deletions uaclient/tests/constraints/constraints-focal.txt

This file was deleted.

8 changes: 0 additions & 8 deletions uaclient/tests/constraints/constraints-jammy.txt

This file was deleted.

5 changes: 0 additions & 5 deletions uaclient/tests/constraints/constraints-mypy.txt

This file was deleted.

10 changes: 0 additions & 10 deletions uaclient/tests/constraints/constraints-xenial.txt

This file was deleted.

0 comments on commit b767d63

Please sign in to comment.