Skip to content

Commit 8e39c98

Browse files
Fix #2182 (CI failing) (#2187)
* Try removing nomkl from all envs * disable mypy checks * pin qcengine+qcelemental <0.50 * update QCA example for new qcschema version interpretation, unpin qcengine and qcelemental * fix mypy issues by folding in changes from #2181 * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Also move mypy to pip install * re enable mypy tests * update releasehistory --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 8fa2c79 commit 8e39c98

9 files changed

Lines changed: 329 additions & 180 deletions

File tree

devtools/conda-envs/conda.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,3 @@ dependencies:
1212
- numpy <2.3
1313
# https://github.com/openforcefield/openff-toolkit/issues/2150
1414
- xmltodict <=1.0.2
15-
# No idea why this is necessary, see https://github.com/openforcefield/openff-toolkit/pull/1821
16-
- nomkl

devtools/conda-envs/openeye-examples.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ dependencies:
1919
- openff-units
2020
- openff-utilities >=0.1.5
2121
- openff-interchange-base >=0.5
22-
# No idea why this is necessary, see https://github.com/openforcefield/openff-toolkit/pull/1821
23-
- nomkl
2422
- openff-nagl-base >=0.4.0
2523
- openff-nagl-models >=0.3.0
2624
- typing_extensions

devtools/conda-envs/openeye.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ dependencies:
3939
- qcengine
4040
- mdtraj
4141
- nglview
42-
- mypy =1.18
4342
- typing_extensions
4443
- pip:
44+
- mypy ==2
4545
- types-setuptools
4646
- types-toml
4747
- types-PyYAML

devtools/conda-envs/rdkit-examples.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ dependencies:
1818
- openff-units
1919
- openff-utilities >=0.1.5
2020
- openff-interchange-base >=0.5
21-
# No idea why this is necessary, see https://github.com/openforcefield/openff-toolkit/pull/1821
22-
- nomkl
2321
- openff-nagl-base >=0.4.0
2422
- openff-nagl-models >=0.3.0
2523
- typing_extensions

devtools/conda-envs/test_env.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,3 @@ dependencies:
4646
- nglview
4747
- mdtraj
4848
- nbval
49-
# No idea why this is necessary, see https://github.com/openforcefield/openff-toolkit/pull/1821
50-
- nomkl

docs/releasehistory.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Releases follow the `major.minor.micro` scheme recommended by [PEP440](https://w
1919
- [PR #2174](https://github.com/openforcefield/openff-toolkit/pull/2174): Drop support for Python 3.11
2020

2121
### Bugfixes
22+
- [PR #2187](https://github.com/openforcefield/openff-toolkit/pull/2187): Updated the QCArchive example notebook to be compliant with new validation behavior in QCEngine and QCElemental >=0.50.
2223

2324
### New features
2425

examples/QCArchive_interface/QCarchive_interface.ipynb

Lines changed: 326 additions & 169 deletions
Large diffs are not rendered by default.

openff/toolkit/topology/molecule.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5654,7 +5654,7 @@ def _networkx_graph_to_hill_formula(graph: "nx.Graph[int]") -> str:
56545654
if not isinstance(graph, nx.Graph):
56555655
raise ValueError("The graph must be a NetworkX graph.")
56565656

5657-
atom_nums: list[int] = [atomic_number for (_, atomic_number) in graph.nodes(data="atomic_number", default=1)]
5657+
atom_nums: list[int] = [atomic_number for (_, atomic_number) in graph.nodes(data="atomic_number", default=1)] # type: ignore[misc]
56585658

56595659
return _atom_nums_to_hill_formula(atom_nums) # type:ignore[arg-type]
56605660

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ lint.isort.known-third-party = [ "openff.interchange", "openff.utilities", "open
4444

4545
[tool.mypy]
4646
python_version = 3.12
47-
plugins = "numpy.typing.mypy_plugin"
4847
warn_unused_configs = true
4948
# would be nice to flip back to true
5049
warn_unused_ignores = false

0 commit comments

Comments
 (0)