Skip to content
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
10 changes: 8 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ jobs:
matrix:
os: ["ubuntu"]
python-version:
- "3.10"
- "3.11"
- "3.12"
include:
Expand Down Expand Up @@ -80,7 +79,14 @@ jobs:
# Set the OFE_SLOW_TESTS to True if running a Cron job
OFE_SLOW_TESTS: ${{ fromJSON('{"false":"false","true":"true"}')[github.event_name != 'pull_request'] }}
run: |
pytest -n auto -v --cov=feflow --cov-report=xml --durations=10
if [ "$RUNNER_OS" == "macOS" ]; then
echo "Running test in serial for macOS (known limitations)..."
pytest -n 0 -v --cov=feflow --cov-report=xml --durations=10
else
echo "Running tests in parallel with xdist..."
pytest -n logical -v --cov=feflow --cov-report=xml --durations=10
fi


- name: codecov
if: ${{ github.repository == 'OpenFreeEnergy/feflow'
Expand Down
10 changes: 5 additions & 5 deletions devtools/conda-envs/test_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ channels:
- openeye
dependencies:
# Base depends
- gufe >=1.7.1, <2
- gufe ~=1.7.1
- numpy
- openfe >=1.1.0 # TODO: Remove once we don't depend on openfe
- openfe ~=1.8.0 # TODO: Remove once we don't depend on openfe
- openff-units
- openmm
- openmmforcefields >=0.14.1 # TODO: remove when upstream deps fix this
- pymbar >4.0
- pydantic >=1.10.17
- openmmtools >=0.23.0
- pymbar ~=4.0
- pydantic >=1.10.17, <3
- python

# Testing (optional deps)
- espaloma_charge ==0.0.8 # To use Espaloma FF in tests
- torchdata <0.10
Expand Down
8 changes: 8 additions & 0 deletions docs/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ feflow Change Log

.. current developments

v0.2.0
====================
Most changes come from supporting protein mutations in the Nonequilibrium cycling protocol.

- Single point protein mutation support for the Nonequilibrium Cycling protocol, in its ``SetupUnit`` (`PR #106 <https://github.com/OpenFreeEnergy/feflow/pull/106>`_)
- Hybrid Topology Factory optimizations adopted from `openfe codebase <https://github.com/OpenFreeEnergy/openfe/>`_ (`PR #128 <https://github.com/OpenFreeEnergy/feflow/pull/128>`_).
- Dropping use of deprecated openff quantity models for type hinting, in favor of ``GufeQuantity`` from ``gufe`` (`PR #130 <https://github.com/OpenFreeEnergy/feflow/pull/130>`_).

v0.1.4
====================
- Dropping use of deprecated ``openff-models``. Using vendored ``gufe`` implementation instead (`PR #123 <https://github.com/OpenFreeEnergy/feflow/pull/123>`_)
Expand Down
Binary file added docs/tutorials/abl1_imatinib.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4,315 changes: 4,315 additions & 0 deletions docs/tutorials/inputs/abl1_structure.pdb

Large diffs are not rendered by default.

160 changes: 160 additions & 0 deletions docs/tutorials/inputs/imatinib_ligand.sdf
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
LIG
-OEChem-09082123573D

70 74 0 0 0 0 0 0 0999 V2000
63.5480 48.1030 18.6180 C 0 0 0 0 0 0 0 0 0 0 0 0
63.0290 48.8330 17.5400 C 0 0 0 0 0 0 0 0 0 0 0 0
63.3200 50.2310 17.4320 C 0 0 0 0 0 0 0 0 0 0 0 0
64.1560 50.8350 18.3690 C 0 0 0 0 0 0 0 0 0 0 0 0
64.6750 50.0840 19.4270 N 0 0 0 0 0 0 0 0 0 0 0 0
64.3670 48.7670 19.5100 C 0 0 0 0 0 0 0 0 0 0 0 0
62.8240 51.1030 16.2970 C 0 0 0 0 0 0 0 0 0 0 0 0
62.2280 50.5780 15.2210 C 0 0 0 0 0 0 0 0 0 0 0 0
61.8700 51.4970 14.1990 C 0 0 0 0 0 0 0 0 0 0 0 0
62.1290 52.8060 14.3580 N 0 0 0 0 0 0 0 0 0 0 0 0
62.7400 53.2580 15.4700 C 0 0 0 0 0 0 0 0 0 0 0 0
63.1420 52.4270 16.4430 N 0 0 0 0 0 0 0 0 0 0 0 0
63.0140 54.5840 15.7220 N 0 0 0 0 0 0 0 0 0 0 0 0
62.8730 55.4970 14.6950 C 0 0 0 0 0 0 0 0 0 0 0 0
63.8370 55.7240 13.6800 C 0 0 0 0 0 0 0 0 0 0 0 0
63.5250 56.7300 12.7570 C 0 0 0 0 0 0 0 0 0 0 0 0
62.3210 57.4780 12.8000 C 0 0 0 0 0 0 0 0 0 0 0 0
61.3740 57.2630 13.7760 C 0 0 0 0 0 0 0 0 0 0 0 0
61.6840 56.2770 14.7130 C 0 0 0 0 0 0 0 0 0 0 0 0
60.1800 58.0950 13.7210 N 0 0 0 0 0 0 0 0 0 0 0 0
59.3060 58.3230 14.7280 C 0 0 0 0 0 0 0 0 0 0 0 0
58.3860 59.4950 14.7360 C 0 0 0 0 0 0 0 0 0 0 0 0
57.5700 59.7550 15.8520 C 0 0 0 0 0 0 0 0 0 0 0 0
56.6310 60.8190 15.8980 C 0 0 0 0 0 0 0 0 0 0 0 0
56.5060 61.6630 14.7990 C 0 0 0 0 0 0 0 0 0 0 0 0
57.2670 61.3960 13.6720 C 0 0 0 0 0 0 0 0 0 0 0 0
58.1950 60.3220 13.6180 C 0 0 0 0 0 0 0 0 0 0 0 0
55.5170 62.7980 14.8260 C 0 0 0 0 0 0 0 0 0 0 0 0
54.6660 62.8220 13.6500 N 0 3 0 0 0 0 0 0 0 0 0 0
53.9280 61.5600 13.5270 C 0 0 0 0 0 0 0 0 0 0 0 0
53.0530 61.5960 12.2140 C 0 0 0 0 0 0 0 0 0 0 0 0
52.2570 62.8380 12.2300 N 0 3 0 0 0 0 0 0 0 0 0 0
51.6290 62.8120 10.9250 C 0 0 0 0 0 0 0 0 0 0 0 0
53.0920 63.9910 12.3580 C 0 0 0 0 0 0 0 0 0 0 0 0
53.7320 63.9520 13.7600 C 0 0 0 0 0 0 0 0 0 0 0 0
59.2040 57.5660 15.6480 O 0 0 0 0 0 0 0 0 0 0 0 0
65.1760 54.9810 13.5260 C 0 0 0 0 0 0 0 0 0 0 0 0
63.3153 47.0563 18.7468 H 0 0 0 0 0 0 0 0 0 0 0 0
62.4150 48.3455 16.7973 H 0 0 0 0 0 0 0 0 0 0 0 0
64.4026 51.8825 18.2776 H 0 0 0 0 0 0 0 0 0 0 0 0
64.7893 48.2000 20.3264 H 0 0 0 0 0 0 0 0 0 0 0 0
62.0309 49.5197 15.1345 H 0 0 0 0 0 0 0 0 0 0 0 0
61.3913 51.1450 13.2972 H 0 0 0 0 0 0 0 0 0 0 0 0
63.7465 54.7667 16.3778 H 0 0 0 0 0 0 0 0 0 0 0 0
64.2364 56.9468 11.9739 H 0 0 0 0 0 0 0 0 0 0 0 0
62.1427 58.2340 12.0496 H 0 0 0 0 0 0 0 0 0 0 0 0
60.9733 56.0937 15.5053 H 0 0 0 0 0 0 0 0 0 0 0 0
59.9862 58.5441 12.8488 H 0 0 0 0 0 0 0 0 0 0 0 0
57.6623 59.1138 16.7162 H 0 0 0 0 0 0 0 0 0 0 0 0
56.0208 60.9714 16.7760 H 0 0 0 0 0 0 0 0 0 0 0 0
57.1503 62.0273 12.8035 H 0 0 0 0 0 0 0 0 0 0 0 0
58.7559 60.1409 12.7130 H 0 0 0 0 0 0 0 0 0 0 0 0
54.8826 62.6920 15.7184 H 0 0 0 0 0 0 0 0 0 0 0 0
56.0705 63.7470 14.8803 H 0 0 0 0 0 0 0 0 0 0 0 0
55.2333 62.9478 12.8362 H 0 0 0 0 0 0 0 0 0 0 0 0
54.6386 60.7221 13.4726 H 0 0 0 0 0 0 0 0 0 0 0 0
53.2737 61.4297 14.4016 H 0 0 0 0 0 0 0 0 0 0 0 0
53.7067 61.5830 11.3294 H 0 0 0 0 0 0 0 0 0 0 0 0
52.3833 60.7238 12.1878 H 0 0 0 0 0 0 0 0 0 0 0 0
51.5711 62.8055 12.9570 H 0 0 0 0 0 0 0 0 0 0 0 0
50.9938 63.7021 10.8054 H 0 0 0 0 0 0 0 0 0 0 0 0
52.4046 62.8077 10.1450 H 0 0 0 0 0 0 0 0 0 0 0 0
51.0117 61.9062 10.8333 H 0 0 0 0 0 0 0 0 0 0 0 0
53.8766 63.9730 11.5872 H 0 0 0 0 0 0 0 0 0 0 0 0
52.4893 64.9044 12.2464 H 0 0 0 0 0 0 0 0 0 0 0 0
52.9758 63.7689 14.5376 H 0 0 0 0 0 0 0 0 0 0 0 0
54.2650 64.8887 13.9802 H 0 0 0 0 0 0 0 0 0 0 0 0
65.2778 54.2372 14.3300 H 0 0 0 0 0 0 0 0 0 0 0 0
65.2031 54.4728 12.5508 H 0 0 0 0 0 0 0 0 0 0 0 0
66.0044 55.7021 13.5868 H 0 0 0 0 0 0 0 0 0 0 0 0
1 2 2 0 0 0 0
1 6 1 0 0 0 0
1 38 1 0 0 0 0
2 3 1 0 0 0 0
2 39 1 0 0 0 0
3 4 2 0 0 0 0
3 7 1 0 0 0 0
4 5 1 0 0 0 0
4 40 1 0 0 0 0
5 6 2 0 0 0 0
6 41 1 0 0 0 0
7 8 2 0 0 0 0
7 12 1 0 0 0 0
8 9 1 0 0 0 0
8 42 1 0 0 0 0
9 10 2 0 0 0 0
9 43 1 0 0 0 0
10 11 1 0 0 0 0
11 12 2 0 0 0 0
11 13 1 0 0 0 0
13 14 1 0 0 0 0
13 44 1 0 0 0 0
14 15 2 0 0 0 0
14 19 1 0 0 0 0
15 16 1 0 0 0 0
15 37 1 0 0 0 0
16 17 2 0 0 0 0
16 45 1 0 0 0 0
17 18 1 0 0 0 0
17 46 1 0 0 0 0
18 19 2 0 0 0 0
18 20 1 0 0 0 0
19 47 1 0 0 0 0
20 21 1 0 0 0 0
20 48 1 0 0 0 0
21 22 1 0 0 0 0
21 36 2 0 0 0 0
22 23 2 0 0 0 0
22 27 1 0 0 0 0
23 24 1 0 0 0 0
23 49 1 0 0 0 0
24 25 2 0 0 0 0
24 50 1 0 0 0 0
25 26 1 0 0 0 0
25 28 1 0 0 0 0
26 27 2 0 0 0 0
26 51 1 0 0 0 0
27 52 1 0 0 0 0
28 29 1 0 0 0 0
28 53 1 0 0 0 0
28 54 1 0 0 0 0
29 30 1 0 0 0 0
29 35 1 0 0 0 0
29 55 1 0 0 0 0
30 31 1 0 0 0 0
30 56 1 0 0 0 0
30 57 1 0 0 0 0
31 32 1 0 0 0 0
31 58 1 0 0 0 0
31 59 1 0 0 0 0
32 33 1 0 0 0 0
32 34 1 0 0 0 0
32 60 1 0 0 0 0
33 61 1 0 0 0 0
33 62 1 0 0 0 0
33 63 1 0 0 0 0
34 35 1 0 0 0 0
34 64 1 0 0 0 0
34 65 1 0 0 0 0
35 66 1 0 0 0 0
35 67 1 0 0 0 0
37 68 1 0 0 0 0
37 69 1 0 0 0 0
37 70 1 0 0 0 0
M CHG 2 29 1 32 1
M END
> <bio:pdb:part:site>
1

> <bio:pdb:part:order>
1

> <bio:pdb:ligand>
true

$$$$
Loading
Loading