canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+461799@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:fix-charm-on-install into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/461799
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:fix-charm-on-install into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-cloud-worker/wheelhouse.txt b/charms/focal/autopkgtest-cloud-worker/wheelhouse.txt
index 1e099c3..a6feb16 100644
--- a/charms/focal/autopkgtest-cloud-worker/wheelhouse.txt
+++ b/charms/focal/autopkgtest-cloud-worker/wheelhouse.txt
@@ -14,3 +14,6 @@ pyaml==21.10.1
 # PyYAML 6.0 broke compatibility with 5.x.
 # Pin to latest version known working in production.
 PyYAML==5.3.1
+
+# Without this, sniffio==1.3.1 will be installed which conflicts with setuptools==46.0.0 (sniffio 1.3.1 requires setuptools==64.0.0)
+sniffio==1.3.0
\ No newline at end of file
diff --git a/charms/focal/autopkgtest-web/wheelhouse.txt b/charms/focal/autopkgtest-web/wheelhouse.txt
index 6b10abf..3481790 100644
--- a/charms/focal/autopkgtest-web/wheelhouse.txt
+++ b/charms/focal/autopkgtest-web/wheelhouse.txt
@@ -7,3 +7,6 @@ MarkupSafe;python_version > '3.8'
 
 setuptools<46.0.0;python_version == '3.8'
 setuptools;python_version > '3.8'
+
+# Without this, sniffio==1.3.1 will be installed which conflicts with setuptools==46.0.0 (sniffio 1.3.1 requires setuptools==64.0.0)
+sniffio==1.3.0
\ No newline at end of file