Skip to content

Commit

Permalink
Merge branch 'main' into podman
Browse files Browse the repository at this point in the history
  • Loading branch information
danielhollas committed Feb 4, 2024
2 parents 08a4675 + 57820bc commit 7c2a7d0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 22 deletions.
16 changes: 0 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,8 @@ on:

jobs:

pre-commit:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: '3.10'
- uses: pre-commit/[email protected]

test-package:

needs: [pre-commit]

runs-on: ubuntu-latest
timeout-minutes: 15

Expand Down Expand Up @@ -65,8 +51,6 @@ jobs:

test-installation-with-pipx:

needs: [pre-commit]

runs-on: ubuntu-latest
timeout-minutes: 10

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
--outdir dist/
- name: Upload distribution artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: release
path: dist/
Expand All @@ -46,7 +46,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
name: Download distribution artifact
with:
name: release
Expand Down
2 changes: 1 addition & 1 deletion aiidalab_launch/profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def __post_init__(self):
# Normalize extra mount mode to be "rw" by default
# so that we match Docker default but are explicit.
for extra_mount in self.extra_mounts.copy():
_, _, _ = self.parse_extra_mount(extra_mount)
self.parse_extra_mount(extra_mount)
if len(extra_mount.split(":")) == 2:
self.extra_mounts.remove(extra_mount)
self.extra_mounts.add(f"{extra_mount}:rw")
Expand Down
5 changes: 2 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@ packages = find:
install_requires =
click==8.1
click-spinner==0.1.10
docker==6.1.2
docker==7.0.0
packaging==21.3
python-dotenv==0.19.1
requests==2.26.0
requests-cache==0.9.1
tabulate==0.8.9
tabulate==0.9.0
toml==0.10.2
python_requires = >=3.8

Expand Down

0 comments on commit 7c2a7d0

Please sign in to comment.