Unpin tox version
This unpinning is meant to solve the issues with tox 4.x breaking all the virtualenv dependencies. Change-Id: Idd02728e33be4931c7729c218629b7a8430d0f41
This commit is contained in:
parent
5ce3787fdb
commit
093383bb28
@ -26,7 +26,7 @@
|
|||||||
- name: tox-py310
|
- name: tox-py310
|
||||||
soft: true
|
soft: true
|
||||||
vars:
|
vars:
|
||||||
tox_extra_args: -- erasure-coded:jammy-yoga-ec
|
tox_extra_args: '-- erasure-coded:jammy-yoga-ec'
|
||||||
- job:
|
- job:
|
||||||
name: kinetic-zed-ec
|
name: kinetic-zed-ec
|
||||||
parent: func-target
|
parent: func-target
|
||||||
|
18
pip.sh
18
pip.sh
@ -1,18 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
#
|
|
||||||
# This file is managed centrally by release-tools and should not be modified
|
|
||||||
# within individual charm repos. See the 'global' dir contents for available
|
|
||||||
# choices of tox.ini for OpenStack Charms:
|
|
||||||
# https://github.com/openstack-charmers/release-tools
|
|
||||||
#
|
|
||||||
# setuptools 58.0 dropped the support for use_2to3=true which is needed to
|
|
||||||
# install blessings (an indirect dependency of charm-tools).
|
|
||||||
#
|
|
||||||
# More details on the beahvior of tox and virtualenv creation can be found at
|
|
||||||
# https://github.com/tox-dev/tox/issues/448
|
|
||||||
#
|
|
||||||
# This script is wrapper to force the use of the pinned versions early in the
|
|
||||||
# process when the virtualenv was created and upgraded before installing the
|
|
||||||
# depedencies declared in the target.
|
|
||||||
pip install 'pip<20.3' 'setuptools<50.0.0'
|
|
||||||
pip "$@"
|
|
24
tox.ini
24
tox.ini
@ -14,18 +14,6 @@ skipsdist = True
|
|||||||
sitepackages = False
|
sitepackages = False
|
||||||
# NOTE: Avoid false positives by not skipping missing interpreters.
|
# NOTE: Avoid false positives by not skipping missing interpreters.
|
||||||
skip_missing_interpreters = False
|
skip_missing_interpreters = False
|
||||||
# NOTES:
|
|
||||||
# * We avoid the new dependency resolver by pinning pip < 20.3, see
|
|
||||||
# https://github.com/pypa/pip/issues/9187
|
|
||||||
# * Pinning dependencies requires tox >= 3.2.0, see
|
|
||||||
# https://tox.readthedocs.io/en/latest/config.html#conf-requires
|
|
||||||
# * It is also necessary to pin virtualenv as a newer virtualenv would still
|
|
||||||
# lead to fetching the latest pip in the func* tox targets, see
|
|
||||||
# https://stackoverflow.com/a/38133283
|
|
||||||
requires =
|
|
||||||
pip < 20.3
|
|
||||||
virtualenv < 20.0
|
|
||||||
setuptools < 50.0.0
|
|
||||||
|
|
||||||
# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
|
# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
|
||||||
minversion = 3.18.0
|
minversion = 3.18.0
|
||||||
@ -35,12 +23,18 @@ setenv = VIRTUAL_ENV={envdir}
|
|||||||
PYTHONHASHSEED=0
|
PYTHONHASHSEED=0
|
||||||
CHARM_DIR={envdir}
|
CHARM_DIR={envdir}
|
||||||
install_command =
|
install_command =
|
||||||
{toxinidir}/pip.sh install {opts} {packages}
|
pip install {opts} {packages}
|
||||||
commands = stestr run --slowest {posargs}
|
commands = stestr run --slowest {posargs}
|
||||||
allowlist_externals =
|
allowlist_externals =
|
||||||
charmcraft
|
charmcraft
|
||||||
rename.sh
|
pip
|
||||||
passenv = HOME TERM CS_* OS_* TEST_*
|
{toxinidir}/rename.sh
|
||||||
|
passenv =
|
||||||
|
HOME
|
||||||
|
TERM
|
||||||
|
CS_*
|
||||||
|
OS_*
|
||||||
|
TEST_*
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
|
|
||||||
[testenv:build]
|
[testenv:build]
|
||||||
|
Loading…
Reference in New Issue
Block a user