Skip to content

Commit f72ebf3

Browse files
vexxhost-botmnaserclaude
authored
[stable/zed] fix(manila): switch to uv and lock dependencies for swift upload (#3337)
Signed-off-by: Mohammed Naser <mnaser@vexxhost.com> Co-authored-by: Mohammed Naser <mnaser@vexxhost.com> Co-authored-by: Claude <noreply@anthropic.com>
1 parent 2a8cf07 commit f72ebf3

3 files changed

Lines changed: 311 additions & 7 deletions

File tree

.github/workflows/manila.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ jobs:
4040
run: |
4141
sudo apt-get update
4242
sudo apt-get install -y debootstrap tox qemu-utils
43-
pipx install python-swiftclient
44-
pipx inject python-swiftclient python-keystoneclient
4543
4644
- name: Cache DIB_IMAGE_CACHE
4745
id: cache-dib-image-cache
@@ -63,8 +61,8 @@ jobs:
6361
- name: Publish image
6462
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'release'
6563
run: |
66-
swift post -r '.r:*,.rlistings' atmosphere-images
67-
swift upload atmosphere-images manila-*.qcow2
64+
uv run --group manila swift post -r '.r:*,.rlistings' atmosphere-images
65+
uv run --group manila swift upload atmosphere-images manila-*.qcow2
6866
env:
6967
OS_AUTH_URL: https://auth.vexxhost.net/v3
7068
OS_REGION_NAME: ca-ymq-1

pyproject.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ dev = [
4040
"stestr>=4.2.0",
4141
"testscenarios>=0.5.0",
4242
]
43+
manila = [
44+
"python-keystoneclient",
45+
"python-swiftclient",
46+
# NOTE(mnaser): urllib3 2.6.0 removed getheader() which python-swiftclient still uses
47+
"urllib3<2.6.0",
48+
]
4349

4450
[project.urls]
4551
source = "https://github.com/vexxhost/atmosphere"

0 commit comments

Comments
 (0)