Skip to content
This repository was archived by the owner on Jan 7, 2025. It is now read-only.

Commit a16dafe

Browse files
Update dependencies (#51)
* [pre-commit.ci] pre-commit autoupdate updates: - [github.com/pre-commit/pre-commit-hooks: v4.6.0 → v5.0.0](pre-commit/pre-commit-hooks@v4.6.0...v5.0.0) - [github.com/psf/black: 24.8.0 → 24.10.0](psf/black@24.8.0...24.10.0) - [github.com/asottile/pyupgrade: v3.17.0 → v3.19.1](asottile/pyupgrade@v3.17.0...v3.19.1) * Update dependencies * Use `openff-units =0.2` * Fix * Fix --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 12b2f8b commit a16dafe

3 files changed

Lines changed: 10 additions & 12 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@ defaults:
1414

1515
jobs:
1616
test:
17-
name: Test on ${{ matrix.os }}, Python ${{ matrix.python-version }}, OpenMM ${{ matrix.openmm }}, Pydantic ${{ matrix.pydantic-version }}
17+
name: Test on ${{ matrix.os }}, Python ${{ matrix.python-version }}, OpenMM ${{ matrix.openmm }}
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
os: [macOS-latest, ubuntu-latest]
22+
os: [macos-latest, ubuntu-latest]
2323
python-version: ["3.10", "3.11", "3.12"]
24-
pydantic-version: ["1", "2"]
2524
openmm: [true, false]
2625

2726
steps:
@@ -33,21 +32,20 @@ jobs:
3332
environment-file: devtools/conda-envs/test_env.yaml
3433
create-args: >-
3534
python=${{ matrix.python-version }}
36-
pydantic=${{ matrix.pydantic-version }}
3735
3836
- name: Optionally install OpenMM
3937
if: ${{ matrix.openmm == true }}
40-
run: micromamba install openmm -c conda-forge --yes
38+
run: micromamba install "openmm =8.1" -c conda-forge --yes
4139

4240
- name: Install package
4341
run: python -m pip install -e .
4442

4543
- name: Run mypy
46-
if: ${{ matrix.python-version == 3.10 && matrix.pydantic-version == 2}}
44+
if: ${{ matrix.python-version == 3.10 }}
4745
run: mypy -p "openff.models"
4846

4947
- name: Run tests
50-
run: pytest -v -Werror --cov=openff/models --cov-report=xml --color=yes openff/models/
48+
run: python -m pytest -v -Werror --cov=openff/models --cov-report=xml --color=yes openff/models/
5149

5250
- name: CodeCov
5351
uses: codecov/codecov-action@v4

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ ci:
22
autoupdate_schedule: "monthly"
33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v4.6.0
5+
rev: v5.0.0
66
hooks:
77
- id: check-yaml
88
- id: end-of-file-fixer
99
- id: trailing-whitespace
1010
- id: debug-statements
1111
- repo: https://github.com/psf/black
12-
rev: 24.8.0
12+
rev: 24.10.0
1313
hooks:
1414
- id: black
1515
files: ^openff
@@ -34,7 +34,7 @@ repos:
3434
hooks:
3535
- id: yesqa
3636
- repo: https://github.com/asottile/pyupgrade
37-
rev: v3.17.0
37+
rev: v3.19.1
3838
hooks:
3939
- id: pyupgrade
4040
files: ^openff

devtools/conda-envs/test_env.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ channels:
44
dependencies:
55
- python
66
- pip
7-
- pydantic
8-
- openff-units
7+
- pydantic =2
8+
- openff-units =0.2
99
- openff-utilities
1010
- pytest
1111
- pytest-cov

0 commit comments

Comments
 (0)