Merge remote-tracking branch 'upstream/main' into pre-commit-ci-updat…

…e-config
openforcefield · Oct 19, 2023 · f8bd85d · f8bd85d
2 parents 73e1067 + 3673ada
commit f8bd85d
Show file tree

Hide file tree

Showing 7 changed files with 1,123 additions and 569 deletions.
diff --git a/devtools/conda-envs/no_openeye.yaml b/devtools/conda-envs/no_openeye.yaml
@@ -22,7 +22,7 @@ dependencies:
   - rdkit >=22
   - ambertools >=22
   - openff-utilities
-  - openff-toolkit-base >=0.11,<0.14
+  - openff-toolkit-base >=0.11
   - openff-forcefields
   - openff-interchange
   - openff-qcsubmit
@@ -33,7 +33,7 @@ dependencies:
   - importlib_metadata >=4
 
     # Optional
-  - forcebalance
+  - forcebalance >=1.9.6
   - openff-fragmenter-base
   - xtb-python
 

diff --git a/devtools/conda-envs/test-env.yaml b/devtools/conda-envs/test-env.yaml
@@ -22,7 +22,7 @@ dependencies:
   - click-option-group
   - rdkit
   - openff-utilities
-  - openff-toolkit-base >=0.11,<0.14
+  - openff-toolkit-base >=0.11
   - openff-forcefields
   - openff-interchange
   - openff-units
@@ -34,7 +34,7 @@ dependencies:
   - importlib_metadata >=4
 
     # Optional
-  - forcebalance
+  - forcebalance >=1.9.6
   - openff-fragmenter-base
   - xtb-python
   - openeye-toolkits

diff --git a/docs/releasehistory.md b/docs/releasehistory.md
@@ -9,6 +9,10 @@ Releases follow the ``major.minor.micro`` scheme recommended by
 
 <!-- ## Since last release -->
 
+### Bug Fixes
+* [#286] - Update for behavior/API changes in ForceBalance 1.9.6 and OFF Tookit 0.14.4.
+
+
 <!-- ## Version / Date DD-MM-YYYY -->
 
 ## 0.2.2 / 08-05-2023