Skip to content

Commit 982fa49

Browse files
authored
Merge branch 'master' into chargeincrementhandler
2 parents 92c0df4 + d0318bf commit 982fa49

File tree

4 files changed

+372
-3
lines changed

4 files changed

+372
-3
lines changed

devtools/conda-envs/test_env.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ dependencies:
1414
- nbval
1515
- codecov
1616
- coverage < 5.0
17+
- py-cpuinfo <= 5 # Needed until https://github.com/MolSSI/QCEngine/issues/252 is resolved+released
1718
- numpy
1819
- networkx
1920
- ambertools
2021
- packaging
22+
- openmmforcefields >=0.7.2
2123
- openmmtools
2224
- openforcefields
2325
- smirnoff99Frosst
@@ -28,7 +30,7 @@ dependencies:
2830
- xmltodict
2931
- qcelemental
3032
- qcportal
31-
- qcengine
33+
- qcengine <= 0.14 # Remove this and py-cpuinfo pin above when there's a new release of QCEngine
3234

3335
# Pip-only installs
3436
#- pip:

docs/releasehistory.rst

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ API-breaking changes
161161
:py:meth:`Molecule.assign_fractional_bond_orders <openforcefield.topology.Molecule.assign_fractional_bond_orders>`.
162162
- `PR #595 <https://github.com/openforcefield/openforcefield/pull/595>`_: Removed functions
163163
:py:meth:`temporary_directory <openforcefield.utils.utils.temporary_directory>` and
164-
:py:meth:`temporary_cd <openforcefield.utils.utils.temporary_cd>` and replaced their behavoir with
164+
:py:meth:`temporary_cd <openforcefield.utils.utils.temporary_cd>` and replaced their behavoir with
165165
``tempfile.TemporaryDirectory()``.
166166

167167
New features
@@ -253,6 +253,39 @@ New features
253253
- `PR #560 <https://github.com/openforcefield/openforcefield/issues/560>`_: Added visualization method to the the Molecule class.
254254

255255

256+
Behavior changed
257+
""""""""""""""""
258+
- `PR #558 <https://github.com/openforcefield/openforcefield/pull/558>`_: The
259+
:py:class`Topology <openforcefield.topology.Topology>`
260+
particle indexing system now orders :py:class`TopologyVirtualSites <openforcefield.topology.TopologyVirtualSite>`
261+
after all atoms.
262+
- `PR #469 <https://github.com/openforcefield/openforcefield/pull/469>`_:
263+
When running :py:meth:`Topology.to_openmm <openforcefield.topology.Topology.to_openmm>`, unique atom names
264+
are generated if the provided atom names are not unique (overriding any existing atom names). This
265+
uniqueness extends only to atoms in the same molecule. To disable this behavior, set the kwarg
266+
``ensure_unique_atom_names=False``.
267+
- `PR #472 <https://github.com/openforcefield/openforcefield/pull/472>`_:
268+
The :py:meth:`Molecule.__eq__ <openforcefield.topology.Molecule.__eq__>` now uses the new
269+
:py:meth:`Molecule.are_isomorphic <openforcefield.topology.Molecule.are_isomorphic>` to perform the
270+
similarity checking.
271+
- `PR #472 <https://github.com/openforcefield/openforcefield/pull/472>`_:
272+
The :py:meth:`Topology.from_openmm <openforcefield.topology.Topology.from_openmm>` and
273+
:py:meth:`Topology.add_molecule <openforcefield.topology.Topology.add_molecule>` now use the
274+
:py:meth:`Molecule.are_isomorphic <openforcefield.topology.Molecule.are_isomorphic>` to match
275+
molecules.
276+
- `PR #508 <https://github.com/openforcefield/openforcefield/pull/508>`_:
277+
In order to provide the same results for the same chemical species, regardless of input
278+
conformation, fractional bond order calculation methods now default to ignore input conformers
279+
and generate a new conformer of the molecule before running semiempirical calculations.
280+
Users can override this behavior by specifying the keyword argument
281+
``use_conformers=molecule.conformers``
282+
- `PR #544 <https://github.com/openforcefield/openforcefield/pull/544>`_: Raises
283+
``NotImplementedError`` when calling
284+
:py:meth:`ParameterHandler.get_parameter <openforcefield.typing.engines.smirnoff.parameters.ParameterHandler.get_parameter>`,
285+
which is not yet implemented, but would previously silently return ``None``.
286+
- `PR #551 <https://github.com/openforcefield/openforcefield/pull/551>`_: Implemented the
287+
:py:meth:`ParameterHandler.get_parameter <openforcefield.typing.engines.smirnoff.parameters.ParameterHandler.get_parameter>` function.
288+
256289
Tests added
257290
"""""""""""
258291
- `PR #558 <https://github.com/openforcefield/openforcefield/pull/558>`_: Adds tests ensuring

examples/swap_amber_parameters/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ These examples illustrate how the [ParmEd](http://parmed.github.io/ParmEd/html/i
44

55
### BRD4:inhibitor complex
66

7+
* [`swap_existing_ligand_parameters.ipynb`](swap_existing_ligand_parameters.ipynb) contains an example illustrating taking a fully parameterized BRD4 protein-ligand system, with an AMBER protein force field and GAFF ligand parameters, and replacing the ligand parameters with OpenFF parameters from SMIRNOFF format. The BRD4:inhibitor complex is taken from the [free energy benchmark systems living review](https://www.annualreviews.org/doi/abs/10.1146/annurev-biophys-070816-033654) [GitHub repo](https://github.com/MobleyLab/benchmarksets/tree/master/input_files/BRD4).
78

8-
[`swap_existing_ligand_parameters.ipynb`](swap_existing_ligand_parameters.ipynb) contains an example illustrating taking a fully parameterized BRD4 protein-ligand system, with an AMBER protein force field and GAFF ligand parameters, and replacing the ligand parameters with OpenFF parameters from SMIRNOFF format. The BRD4:inhibitor complex is taken from the [free energy benchmark systems living review](https://www.annualreviews.org/doi/abs/10.1146/annurev-biophys-070816-033654) [GitHub repo](https://github.com/MobleyLab/benchmarksets/tree/master/input_files/BRD4).
9+
* [`swap_existing_ligand_parameters_with_openmmforcefields.ipynb`](swap_existing_ligand_parameters_with_openmmforcefields.ipynb) contains an example that uses the [`openmm-forcefields`](http://github.com/openmm/openmm-forcefields) package to take a fully parameterized BRD4 protein-ligand system, with an AMBER protein force field and GAFF ligand parameters, and replacing the ligand parameters with OpenFF parameters from SMIRNOFF format. The BRD4:inhibitor complex is taken from the [free energy benchmark systems living review](https://www.annualreviews.org/doi/abs/10.1146/annurev-biophys-070816-033654) [GitHub repo](https://github.com/MobleyLab/benchmarksets/tree/master/input_files/BRD4).

0 commit comments

Comments
 (0)