Skip to content

Commit

Permalink
Merge pull request #23 from astralbijection/lessdeps
Browse files Browse the repository at this point in the history
Remove unneeded omnia channel
  • Loading branch information
ALescoulie authored Feb 8, 2022
2 parents a7340bc + d924546 commit bb106a5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
environment-file: environment.yml
channels: conda-forge,omnia,psi4,defaults
channels: psi4,conda-forge,defaults
activate-environment: mdsapt
auto-update-conda: false
auto-activate-base: false
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
environment-file: devtools/deploy/environment.yml
channels: conda-forge,omnia,psi4,defaults
channels: psi4,conda-forge
activate-environment: mdsapt-build
auto-update-conda: false
auto-activate-base: false
Expand All @@ -119,7 +119,7 @@ jobs:
- name: Build MDSAPT conda package
# conda requires this special shell
shell: bash -l {0}
run: conda build -c psi4 -c conda-forge -c omnia --output-folder . .
run: conda build -c psi4 -c conda-forge --output-folder . .

- name: Upload MDSAPT conda package
# conda requires this special shell
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
shell: bash -l {0}
# NOTE: psi4 must be first channel
run: >
conda install -c psi4 -c defaults -c conda-forge -c omnia -c mdsapt-testing mdsapt
conda install -c psi4 -c defaults -c conda-forge -c mdsapt-testing mdsapt
- name: Test importing mdsapt
shell: bash -l {0}
Expand Down
13 changes: 7 additions & 6 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
# Standard environment for developing MDSAPT.

name: mdsapt
channels:
- omnia
- psi4
- conda-forge
- defaults
dependencies:
- mdanalysis>=2.0.0, <2.1
- nglview>=3.0.3, <3.1
- numpy>=1, <2
- openmm=7.5.1
- numpy
- openmm
- pandas
- pdbfixer=1.6
- psi4=1.4+9485035
- pdbfixer
- psi4
- pytest-cov
- pyyaml
- rdkit>=2020.09.3
- rdkit

0 comments on commit bb106a5

Please sign in to comment.