Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI #348

Merged
merged 6 commits into from
Sep 25, 2024
Merged
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
3 changes: 2 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
os: ['ubuntu-latest']
pydantic-version: [">1"]
python-version:
- "3.9"
- "3.10"
- "3.11"
- "3.12"
include:
# Note: pinned to macos-12
# see https://github.com/OpenFreeEnergy/openfe/issues/842
Expand All @@ -54,6 +54,7 @@ jobs:
- name: "Setup Micromamba"
uses: mamba-org/setup-micromamba@v1
with:
micromamba-binary-path: ~/.local/bin/micromamba
environment-file: environment.yml
environment-name: gufe
cache-environment: true
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/mypy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ jobs:
cache-environment: true
cache-downloads: true
create-args: >-
python=3.9
python=3.10
rdkit=2023.09.5
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've never been able to work that one out.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@IAlibay can you elaborate? Work what out here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some reason or another mypy has been complaining about a certain error with rdkit 2024+. Something about self being defined twice for a certain object.

Our approach has just been to pin to an older version of rdkit, but honestly we should try to fix it properly.

init-shell: bash

- name: "Install steps"
Expand Down
2 changes: 1 addition & 1 deletion docs/environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ dependencies:
- sphinx
- openmm
- pip:
- git+https://github.com/OpenFreeEnergy/ofe-sphinx-theme@main
- git+https://github.com/OpenFreeEnergy/ofe-sphinx-theme@a45f3edd5bc3e973c1a01b577c71efa1b62a65d6
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a known issue upstream

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you link to the issue? I'd like to learn what's going on here so we can follow up later.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here we go: OpenFreeEnergy/ofe-sphinx-theme#5

It's a fixaeble packaging issue but I've not had time to look into it.

4 changes: 2 additions & 2 deletions gufe/tests/test_ligandatommapping.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ def test_too_small_B(self, molA, molB):
class TestLigandAtomMapping(GufeTokenizableTestsMixin):
cls = LigandAtomMapping
repr = "LigandAtomMapping(componentA=SmallMoleculeComponent(name=), componentB=SmallMoleculeComponent(name=), componentA_to_componentB={0: 0, 1: 1}, annotations={'foo': 'bar'})"
key = "LigandAtomMapping-c333723fbbee702c641cb9dca9beae49"
key = "LigandAtomMapping-2c0aae226e3f69d2d1cf429abaefdb5b"

@pytest.fixture
def instance(self, annotated_simple_mapping):
Expand All @@ -289,4 +289,4 @@ def test_id_key(self, instance):
def test_keyed_dict(self, instance):
i2 = self.cls.from_dict(instance.to_dict())

assert instance.to_keyed_dict() == i2.to_keyed_dict()
assert instance.to_keyed_dict() == i2.to_keyed_dict()
2 changes: 1 addition & 1 deletion gufe/tests/test_smallmoleculecomponent.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def test_ensure_ofe_name(internal, rdkit_name, name, expected, recwarn):
class TestSmallMoleculeComponent(GufeTokenizableTestsMixin):

cls = SmallMoleculeComponent
key = "SmallMoleculeComponent-51068a89f4793e688ee26135a9b7fbb6"
key = "SmallMoleculeComponent-82d90fcdcbe76a4155b0ea42b9080ff2"
repr = "SmallMoleculeComponent(name=ethane)"

@pytest.fixture
Expand Down
Loading