Skip to content

Commit 9cac98f

Browse files
loriabLori A. Burns
andauthored
pytest marks for programs (#499)
* pytest marks for programs * copilot review * fix psi4 detection * adapt for qcel rc4 * more * forgive static * dftd * classic dftd3 * ci * adcc * adcc: older psi for newer qcmb * optdisp win * tidy up --------- Co-authored-by: Lori A. Burns <lori.burns7@gmail.com>
1 parent 27a334f commit 9cac98f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+453
-327
lines changed

.github/workflows/CI.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,11 @@ jobs:
142142
# pytest: ""
143143

144144
# DOWNLOAD problem Mar 2026
145-
#- conda-env: mace
146-
# python-version: "3.10"
147-
# label: MACE
148-
# runs-on: ubuntu-latest
149-
# pytest: ""
145+
- conda-env: mace
146+
python-version: "3.13"
147+
label: MACE
148+
runs-on: ubuntu-latest
149+
pytest: ""
150150

151151
- conda-env: aimnet2
152152
python-version: 3.11
@@ -205,7 +205,7 @@ jobs:
205205
run: |
206206
# conda remove qcelemental --force
207207
# python -m pip install 'git+https://github.com/MolSSI/QCElemental.git@next2026' --no-deps
208-
conda install "conda-forge/label/qcelemental_dev::qcelemental=0.50.0rc3"
208+
conda install "conda-forge/label/qcelemental_dev::qcelemental=0.50.0rc4"
209209
210210
# note: conda remove --force, not mamba remove --force b/c https://github.com/mamba-org/mamba/issues/412
211211
# alt. is micromamba but not yet ready for setup-miniconda https://github.com/conda-incubator/setup-miniconda/issues/75
@@ -254,7 +254,7 @@ jobs:
254254
python -c "import qcelemental as q;print(q.__file__, q.__version__)"
255255
python -c "import qcengine as q;print(q.__file__, q.__version__)"
256256
git describe
257-
git log --oneline
257+
# git log --oneline
258258
259259
- name: Special Config - Windows Psi4
260260
if: "(((matrix.cfg.label == 'optimization-dispersion') || (matrix.cfg.label == 'Psi4-1.8')) && (matrix.cfg.runs-on == 'windows-latest'))"
@@ -286,12 +286,12 @@ jobs:
286286
- name: PyTest
287287
run: |
288288
# export MKL_CBWR=AVX
289-
pytest -rws -v ${{ matrix.cfg.pytest }} --cov=qcengine --color=yes --cov-report=xml qcengine/
289+
pytest -rws -v ${{ matrix.cfg.pytest }} --cov=qcengine --durations=20 --durations-min=40 --strict-markers --color=yes --cov-report=xml qcengine/
290290
291291
- name: PyTest - Task_Config
292292
run: |
293293
rm -f qcengine.yaml
294-
pytest -rws -v -k "test_config" --cov=qcengine --color=yes --cov-report=xml qcengine/
294+
pytest -rws -v -k "test_config" --cov=qcengine --strict-markers --color=yes --cov-report=xml qcengine/
295295
296296
- name: CodeCov
297297
uses: codecov/codecov-action@v4

devtools/conda-envs/adcc.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ channels:
66
dependencies:
77
- adcc>=0.15.7
88
- psi4>=1.8.1
9+
- libint=2.9.0=*_4
910

1011
# Core
1112
- python
1213
- py-cpuinfo
1314
- psutil
14-
- conda-forge/label/qcelemental_dev::qcelemental=0.50.0rc3
15+
- conda-forge/label/qcelemental_dev::qcelemental>=0.50.0rc4
16+
- qcmanybody>=0.7.0
1517
- pydantic=2
1618
- pydantic-settings
1719
- msgpack-python

devtools/conda-envs/aimnet2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
- pyyaml
1010
- py-cpuinfo
1111
- psutil
12-
- conda-forge/label/qcelemental_dev::qcelemental=0.50.0rc3
12+
- conda-forge/label/qcelemental_dev::qcelemental
1313
- pydantic>=2.0.0
1414
- pydantic-settings
1515

devtools/conda-envs/mace.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
- pyyaml
88
- py-cpuinfo
99
- psutil
10-
- conda-forge/label/qcelemental_dev::qcelemental=0.50.0rc3
10+
- conda-forge/label/qcelemental_dev::qcelemental
1111
- pydantic>=2.0.0
1212
- pydantic-settings
1313

devtools/conda-envs/mrchem.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies:
1212
- pyyaml
1313
- py-cpuinfo
1414
- psutil
15-
- conda-forge/label/qcelemental_dev::qcelemental=0.50.0rc3
15+
- conda-forge/label/qcelemental_dev::qcelemental
1616
- pydantic=2
1717
- pydantic-settings
1818
- setuptools <82.0 # for berny

devtools/conda-envs/nwchem-cf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
- pyyaml
1010
- py-cpuinfo
1111
- psutil
12-
- conda-forge/label/qcelemental_dev::qcelemental=0.50.0rc3
12+
- conda-forge/label/qcelemental_dev::qcelemental
1313
- pydantic>=2.0.0
1414
- networkx>=2.4.0
1515
- qcmanybody

devtools/conda-envs/nwchem.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
- pyyaml
88
- py-cpuinfo
99
- psutil
10-
- conda-forge/label/qcelemental_dev::qcelemental=0.50.0rc3
10+
- conda-forge/label/qcelemental_dev::qcelemental
1111
- pydantic>=2.0.0
1212
- networkx>=2.4.0
1313
- pydantic-settings

devtools/conda-envs/openmm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818
- pyyaml
1919
- py-cpuinfo
2020
- psutil
21-
- conda-forge/label/qcelemental_dev::qcelemental=0.50.0rc3
21+
- conda-forge/label/qcelemental_dev::qcelemental
2222
- pydantic >=2
2323
- pydantic-settings
2424
# - pint <0.22 # needed for a while see #416

devtools/conda-envs/opt-disp-cf.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ dependencies:
77
- rdkit
88
# - rdkit<=2025.03.4 # Windows+psi4 error with 03.5 # sometimes fine, sometimes flaky even w/exactly same packages in env
99
- mopac
10+
- libint=2.9.0=*_4 # old (1.10=*_2) psi4 to release qcmb constraint to use new qcnb (0.7) with new qcel (rc4)
1011

1112
# Mixed Tests
1213
- dftd3-python
@@ -15,7 +16,7 @@ dependencies:
1516
- geometric=1.0
1617
- optking
1718
- pymdi
18-
- qcmanybody
19+
- qcmanybody>=0.7.0
1920
- pyberny
2021
- setuptools <82.0 # for berny
2122

@@ -24,7 +25,7 @@ dependencies:
2425
- pyyaml
2526
- py-cpuinfo
2627
- psutil
27-
- conda-forge/label/qcelemental_dev::qcelemental=0.50.0rc3
28+
- conda-forge/label/qcelemental_dev::qcelemental>=0.50.0rc4
2829
- pydantic=2
2930
- pydantic-settings
3031
- msgpack-python

devtools/conda-envs/opt-disp.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies:
2727
- pyyaml
2828
- py-cpuinfo
2929
- psutil
30-
- conda-forge/label/qcelemental_dev::qcelemental=0.50.0rc3
30+
- conda-forge/label/qcelemental_dev::qcelemental
3131
- msgpack-python
3232

3333
# Testing

0 commit comments

Comments
 (0)