Skip to content

Commit

Permalink
pyd v2 package, update actions, update miniconda, retire psi4 1.5 and…
Browse files Browse the repository at this point in the history
… entos testing lanes
  • Loading branch information
loriab committed Sep 17, 2024
1 parent 3b9ed2a commit 3732c38
Show file tree
Hide file tree
Showing 14 changed files with 37 additions and 36 deletions.
46 changes: 23 additions & 23 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ on:
push:
branches:
- master
- next2024
pull_request:
branches:
- master
- next2024
schedule:
- cron: "9 16 * * 1"

Expand All @@ -19,11 +21,12 @@ jobs:
fail-fast: false
matrix:
cfg:
- conda-env: psi
python-version: 3.7
label: Psi4-1.5
runs-on: ubuntu-latest
pytest: ""
#- conda-env: psi
# python-version: 3.7
# label: Psi4-1.5
# runs-on: ubuntu-latest
# pytest: ""
# Note: removed Sep 2024 b/c too hard to reconcile w/pyd v2

- conda-env: psi-nightly
python-version: "3.10"
Expand Down Expand Up @@ -55,11 +58,12 @@ jobs:
runs-on: ubuntu-latest
pytest: ""

- conda-env: qcore
python-version: 3.7
label: QCore
runs-on: ubuntu-latest
pytest: ""
#- conda-env: qcore
# python-version: 3.7
# label: QCore
# runs-on: ubuntu-latest
# pytest: ""
# Note: removed Sep 2024 b/c too hard to reconcile w/pyd v2

- conda-env: nwchem
python-version: 3.8
Expand Down Expand Up @@ -114,20 +118,18 @@ jobs:
runs-on: ${{ matrix.cfg.runs-on }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Create Environment
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: test
environment-file: devtools/conda-envs/${{ matrix.cfg.conda-env }}.yaml
python-version: ${{ matrix.cfg.python-version }}
auto-activate-base: false
show-channel-urls: true
miniforge-variant: Mambaforge
use-mamba: true
add-pip-as-python-dependency: true
# note: conda-forge chnl req'd for Mambaforge, but we'll spec in file, not here `channels: conda-forge,...`
# note: any activate/deactivate use the conda cmd. other cmds use mamba cmd.
Expand Down Expand Up @@ -163,8 +165,8 @@ jobs:
- name: Environment Information
run: |
mamba info
mamba list
conda info
conda list
- name: Install QCEngine
run: |
Expand All @@ -183,7 +185,7 @@ jobs:
pytest -rws -v ${{ matrix.cfg.pytest }} --cov=qcengine --color=yes --cov-report=xml qcengine/
- name: CodeCov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4

release_sphinx:
needs: [build]
Expand All @@ -203,24 +205,22 @@ jobs:
runs-on: ${{ matrix.cfg.runs-on }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create Environment
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: test
environment-file: devtools/conda-envs/${{ matrix.cfg.conda-env }}.yaml
python-version: ${{ matrix.cfg.python-version }}
auto-activate-base: false
miniforge-variant: Mambaforge
use-mamba: true
add-pip-as-python-dependency: true
channels: conda-forge

- name: Environment Information
run: |
mamba info
mamba list --show-channel-urls
conda info
conda list --show-channel-urls
- name: Build Documentation
run: |
Expand Down
2 changes: 1 addition & 1 deletion devtools/conda-envs/adcc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- py-cpuinfo
- psutil
- qcelemental >=0.24.0
- pydantic=1
- pydantic=2
- msgpack-python

# Testing
Expand Down
2 changes: 1 addition & 1 deletion devtools/conda-envs/aimnet2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
- py-cpuinfo
- psutil
- qcelemental >=0.12.0
- pydantic>=1.0.0
- pydantic>=2.0.0

# Testing
- pytest
Expand Down
2 changes: 1 addition & 1 deletion devtools/conda-envs/base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
- py-cpuinfo
- psutil
- qcelemental >=0.12.0
- pydantic>=1.0.0
- pydantic>=2.0.0

# Testing
- pytest
Expand Down
2 changes: 1 addition & 1 deletion devtools/conda-envs/mace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
- py-cpuinfo
- psutil
- qcelemental >=0.12.0
- pydantic>=1.0.0
- pydantic>=2.0.0

# mace deps
- pymace
Expand Down
2 changes: 1 addition & 1 deletion devtools/conda-envs/mrchem.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- py-cpuinfo
- psutil
- qcelemental>=0.24
- pydantic
- pydantic=2

# Testing
- pytest
Expand Down
2 changes: 1 addition & 1 deletion devtools/conda-envs/nwchem-cf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
- py-cpuinfo
- psutil
- qcelemental >=0.24.0
- pydantic>=1.0.0
- pydantic>=2.0.0
- networkx>=2.4.0

# Testing
Expand Down
2 changes: 1 addition & 1 deletion devtools/conda-envs/nwchem.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
- py-cpuinfo
- psutil
- qcelemental >=0.24.0
- pydantic>=1.0.0
- pydantic>=2.0.0
- networkx>=2.4.0

# Testing
Expand Down
2 changes: 1 addition & 1 deletion devtools/conda-envs/openmm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- py-cpuinfo
- psutil
- qcelemental >=0.11.1
- pydantic >=1.8.2
- pydantic >=2
- pint <0.22

# Testing
Expand Down
2 changes: 1 addition & 1 deletion devtools/conda-envs/opt-disp-cf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
- py-cpuinfo
- psutil
- qcelemental >=0.26.0
- pydantic=1.10.13
- pydantic=2
- msgpack-python

# Testing
Expand Down
3 changes: 2 additions & 1 deletion devtools/conda-envs/psi-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ dependencies:
- py-cpuinfo
- psutil
- qcelemental >=0.26.0
- pydantic>=1.0.0
- pydantic>=2.0.0
- msgpack-python
- numpy=1

# Testing
- pytest
Expand Down
2 changes: 1 addition & 1 deletion devtools/conda-envs/rdkit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
- py-cpuinfo
- psutil
- qcelemental >=0.12.0
- pydantic>=1.0.0
- pydantic>=2

# Testing
- pytest
Expand Down
2 changes: 1 addition & 1 deletion devtools/conda-envs/torchani.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
- py-cpuinfo
- psutil
- qcelemental >=0.12.0
- pydantic>=1.0.0
- pydantic>=2

- pytorch

Expand Down
2 changes: 1 addition & 1 deletion devtools/conda-envs/xtb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
- py-cpuinfo
- psutil
- qcelemental >=0.11.1
- pydantic >=1.8.2
- pydantic >=2

# Extras
- gcp-correction
Expand Down

0 comments on commit 3732c38

Please sign in to comment.