Skip to content

Commit bb106a5

Browse files
authored
Merge pull request #23 from astralbijection/lessdeps
Remove unneeded omnia channel
2 parents a7340bc + d924546 commit bb106a5

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

.github/workflows/CI.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
with:
4646
python-version: ${{ matrix.python-version }}
4747
environment-file: environment.yml
48-
channels: conda-forge,omnia,psi4,defaults
48+
channels: psi4,conda-forge,defaults
4949
activate-environment: mdsapt
5050
auto-update-conda: false
5151
auto-activate-base: false
@@ -110,7 +110,7 @@ jobs:
110110
with:
111111
python-version: ${{ matrix.python-version }}
112112
environment-file: devtools/deploy/environment.yml
113-
channels: conda-forge,omnia,psi4,defaults
113+
channels: psi4,conda-forge
114114
activate-environment: mdsapt-build
115115
auto-update-conda: false
116116
auto-activate-base: false
@@ -119,7 +119,7 @@ jobs:
119119
- name: Build MDSAPT conda package
120120
# conda requires this special shell
121121
shell: bash -l {0}
122-
run: conda build -c psi4 -c conda-forge -c omnia --output-folder . .
122+
run: conda build -c psi4 -c conda-forge --output-folder . .
123123

124124
- name: Upload MDSAPT conda package
125125
# conda requires this special shell
@@ -156,7 +156,7 @@ jobs:
156156
shell: bash -l {0}
157157
# NOTE: psi4 must be first channel
158158
run: >
159-
conda install -c psi4 -c defaults -c conda-forge -c omnia -c mdsapt-testing mdsapt
159+
conda install -c psi4 -c defaults -c conda-forge -c mdsapt-testing mdsapt
160160
161161
- name: Test importing mdsapt
162162
shell: bash -l {0}

environment.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1+
# Standard environment for developing MDSAPT.
2+
13
name: mdsapt
24
channels:
3-
- omnia
45
- psi4
56
- conda-forge
67
- defaults
78
dependencies:
89
- mdanalysis>=2.0.0, <2.1
910
- nglview>=3.0.3, <3.1
10-
- numpy>=1, <2
11-
- openmm=7.5.1
11+
- numpy
12+
- openmm
1213
- pandas
13-
- pdbfixer=1.6
14-
- psi4=1.4+9485035
14+
- pdbfixer
15+
- psi4
1516
- pytest-cov
1617
- pyyaml
17-
- rdkit>=2020.09.3
18+
- rdkit

0 commit comments

Comments
 (0)