Skip to content

Commit

Permalink
Replace skipsdist with skip_install
Browse files Browse the repository at this point in the history
The use of the `skipsdist` global setting may have some undesired side
effects, let's drop it in favor of the upstream recommendations.

References:
https://tox.wiki/en/latest/config.html#skip_install
tox-dev/tox#2730
https://review.opendev.org/c/x/charm-ovn-central/+/869165/comments/9e2cf4c4_acea15b6
fnordahl committed Jan 4, 2023

Verified

This commit was signed with the committer’s verified signature. The key has expired.
jeff-mccoy Megamind
1 parent bf0390b commit 352a16e
Showing 3 changed files with 12 additions and 3 deletions.
5 changes: 4 additions & 1 deletion global/classic-zaza/tox.ini
Original file line number Diff line number Diff line change
@@ -9,13 +9,16 @@
# all of its own requirements and if it doesn't, fix it there.
[tox]
envlist = pep8,py3
skipsdist = True
# NOTE: Avoid build/test env pollution by not enabling sitepackages.
sitepackages = False
# NOTE: Avoid false positives by not skipping missing interpreters.
skip_missing_interpreters = False

[testenv]
# We use tox mainly for virtual environment management for test requirements
# and do not install the charm code as a Python package into that environment.
# Ref: https://tox.wiki/en/latest/config.html#skip_install
skip_install = True
setenv = VIRTUAL_ENV={envdir}
PYTHONHASHSEED=0
CHARM_DIR={envdir}
5 changes: 4 additions & 1 deletion global/source-zaza/src/tox.ini
Original file line number Diff line number Diff line change
@@ -6,13 +6,16 @@

[tox]
envlist = pep8
skipsdist = True
# NOTE: Avoid build/test env pollution by not enabling sitepackages.
sitepackages = False
# NOTE: Avoid false positives by not skipping missing interpreters.
skip_missing_interpreters = False

[testenv]
# We use tox mainly for virtual environment management for test requirements
# and do not install the charm code as a Python package into that environment.
# Ref: https://tox.wiki/en/latest/config.html#skip_install
skip_install = True
setenv = VIRTUAL_ENV={envdir}
PYTHONHASHSEED=0
allowlist_externals = juju
5 changes: 4 additions & 1 deletion global/source-zaza/tox.ini
Original file line number Diff line number Diff line change
@@ -5,14 +5,17 @@
# https://github.com/openstack-charmers/release-tools

[tox]
skipsdist = True
envlist = pep8,py3
# NOTE: Avoid build/test env pollution by not enabling sitepackages.
sitepackages = False
# NOTE: Avoid false positives by not skipping missing interpreters.
skip_missing_interpreters = False

[testenv]
# We use tox mainly for virtual environment management for test requirements
# and do not install the charm code as a Python package into that environment.
# Ref: https://tox.wiki/en/latest/config.html#skip_install
skip_install = True
setenv = VIRTUAL_ENV={envdir}
PYTHONHASHSEED=0
TERM=linux

0 comments on commit 352a16e

Please sign in to comment.