Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
python-version: ["3.12", "3.13"]
python-version: ["3.12", "3.13", "3.14"]
rdkit: [true, false]
openeye: [true, false]
openeye: [false]
nagl: [true, false]
exclude:
- rdkit: false
openeye: false
- openeye: true
python-version: "3.13"
- rdkit: false
nagl: true

Expand Down
3 changes: 1 addition & 2 deletions devtools/conda-envs/rdkit-examples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- python
- versioningit
- packaging
- numpy <2.3
- numpy
- networkx
- cachetools
# https://github.com/openforcefield/openff-toolkit/issues/2150
Expand All @@ -23,7 +23,6 @@ dependencies:
- typing_extensions
- nglview
# Toolkit-specific
- ambertools
# https://github.com/rdkit/rdkit/issues/7221 and https://github.com/rdkit/rdkit/issues/7583
- rdkit =2024
# Test-only/optional/dev/typing/examples
Expand Down
3 changes: 1 addition & 2 deletions devtools/conda-envs/rdkit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- python
- versioningit
- packaging
- numpy <2.3
- numpy
- networkx
- cachetools
# https://github.com/openforcefield/openff-toolkit/issues/2150
Expand All @@ -22,7 +22,6 @@ dependencies:
- openff-nagl-models >=0.3.0
- typing_extensions
# Toolkit-specific
- ambertools >=22
# https://github.com/rdkit/rdkit/issues/7221 and https://github.com/rdkit/rdkit/issues/7583
- rdkit !=2024.03.6,!=2024.03.5
# Test-only/optional/dev/typing
Expand Down
3 changes: 1 addition & 2 deletions devtools/conda-envs/test_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- python
- versioningit
- packaging
- numpy <2.3
- numpy
- networkx
- cachetools
# https://github.com/openforcefield/openff-toolkit/issues/2150
Expand All @@ -23,7 +23,6 @@ dependencies:
- openff-nagl-models >=0.3.0
- typing_extensions
# Toolkit-specific
- ambertools >=22
# rdkit 2024.03.6 and 2024.09.1 packages fail when run natively on osx-arm64 macs
# https://github.com/rdkit/rdkit/issues/7583
- rdkit !=2024.03.6,!=2024.09.1
Expand Down
2 changes: 2 additions & 0 deletions devtools/scripts/build_cookiecutter_json.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import json
import sys

Expand Down
2 changes: 2 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#
from __future__ import annotations

import os
import sys
from importlib.util import find_spec as find_import_spec
Expand Down
2 changes: 2 additions & 0 deletions docs/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
The nbval-sanitize.cfg file is also for use with nbval.
"""

from __future__ import annotations


def pytest_collectstart(collector):
"""
Expand Down
2 changes: 2 additions & 0 deletions docs/users/molecule_cookbook.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@
],
"source": [
"# Workaround for https://github.com/conda-forge/qcfractal-feedstock/issues/43\n",
"from __future__ import annotations\n",
"\n",
"try:\n",
" import qcportal # noqa: RUF100\n",
"except ImportError:\n",
Expand Down
2 changes: 2 additions & 0 deletions docs/users/pdb_cookbook/index.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@
},
"outputs": [],
"source": [
"from __future__ import annotations\n",
"\n",
"import sys\n",
"import warnings\n",
"\n",
Expand Down
2 changes: 2 additions & 0 deletions examples/QCArchive_interface/QCarchive_interface.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,8 @@
}
],
"source": [
"from __future__ import annotations\n",
"\n",
"import qcportal\n",
"\n",
"from openff.toolkit import Molecule\n",
Expand Down
2 changes: 2 additions & 0 deletions examples/SMIRNOFF_simulation/run_simulation.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
"metadata": {},
"outputs": [],
"source": [
"from __future__ import annotations\n",
"\n",
"from openff.toolkit.utils import get_data_file_path"
]
},
Expand Down
2 changes: 2 additions & 0 deletions examples/conformer_energies/conformer_energies.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
},
"outputs": [],
"source": [
"from __future__ import annotations\n",
"\n",
"from openff.interchange.drivers.openmm import get_openmm_energies\n",
"from rdkit.Chem import rdMolAlign\n",
"\n",
Expand Down
2 changes: 2 additions & 0 deletions examples/conformer_energies/conformer_energies.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import argparse

from openff.interchange.drivers.openmm import get_openmm_energies
Expand Down
2 changes: 2 additions & 0 deletions examples/examples_helper.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/usr/bin/env python3
"""Copy the openff-toolkit examples suite to a local directory"""

from __future__ import annotations

import argparse
from os import environ
from pathlib import Path
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
"metadata": {},
"outputs": [],
"source": [
"from __future__ import annotations\n",
"\n",
"from copy import deepcopy\n",
"\n",
"from openff.units import unit\n",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@
}
],
"source": [
"from __future__ import annotations\n",
"\n",
"from openff.toolkit import ForceField, Molecule, Topology\n",
"\n",
"# Create a simple molecule from SMILES and turn it into a topology.\n",
Expand Down
2 changes: 2 additions & 0 deletions examples/toolkit_showcase/toolkit_showcase.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
],
"source": [
"# Imports from the comp chem ecosystem\n",
"from __future__ import annotations\n",
"\n",
"import mdtraj\n",
"import nglview\n",
"import numpy as np\n",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
"metadata": {},
"outputs": [],
"source": [
"from __future__ import annotations\n",
"\n",
"from pprint import pprint\n",
"from shutil import which\n",
"\n",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
"source": [
"# Retrieve protein and ligand files for BRD4 and a docked inhibitor from the benchmark systems GitHub repository\n",
"# https://github.com/MobleyLab/benchmarksets\n",
"from __future__ import annotations\n",
"\n",
"import requests\n",
"\n",
"repo_url = \"https://raw.githubusercontent.com/MobleyLab/benchmarksets/master/input_files/\"\n",
Expand Down
2 changes: 2 additions & 0 deletions examples/virtual_sites/vsite_showcase.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
}
],
"source": [
"from __future__ import annotations\n",
"\n",
"import time\n",
"\n",
"import numpy\n",
Expand Down
2 changes: 2 additions & 0 deletions examples/visualization/visualization.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@
},
"outputs": [],
"source": [
"from __future__ import annotations\n",
"\n",
"from openff.toolkit import Molecule, Topology\n",
"from openff.toolkit.utils import get_data_file_path"
]
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
A modern, extensible library for molecular mechanics force field science from the Open Force Field Consortium.
"""

from __future__ import annotations

import importlib
from importlib.metadata import version
from typing import TYPE_CHECKING
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/_stale_tests.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import pytest

from openff.toolkit import ForceField
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
Configuration file for pytest.
"""

from __future__ import annotations

import logging

import pytest
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/create_molecules.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

"""

from __future__ import annotations

import numpy as np

from openff.toolkit import unit
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/mocking.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import numpy

from openff.toolkit import Quantity, unit
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/molecule/test_state_enumeration.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import pytest

from openff.toolkit import Molecule
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/test_energies.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import json

import numpy as np
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/test_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
Test that the examples in the repo run without errors.
"""

from __future__ import annotations

import pathlib
import re
import subprocess
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/test_forcefield.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

"""

from __future__ import annotations

import copy
import itertools
import os
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/test_interchange.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import pytest
from openff.utilities import requires_package as requires_pkg

Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/test_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

"""

from __future__ import annotations

import pytest

from openff.toolkit.typing.engines.smirnoff.io import XMLParameterIOHandler
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/test_links.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import pathlib
import re
from urllib.request import Request, urlopen
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/test_mm_molecule.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import copy

import numpy as np
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/test_molecule.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

"""

from __future__ import annotations

import copy
import os
import pathlib
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/test_nagl.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import pathlib
import re

Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/test_parameter_plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
Test classes and function in module openff.toolkit.typing.engines.smirnoff.plugins
"""

from __future__ import annotations

import pytest

from openff.toolkit import ForceField, Quantity
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/test_parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

"""

from __future__ import annotations

from collections import defaultdict
from inspect import isabstract, isclass

Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/test_toolkit_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

"""

from __future__ import annotations

import pathlib
import sys
import tempfile
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/test_toolkits.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

"""

from __future__ import annotations

import logging
import os
import pathlib
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/test_topology.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

"""

from __future__ import annotations

import itertools
import re
from copy import deepcopy
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

"""

from __future__ import annotations

import os

import pytest
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/test_utils_callback.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

"""

from __future__ import annotations

import pytest

from openff.toolkit.utils.callback import Callbackable, callback_method
Expand Down
2 changes: 2 additions & 0 deletions openff/toolkit/_tests/test_utils_collections.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

"""

from __future__ import annotations

import copy

import pytest
Expand Down
Loading
Loading