curtin-dev team mailing list archive

[Dan Bungert <mp+481672@xxxxxxxxxxxxxxxxxx>]

Dan Bungert has proposed merging ~dbungert/curtin:fix-ci-23.1 into curtin:release/23.1.

Commit message:
tox: sitepackages = false

If we pull python3-apt from git we can drop sitepackages, which helps
insulate against CI problems.  We need libapt-pkg-dev for that though.

(cherry picked from commit 3d87b591dedee45def0304e0bb31b91743ba80ba)



Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~dbungert/curtin/+git/curtin/+merge/481672
-- 
Your team curtin developers is requested to review the proposed merge of ~dbungert/curtin:fix-ci-23.1 into curtin:release/23.1.

diff --git a/test-requirements.txt b/test-requirements.txt
index a8211a7..cc249c9 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,3 +7,4 @@ pip
 pyflakes
 virtualenv
 wheel
+git+https://salsa.debian.org/apt-team/python-apt@2.4.y
diff --git a/tools/vmtest-system-setup b/tools/vmtest-system-setup
index c9c1231..9834aa6 100755
--- a/tools/vmtest-system-setup
+++ b/tools/vmtest-system-setup
@@ -15,6 +15,7 @@ DEPS=(
   build-essential
   cloud-image-utils
   git
+  libapt-pkg-dev
   make
   net-tools
   python3
diff --git a/tox.ini b/tox.ini
index b402910..8d38930 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,7 @@ commands = {envpython} {toxinidir}/tools/noproxy {envpython} -m nose \
 
 [testenv:py3]
 basepython = python3
-sitepackages = true
+sitepackages = false
 
 [testenv:py3-flake8]
 basepython = python3
@@ -40,7 +40,7 @@ commands = {envpython} -m pyflakes {posargs:curtin/ tests/ tools/}
 [testenv:py3-pylint]
 # set basepython because tox 1.6 (trusty) does not support generated environments
 basepython = python3
-sitepackages = true
+sitepackages = false
 deps = {[testenv]deps}
     pylint==2.12.2
     git+https://git.launchpad.net/simplestreams