diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 05b9c7e1..07d5f07c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -4,9 +4,11 @@ on: push: branches: - master + - next2024 pull_request: branches: - master + - next2024 schedule: - cron: "9 16 * * 1" @@ -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" @@ -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 @@ -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. @@ -163,8 +165,8 @@ jobs: - name: Environment Information run: | - mamba info - mamba list + conda info + conda list - name: Install QCEngine run: | @@ -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] @@ -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: | diff --git a/devtools/conda-envs/adcc.yaml b/devtools/conda-envs/adcc.yaml index 421a2afe..b1f09322 100644 --- a/devtools/conda-envs/adcc.yaml +++ b/devtools/conda-envs/adcc.yaml @@ -12,7 +12,7 @@ dependencies: - py-cpuinfo - psutil - qcelemental >=0.24.0 - - pydantic=1 + - pydantic=2 - msgpack-python # Testing diff --git a/devtools/conda-envs/aimnet2.yaml b/devtools/conda-envs/aimnet2.yaml index 511d7a0d..99a7534d 100644 --- a/devtools/conda-envs/aimnet2.yaml +++ b/devtools/conda-envs/aimnet2.yaml @@ -10,7 +10,7 @@ dependencies: - py-cpuinfo - psutil - qcelemental >=0.12.0 - - pydantic>=1.0.0 + - pydantic>=2.0.0 # Testing - pytest diff --git a/devtools/conda-envs/base.yaml b/devtools/conda-envs/base.yaml index 2a74047f..d7d2b6f0 100644 --- a/devtools/conda-envs/base.yaml +++ b/devtools/conda-envs/base.yaml @@ -8,7 +8,7 @@ dependencies: - py-cpuinfo - psutil - qcelemental >=0.12.0 - - pydantic>=1.0.0 + - pydantic>=2.0.0 # Testing - pytest diff --git a/devtools/conda-envs/mace.yaml b/devtools/conda-envs/mace.yaml index 7d7abb69..1563291d 100644 --- a/devtools/conda-envs/mace.yaml +++ b/devtools/conda-envs/mace.yaml @@ -8,7 +8,7 @@ dependencies: - py-cpuinfo - psutil - qcelemental >=0.12.0 - - pydantic>=1.0.0 + - pydantic>=2.0.0 # mace deps - pymace diff --git a/devtools/conda-envs/mrchem.yaml b/devtools/conda-envs/mrchem.yaml index d0d0b752..ab534101 100644 --- a/devtools/conda-envs/mrchem.yaml +++ b/devtools/conda-envs/mrchem.yaml @@ -13,7 +13,7 @@ dependencies: - py-cpuinfo - psutil - qcelemental>=0.24 - - pydantic + - pydantic=2 # Testing - pytest diff --git a/devtools/conda-envs/nwchem-cf.yaml b/devtools/conda-envs/nwchem-cf.yaml index 8f4683fc..d6aa4776 100644 --- a/devtools/conda-envs/nwchem-cf.yaml +++ b/devtools/conda-envs/nwchem-cf.yaml @@ -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 diff --git a/devtools/conda-envs/nwchem.yaml b/devtools/conda-envs/nwchem.yaml index e86623e7..b9c62696 100644 --- a/devtools/conda-envs/nwchem.yaml +++ b/devtools/conda-envs/nwchem.yaml @@ -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 diff --git a/devtools/conda-envs/openmm.yaml b/devtools/conda-envs/openmm.yaml index ddd49e3b..94afc80b 100644 --- a/devtools/conda-envs/openmm.yaml +++ b/devtools/conda-envs/openmm.yaml @@ -16,7 +16,7 @@ dependencies: - py-cpuinfo - psutil - qcelemental >=0.11.1 - - pydantic >=1.8.2 + - pydantic >=2 - pint <0.22 # Testing diff --git a/devtools/conda-envs/opt-disp-cf.yaml b/devtools/conda-envs/opt-disp-cf.yaml index 0a54cd77..cb7ed2c1 100644 --- a/devtools/conda-envs/opt-disp-cf.yaml +++ b/devtools/conda-envs/opt-disp-cf.yaml @@ -21,7 +21,7 @@ dependencies: - py-cpuinfo - psutil - qcelemental >=0.26.0 - - pydantic=1.10.13 + - pydantic=2 - msgpack-python # Testing diff --git a/devtools/conda-envs/psi-nightly.yaml b/devtools/conda-envs/psi-nightly.yaml index 04d40899..929498fa 100644 --- a/devtools/conda-envs/psi-nightly.yaml +++ b/devtools/conda-envs/psi-nightly.yaml @@ -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 diff --git a/devtools/conda-envs/rdkit.yaml b/devtools/conda-envs/rdkit.yaml index 1ed05aff..33e44933 100644 --- a/devtools/conda-envs/rdkit.yaml +++ b/devtools/conda-envs/rdkit.yaml @@ -11,7 +11,7 @@ dependencies: - py-cpuinfo - psutil - qcelemental >=0.12.0 - - pydantic>=1.0.0 + - pydantic>=2 # Testing - pytest diff --git a/devtools/conda-envs/torchani.yaml b/devtools/conda-envs/torchani.yaml index 40ba67d1..dae0eca3 100644 --- a/devtools/conda-envs/torchani.yaml +++ b/devtools/conda-envs/torchani.yaml @@ -11,7 +11,7 @@ dependencies: - py-cpuinfo - psutil - qcelemental >=0.12.0 - - pydantic>=1.0.0 + - pydantic>=2 - pytorch diff --git a/devtools/conda-envs/xtb.yaml b/devtools/conda-envs/xtb.yaml index fb710e50..97af1d0f 100644 --- a/devtools/conda-envs/xtb.yaml +++ b/devtools/conda-envs/xtb.yaml @@ -11,7 +11,7 @@ dependencies: - py-cpuinfo - psutil - qcelemental >=0.11.1 - - pydantic >=1.8.2 + - pydantic >=2 # Extras - gcp-correction