Skip to content

Commit

Permalink
parent a9690ef
Browse files Browse the repository at this point in the history
author Matthew W. Thompson <mattwthompson@protonmail.com> 1673977806 -0600
committer Matthew W. Thompson <mattwthompson@protonmail.com> 1673977819 -0600

Add deployment tests

Update

Fix

Trim down differences between environments

Try to isolate crash

Rename environment

Further pare down environments

Bump Python version

Update environments

Double check OpenEye license

Skip crashing test

Skip another crashing test

Tinker with OpenEye config

Update Psi4 installation instructions

Assume version 0.1.3
  • Loading branch information
mattwthompson committed Jan 17, 2023
1 parent a9690ef commit 96e6d0e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
19 changes: 11 additions & 8 deletions .github/workflows/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest]
python-version: ["3.9"]
openeye: ["true", "false"]
openeye: [true, false]

env:
OE_LICENSE: ${{ github.workspace }}/oe_license.txt
Expand All @@ -39,30 +39,33 @@ jobs:
- uses: actions/checkout@v3

- name: Install latest release from conda with OpenEye Toolkits
if: ${{ matrix.openeye == 'true' }}
if: ${{ matrix.openeye == true }}
uses: mamba-org/provision-with-micromamba@main
with:
environment-file: devtools/conda-envs/deployment_openeye.yaml
extra-specs: |
python=${{ matrix.python-version }}
- name: Install latest release from conda without OpenEye Toolkits
if: ${{ matrix.openeye == 'false' }}
if: ${{ matrix.openeye == false }}
uses: mamba-org/provision-with-micromamba@main
with:
environment-file: devtools/conda-envs/deployment.yaml
extra-specs: |
python=${{ matrix.python-version }}
- name: License OpenEye Toolkits
- name: License OpenEye
shell: bash -l {0}
if: ${{ matrix.openeye == true }}
env:
OE_LICENSE_TEXT: ${{ secrets.OE_LICENSE }}
run: |
echo "${OE_LICENSE_TEXT}" > ${OE_LICENSE}
echo "${SECRET_OE_LICENSE}" > ${OE_LICENSE}
python -c "from openeye import oechem; assert oechem.OEChemIsLicensed()"
env:
SECRET_OE_LICENSE: ${{ secrets.OE_LICENSE }}

- name: Verify that the latest version was installed
# TODO: Turn this back on when 0.2.0 is fixed
if: ${{ true == false }}
run: |
cd /tmp/
Expand All @@ -81,6 +84,6 @@ jobs:
cd -
- name: Run tests
if: ${{ matrix.openeye == true }}
run: |
python -m pytest -v openff/bespokefit/tests
6 changes: 3 additions & 3 deletions docs/getting-started/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,18 @@ create a working conda environment containing both.
:::

:::{note}
On Linux, installing Psi4 into an existing environment sometimes fails because of subtle differences in
Installing Psi4 into an existing environment sometimes fails because of subtle differences in
compiled dependencies found in multiple channels. An alternative is to install everything when
initially creating the environment using, with AmberTools:

```shell
conda create -n bespokefit-env -c psi4 -c conda-forge -c defaults python=3.9 openff-bespokefit psi4 ambertools "h5py<3.2"
conda create -n bespokefit-env -c psi4 -c conda-forge -c defaults python=3.9 openff-bespokefit psi4 ambertools
```

or with OpenEye Toolkits:

```shell
conda create -n bespokefit-env -c psi4 -c conda-forge -c defaults -c openeye python=3.9 openff-bespokefit psi4 openeye-toolkits "h5py<3.2"
conda create -n bespokefit-env -c psi4 -c conda-forge -c defaults -c openeye python=3.9 openff-bespokefit psi4 openeye-toolkits
```
:::

Expand Down

0 comments on commit 96e6d0e

Please sign in to comment.