Merge branch 'openmm:main' into remove-cmmremover

openmm · Feb 27, 2025 · cf1293b · cf1293b
2 parents 27b70f4 + 7565e25
commit cf1293b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -27,11 +27,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-12, macos-latest]
+        os: [ubuntu-latest, macos-latest]
         python-version: ["3.10", "3.11", "3.12"]
         amber-conversion: [false]
         charmm-conversion: [false]
-        openmm-version: ["8.1.1", "8.1.2"]
+        openmm-version: ["8.1.2", "8.2.0"]
 
     steps:
     - uses: actions/checkout@v4

diff --git a/devtools/conda-envs/test_env.yaml b/devtools/conda-envs/test_env.yaml
@@ -10,8 +10,9 @@ dependencies:
   - pytest-randomly
   - openmm
   - openff-toolkit >=0.11
+  - openff-interchange =0.4.1
   - pyyaml
-  - ambertools >=22,<24
+  - ambertools >=24
   - lxml
   - networkx
   - tinydb