Skip to content

Commit c9b5568

Browse files
Remove smirnoff99frosst (#730)
* rm smirnoff * Revert "Use SetupTools 81 in CI (#731)" This reverts commit 65fc593. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 65fc593 commit c9b5568

File tree

12 files changed

+18
-26
lines changed

12 files changed

+18
-26
lines changed

devtools/conda-envs/docs_env.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44
dependencies:
55
# Base depends
66
- python =3.11
7-
- setuptools =81
7+
- setuptools
88
- pip
99

1010
# Standard dependencies

devtools/conda-envs/test_env.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ channels:
44
dependencies:
55
# Base depends
66
- python
7-
- setuptools =81
87
- pip
98

109
# Testing and development
@@ -15,7 +14,6 @@ dependencies:
1514
- nbval
1615
- requests-mock # For testing http requests.
1716
- foyer
18-
- smirnoff99frosst
1917

2018
# Shim
2119
- pint >=0.21,<0.25

openff/evaluator/_tests/test_client.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ def test_default_options():
3838
"""Test creating the default estimation options."""
3939

4040
data_set = PhysicalPropertyDataSet()
41-
force_field_source = SmirnoffForceFieldSource.from_path(
42-
"smirnoff99Frosst-1.1.0.offxml"
43-
)
41+
force_field_source = SmirnoffForceFieldSource.from_path("openff-2.2.1.offxml")
4442

4543
for property_type in property_types:
4644
physical_property = create_dummy_property(property_type)
@@ -61,7 +59,7 @@ def test_default_options():
6159
"force_field_source, expected_protocol_type",
6260
[
6361
(
64-
SmirnoffForceFieldSource.from_path("smirnoff99Frosst-1.1.0.offxml"),
62+
SmirnoffForceFieldSource.from_path("openff-2.2.1.offxml"),
6563
"BuildSmirnoffSystem",
6664
),
6765
(TLeapForceFieldSource(), "BuildTLeapSystem"),
@@ -97,7 +95,7 @@ def test_submission():
9795
client = EvaluatorClient()
9896

9997
# Submit an empty data set.
100-
force_field_path = "smirnoff99Frosst-1.1.0.offxml"
98+
force_field_path = "openff-2.2.1.offxml"
10199
force_field_source = SmirnoffForceFieldSource.from_path(
102100
force_field_path
103101
)

openff/evaluator/_tests/test_layers/test_reweighting.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def test_storage_retrieval():
9393
},
9494
}
9595

96-
force_field = SmirnoffForceFieldSource.from_path("smirnoff99Frosst-1.1.0.offxml")
96+
force_field = SmirnoffForceFieldSource.from_path("openff-2.2.1.offxml")
9797

9898
with tempfile.TemporaryDirectory() as base_directory:
9999
# Create a storage backend with some dummy data.

openff/evaluator/_tests/test_layers/test_workflow_layer.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ def test_workflow_layer():
5555
os.makedirs(layer_directory)
5656

5757
# Set-up a simple storage backend and add a force field to it.
58-
force_field = SmirnoffForceFieldSource.from_path(
59-
"smirnoff99Frosst-1.1.0.offxml"
60-
)
58+
force_field = SmirnoffForceFieldSource.from_path("openff-2.2.1.offxml")
6159

6260
storage_backend = LocalFileStorage()
6361
batch.force_field_id = storage_backend.store_force_field(force_field)

openff/evaluator/_tests/test_storage/test_storage.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ def test_force_field_storage():
4949
"""A simple test to that force fields can be stored and
5050
retrieved using the local storage backend."""
5151

52-
force_field_source = SmirnoffForceFieldSource.from_path(
53-
"smirnoff99Frosst-1.1.0.offxml"
54-
)
52+
force_field_source = SmirnoffForceFieldSource.from_path("openff-2.2.1.offxml")
5553

5654
with tempfile.TemporaryDirectory() as temporary_directory:
5755
local_storage = LocalFileStorage(temporary_directory)

openff/evaluator/_tests/test_workflow/test_replicators.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def test_simple_replicators():
5151
dummy_property = create_dummy_property(Density)
5252

5353
dummy_metadata = Workflow.generate_default_metadata(
54-
dummy_property, "smirnoff99Frosst-1.1.0.offxml", []
54+
dummy_property, "openff-2.2.1.offxml", []
5555
)
5656

5757
dummy_workflow = Workflow(dummy_metadata, "")
@@ -125,7 +125,7 @@ def test_group_replicators():
125125
dummy_property = create_dummy_property(Density)
126126

127127
dummy_metadata = Workflow.generate_default_metadata(
128-
dummy_property, "smirnoff99Frosst-1.1.0.offxml", []
128+
dummy_property, "openff-2.2.1.offxml", []
129129
)
130130

131131
dummy_workflow = Workflow(dummy_metadata, "")
@@ -205,7 +205,7 @@ def test_advanced_group_replicators():
205205
dummy_property = create_dummy_property(Density)
206206

207207
dummy_metadata = Workflow.generate_default_metadata(
208-
dummy_property, "smirnoff99Frosst-1.1.0.offxml", []
208+
dummy_property, "openff-2.2.1.offxml", []
209209
)
210210

211211
dummy_workflow = Workflow(dummy_metadata, "")
@@ -263,7 +263,7 @@ def test_nested_replicators():
263263
dummy_property = create_dummy_property(Density)
264264

265265
dummy_metadata = Workflow.generate_default_metadata(
266-
dummy_property, "smirnoff99Frosst-1.1.0.offxml", []
266+
dummy_property, "openff-2.2.1.offxml", []
267267
)
268268

269269
dummy_workflow = Workflow(dummy_metadata, "")
@@ -311,7 +311,7 @@ def test_advanced_nested_replicators():
311311

312312
dummy_property = create_dummy_property(Density)
313313
dummy_metadata = Workflow.generate_default_metadata(
314-
dummy_property, "smirnoff99Frosst-1.1.0.offxml", []
314+
dummy_property, "openff-2.2.1.offxml", []
315315
)
316316
dummy_metadata["dummy_list"] = [[1], [2]]
317317

openff/evaluator/_tests/test_workflow/test_workflow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ def test_find_relevant_gradient_keys(tmp_path):
313313

314314
def test_generate_default_metadata_defaults():
315315
dummy_property = create_dummy_property(Density)
316-
dummy_forcefield = "smirnoff99Frosst-1.1.0.offxml"
316+
dummy_forcefield = "openff-2.2.1.offxml"
317317

318318
data = Workflow.generate_default_metadata(dummy_property, dummy_forcefield)
319319

openff/evaluator/_tests/test_workflow/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
def create_dummy_metadata(dummy_property, calculation_layer):
1212
global_metadata = Workflow.generate_default_metadata(
13-
dummy_property, "smirnoff99Frosst-1.1.0.offxml", []
13+
dummy_property, "openff-2.2.1.offxml", []
1414
)
1515

1616
if calculation_layer == "ReweightingLayer":

openff/evaluator/_tests/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,12 @@ def build_tip3p_smirnoff_force_field():
228228
Returns
229229
-------
230230
SmirnoffForceFieldSource
231-
The force field containing both smirnoff99Frosst-1.1.0
231+
The force field containing both openff-2.2.1
232232
and TIP3P parameters
233233
"""
234234
from openff.toolkit.typing.engines.smirnoff import ForceField
235235

236-
smirnoff_force_field_path = "smirnoff99Frosst-1.1.0.offxml"
236+
smirnoff_force_field_path = "openff-2.2.1.offxml"
237237
tip3p_force_field_path = get_data_filename("forcefield/tip3p.offxml")
238238

239239
smirnoff_force_field_with_tip3p = ForceField(

0 commit comments

Comments
 (0)