Merge branch 'main' into feature/iss-277-restart-policy

OpenFreeEnergy · Oct 25, 2024 · 006e689 · 006e689
2 parents d7dcd5c + 765d2b7
commit 006e689
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci-integration.yml b/.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:

diff --git a/devtools/conda-envs/alchemiscale-server.yml b/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

diff --git a/devtools/conda-envs/test.yml b/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
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ jobs: @@
               - "3.12"
         steps:
-          - uses: actions/checkout@v2
+          - uses: actions/checkout@v4
           - uses: mamba-org/setup-micromamba@v1
             with:
@@ Expand Down @@