From f3b3ea530fc3e3ad4396252ae2aa149483528b07 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Wed, 24 Jan 2024 08:50:34 +0000 Subject: [PATCH 1/2] Fix flake8 violation (#201) --- aiidalab_launch/profile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aiidalab_launch/profile.py b/aiidalab_launch/profile.py index b555258..e22318e 100644 --- a/aiidalab_launch/profile.py +++ b/aiidalab_launch/profile.py @@ -88,7 +88,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: + for extra_mount in self.extra_mounts.copy(): self.parse_extra_mount(extra_mount) if len(extra_mount.split(":")) == 2: self.extra_mounts.remove(extra_mount) From 57820bcb1df3090afe65f9dce26bf995def8e9a6 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Wed, 24 Jan 2024 09:19:44 +0000 Subject: [PATCH 2/2] Update dependencies: docker -> 7.0.0 and tabulate -> 0.9.0 (#200) Main goal here is to upgrade to docker-py==7.0.0 which contains a bugfix that I ran into while testing locally with Python 3.12: docker/docker-py#3151 Looks like the bug was introduced in version 6.1.2 which we bumped to in #194 but did not release yet so no users should be affected. This commit also include remove the duplicate CI job `pre-commit`, since we already use `pre-commit.ci` hook. --- .github/workflows/ci.yml | 16 ---------------- .github/workflows/release.yml | 4 ++-- README.md | 2 +- setup.cfg | 6 ++---- 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 113a1e6..fc073ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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/action@v3.0.0 - test-package: - needs: [pre-commit] - runs-on: ubuntu-latest timeout-minutes: 15 @@ -65,8 +51,6 @@ jobs: test-installation-with-pipx: - needs: [pre-commit] - runs-on: ubuntu-latest timeout-minutes: 10 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3a1ab8b..8e25468 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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/ @@ -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 diff --git a/README.md b/README.md index 68a24af..47fb216 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ This package follows the Python compatibility and deprecation schedule specified ### Setting up a development environment -To develop this package, first clone it and then install the development dependencies with `pip install -e '.[dev,pre_commit]'`. +To develop this package, first clone it and then install the development dependencies with `pip install -e '.[dev]'`. We recommend to install the [pre-commit](https://pre-commit.com/) hooks to avoid unnecessary iterations when pushing new changes. To install the pre-commit hooks, switch into the repository root directly and execute: ```console diff --git a/setup.cfg b/setup.cfg index be79565..46693a6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 @@ -39,7 +38,6 @@ console_scripts = dev = bumpver==2023.1129 dunamai==1.19.0 -pre_commit = pre-commit==3.5.0 tests = pytest~=7.4.3