Skip to content

Commit 2f86aa2

Browse files
committed
update envs
1 parent 972c164 commit 2f86aa2

File tree

5 files changed

+5
-36
lines changed

5 files changed

+5
-36
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ defaults:
1616

1717
jobs:
1818
test:
19-
name: Test on ${{ matrix.os }}, Python ${{ matrix.python-version }}, Toolkit ${{ matrix.toolkit }}, NAGL models ${{ matrix.nagl_models }}
19+
name: Test on ${{ matrix.os }}, Python ${{ matrix.python-version }}, Toolkit ${{ matrix.toolkit }}
2020
runs-on: ${{ matrix.os }}
2121
strategy:
2222
fail-fast: false
@@ -31,13 +31,6 @@ jobs:
3131
toolkit:
3232
- true
3333
- false
34-
nagl_models:
35-
- true
36-
- false
37-
exclude:
38-
- toolkit: false
39-
nagl_models: true
40-
4134

4235
env:
4336
PYTEST_ARGS: -v -nauto --cov=openforcefields --cov-config=setup.cfg --cov-append --cov-report=xml
@@ -46,15 +39,7 @@ jobs:
4639
- uses: actions/checkout@v5
4740

4841
- name: Install dependencies
49-
if: ${{ matrix.toolkit == true && matrix.nagl_models == true }}
50-
uses: mamba-org/setup-micromamba@v1
51-
with:
52-
environment-file: devtools/conda-envs/test_env_nagl_models.yaml
53-
create-args: >-
54-
python=${{ matrix.python-version }}
55-
56-
- name: Install dependencies
57-
if: ${{ matrix.toolkit == true && matrix.nagl_models == false }}
42+
if: ${{ matrix.toolkit == true }}
5843
uses: mamba-org/setup-micromamba@v1
5944
with:
6045
environment-file: devtools/conda-envs/test_env.yaml

.github/workflows/canary.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
python-version:
19-
- "3.10"
2019
- "3.11"
2120
- "3.12"
21+
- "3.13"
2222
cfg:
2323
- os: ubuntu-latest
2424
- os: macOS-latest

devtools/conda-envs/canary_env.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ dependencies:
55
- python
66
- pip
77
- pytest
8-
- openff-toolkit >=0.16.4
8+
- openff-toolkit >=0.17.0
99
- openmmforcefields

devtools/conda-envs/test_env.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44
dependencies:
55
- python
66
- pip
7-
- openff-toolkit >=0.14.3
7+
- openff-toolkit >=0.17.0
88
- openff-interchange >=0.3.17
99
- pytest
1010
- pytest-cov

devtools/conda-envs/test_env_nagl_models.yaml

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)