Skip to content

Commit 9c72e3d

Browse files
authored
Merge pull request #437 from adrn/combine-reqs
Use pip requirements in anaconda environment
2 parents 949a7e2 + 8ebc947 commit 9c72e3d

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ pip-run: &pip-install
1313
command: |
1414
python3 -m venv venv
1515
. venv/bin/activate
16-
pip install -r pip-requirements.txt
17-
pip install sphinx pytest
18-
pip install sphinx-astropy sphinx-bootstrap-theme nbconvert==5.6.1
16+
pip install -r pip-requirements.txt --progress-bar off
17+
pip install --progress-bar off sphinx pytest
18+
pip install --progress-bar off sphinx-astropy sphinx-bootstrap-theme nbconvert==5.6.1
1919
2020
jobs:
2121

environment.yml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,7 @@ channels:
44
- astropy
55

66
dependencies:
7-
- python=3.6
8-
- IPython=6.1.0
9-
- astropy=3
10-
- astroquery>=0.3.7
11-
- matplotlib==3.0.2
12-
- numpy=1.14
13-
- scipy=1.0 # needed for coordinates cross-matching
14-
- jupyter=1.0
15-
- notebook>=5.7.2
16-
- aplpy # used in FITS-cube tutorial
17-
- spectral-cube # used in FITS-cube tutorial
18-
- reproject # used in FITS-cube tutorial
19-
- dust_extinction>=0.7
7+
- python=3.7
8+
- pip
9+
- pip:
10+
- -r pip-requirements.txt

pip-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ scipy>=1.0
88
notebook>=5.7.2
99
aplpy
1010
spectral-cube
11-
reproject
11+
reproject==0.5.1
1212
dust_extinction>=0.7
1313
astro-gala
1414
dust_extinction>=0.7

0 commit comments

Comments
 (0)