From d7e657eecc18b703b08c12d521e717a346f3ebdf Mon Sep 17 00:00:00 2001
From: Alex Lowe <alex.lowe@canonical.com>
Date: Tue, 8 Oct 2024 16:09:43 -0400
Subject: [PATCH 1/2] build(deps): update dependencies

---
 pyproject.toml       |  5 -----
 requirements-dev.txt | 10 +++++-----
 requirements.txt     | 10 +++++-----
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 179746404..e507b28fc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,13 +22,8 @@ dependencies = [
     "pyyaml",
     "requests",
     "requests-toolbelt",
-    "requests-unixsocket",
     "snap-helpers",
     "tabulate",
-    # Needed until requests-unixsocket supports urllib3 v2
-    # https://github.com/msabramo/requests-unixsocket/pull/69
-    # When updating, remove the urllib3 constraint from renovate config.
-    "urllib3<2.0",
 ]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 938e3982a..b658901aa 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -6,11 +6,11 @@ certifi==2024.8.30
 cffi==1.17.1
 charset-normalizer==3.3.2
 coverage==7.6.1
-craft-application==4.2.5
+craft-application==4.2.6
 craft-archives==2.0.0
 craft-cli==2.7.0
 craft-grammar==2.0.1
-craft-parts==2.1.1
+craft-parts==2.1.2
 craft-platforms==0.3.1
 craft-providers==2.0.4
 craft-store==3.0.2
@@ -71,9 +71,9 @@ pytz==2024.1
 pyxdg==0.28
 pyyaml==6.0.2
 referencing==0.35.1
-requests==2.31.0
+requests==2.32.3
 requests-toolbelt==1.0.0
-requests-unixsocket==0.3.0
+requests-unixsocket==0.4.2
 responses==0.25.3
 rpds-py==0.20.0
 ruamel-yaml==0.18.6
@@ -87,6 +87,6 @@ sortedcontainers==2.4.0
 tabulate==0.9.0
 tomlkit==0.13.2
 typing-extensions==4.12.2
-urllib3==1.26.19
+urllib3==2.2.3
 wadllib==1.3.9
 zipp==3.20.2
diff --git a/requirements.txt b/requirements.txt
index 715118649..3e5e65140 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,11 +4,11 @@ boolean-py==4.0
 certifi==2024.8.30
 cffi==1.17.1
 charset-normalizer==3.3.2
-craft-application==4.2.5
+craft-application==4.2.6
 craft-archives==2.0.0
 craft-cli==2.7.0
 craft-grammar==2.0.1
-craft-parts==2.1.1
+craft-parts==2.1.2
 craft-platforms==0.3.1
 craft-providers==2.0.4
 craft-store==3.0.2
@@ -51,9 +51,9 @@ pytz==2024.1
 pyxdg==0.28
 pyyaml==6.0.2
 referencing==0.35.1
-requests==2.31.0
+requests==2.32.3
 requests-toolbelt==1.0.0
-requests-unixsocket==0.3.0
+requests-unixsocket2==0.4.2
 rpds-py==0.20.0
 ruamel-yaml==0.18.6
 ruamel-yaml-clib==0.2.8
@@ -63,6 +63,6 @@ six==1.16.0
 snap-helpers==0.4.2
 tabulate==0.9.0
 typing-extensions==4.12.2
-urllib3==1.26.19
+urllib3==2.2.3
 wadllib==1.3.9
 zipp==3.20.2

From 81678b0b51550d052d56aa7c264cd221a27be579 Mon Sep 17 00:00:00 2001
From: Alex Lowe <alex.lowe@canonical.com>
Date: Tue, 8 Oct 2024 16:49:30 -0400
Subject: [PATCH 2/2] tests(spread): test snap parallel installs

---
 requirements-dev.txt                          |  2 +-
 .../parallel-install/charmcraft.yaml          | 14 +++++++++
 .../smoketests/parallel-install/task.yaml     | 31 +++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 tests/spread/smoketests/parallel-install/charmcraft.yaml
 create mode 100644 tests/spread/smoketests/parallel-install/task.yaml

diff --git a/requirements-dev.txt b/requirements-dev.txt
index b658901aa..343c30d26 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -73,7 +73,7 @@ pyyaml==6.0.2
 referencing==0.35.1
 requests==2.32.3
 requests-toolbelt==1.0.0
-requests-unixsocket==0.4.2
+requests-unixsocket2==0.4.2
 responses==0.25.3
 rpds-py==0.20.0
 ruamel-yaml==0.18.6
diff --git a/tests/spread/smoketests/parallel-install/charmcraft.yaml b/tests/spread/smoketests/parallel-install/charmcraft.yaml
new file mode 100644
index 000000000..e46febc45
--- /dev/null
+++ b/tests/spread/smoketests/parallel-install/charmcraft.yaml
@@ -0,0 +1,14 @@
+type: charm
+name: test-charm
+summary: test-charm
+description: test-charm
+
+base: ubuntu@24.04
+platforms:
+  amd64:
+  arm64:
+  riscv64:
+
+parts:
+  my-part:
+    plugin: nil
diff --git a/tests/spread/smoketests/parallel-install/task.yaml b/tests/spread/smoketests/parallel-install/task.yaml
new file mode 100644
index 000000000..2ab50ff66
--- /dev/null
+++ b/tests/spread/smoketests/parallel-install/task.yaml
@@ -0,0 +1,31 @@
+summary: pack a charm with parallel-installed charmcraft versions
+
+# Run last since we change snapd settings
+priority: -10
+
+prepare: |
+  snap install yq
+  if [[ $(snap get system experimental.parallel-instances) != true ]]; then
+    snap set system experimental.parallel-instances=true
+    REBOOT
+  fi
+  snap install --classic --channel=latest/candidate charmcraft
+  snap install --dangerous --classic --name=charmcraft_dev /charmcraft/charmcraft_*.snap
+
+restore: |
+  if [[ $(snap get system experimental.parallel-instances) == true ]]; then
+    snap remove charmcraft_dev
+    snap set system experimental.parallel-instances=false
+    REBOOT
+  fi
+  snap install --classic --dangerous /charmcraft/charmcraft_*.snap
+
+execute: |
+  # Check that the candidate version used the correct version
+  charmcraft pack
+  [[ $(unzip -p *.charm manifest.yaml | yq .charmcraft-version) == $(charmcraft --version | cut -f2 -d' ') ]]
+  rm *.charm
+
+  # Try the dev version
+  charmcraft_dev pack
+  [[ $(unzip -p *.charm manifest.yaml | yq .charmcraft-version) == $(charmcraft_dev --version | cut -f2 -d' ') ]]