Merge branch 'main' into fix-cyclic-imports

.github/workflows/pull_request.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.8.3
+          version: 1.8.4
           virtualenvs-create: true
       - uses: actions/setup-python@v5
         with:
@@ -56,7 +56,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.8.3
+          version: 1.8.4
           virtualenvs-create: true
       - uses: actions/setup-python@v5
         with:
@@ -95,7 +95,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.8.3
+          version: 1.8.4
           virtualenvs-create: true
       - uses: actions/setup-python@v5
         with:
@@ -140,7 +140,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.8.3
+          version: 1.8.4
           virtualenvs-create: true
       - uses: actions/setup-python@v5
         with:

Dockerfile

@@ -18,7 +18,7 @@ COPY pyproject.toml pyproject.toml
 COPY poetry.lock poetry.lock
 
 RUN groupadd -r appuser && useradd -r -g appuser -u 9000 appuser && chown -R appuser:appuser .
-RUN pip install "poetry==1.8.3" && \
+RUN pip install "poetry==1.8.4" && \
     poetry config virtualenvs.create false && \
     poetry install --only main && \
     make build

README.md

@@ -100,7 +100,7 @@ pip install --upgrade pip setuptools
 Install poetry, poetry dotenv plugin and install dependencies:
 
 ``` shell
-curl -sSL https://install.python-poetry.org | python3 - --version 1.8.3
+curl -sSL https://install.python-poetry.org | python3 - --version 1.8.4
 poetry self add poetry-plugin-dotenv
 poetry install
 ```

app/questionnaire/questionnaire_schema.py

@@ -301,7 +301,7 @@ def serialize(cls, data: Any) -> Any:
     @classmethod
     def get_mutable_deepcopy(cls, data: Any) -> Any:
         if isinstance(data, tuple):
-            return list((cls.get_mutable_deepcopy(item) for item in data))
+            return [cls.get_mutable_deepcopy(item) for item in data]
         if isinstance(data, ImmutableDict):
             key_value_tuples = {k: cls.get_mutable_deepcopy(v) for k, v in data.items()}
             return dict(key_value_tuples)

app/questionnaire/questionnaire_store_updater.py

@@ -62,11 +62,9 @@ def save(self) -> None:
 
     def is_dirty(self) -> bool:
         return bool(
-            (
-                self._answer_store.is_dirty
-                or self._list_store.is_dirty
-                or self._progress_store.is_dirty
-            )
+            self._answer_store.is_dirty
+            or self._list_store.is_dirty
+            or self._progress_store.is_dirty
         )
 
     def update_relationships_answer(

app/utilities/make_immutable.py

@@ -8,7 +8,7 @@ def make_immutable(data: Any) -> Any:
     if isinstance(data, abc.Hashable):
         return data
     if isinstance(data, list):
-        return tuple((make_immutable(item) for item in data))
+        return tuple(make_immutable(item) for item in data)
     if isinstance(data, dict):
         key_value_tuples = {k: make_immutable(v) for k, v in data.items()}
         return ImmutableDict(key_value_tuples)

pyproject.toml

@@ -124,7 +124,6 @@ extend-ignore = [
     "EM102", # EM102 Exception must not use an f-string literal, assign to variable first
     "UP032", # Use f-string instead of `format` call
     "UP018", # Unnecessary {literal_type} call (rewrite as a literal)
-    "UP034", # Avoid extraneous parentheses
     "UP015", # Unnecessary open mode parameters
     "UP007", # Use `X | Y` for type annotations
     "UP006", # Use `type` instead of `Type` for type annotation