Merge branch 'main' into feature/iss-291-neo4j-id-deprecation

.github/workflows/ci-integration.yml

@@ -32,7 +32,7 @@ jobs:
           - "3.12"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: mamba-org/setup-micromamba@v1
         with:

alchemiscale/storage/statestore.py

@@ -18,9 +18,9 @@
     AlchemicalNetwork,
     Transformation,
     NonTransformation,
-    Settings,
     Protocol,
 )
+from gufe.settings import SettingsBaseModel
 from gufe.tokenization import GufeTokenizable, GufeKey, JSON_HANDLER
 
 from neo4j import Transaction, GraphDatabase, Driver
@@ -342,7 +342,7 @@ def _gufe_to_subgraph(
                 ):
                     node[key] = json.dumps(value, cls=JSON_HANDLER.encoder)
                     node["_json_props"].append(key)
-            elif isinstance(value, Settings):
+            elif isinstance(value, SettingsBaseModel):
                 node[key] = json.dumps(value, cls=JSON_HANDLER.encoder, sort_keys=True)
                 node["_json_props"].append(key)
             elif isinstance(value, GufeTokenizable):

devtools/conda-envs/alchemiscale-server.yml

@@ -31,7 +31,7 @@ dependencies:
   - python-jose
   - passlib
   - bcrypt
-  - python-multipart
+  - python-multipart=0.0.12    # temporarily pinned due to broken 0.14 release on conda-forge
   - starlette
   - httpx
   - cryptography

devtools/conda-envs/test.yml

@@ -30,7 +30,7 @@ dependencies:
   - python-jose
   - passlib
   - bcrypt
-  - python-multipart
+  - python-multipart=0.0.12    # temporarily pinned due to broken 0.14 release on conda-forge
   - starlette
   - httpx
   - cryptography