diff options
| author | Todd Miller <jmiller@stsci.edu> | 2018-10-08 11:29:58 -0400 |
|---|---|---|
| committer | Todd Miller <jmiller@stsci.edu> | 2018-10-08 11:29:58 -0400 |
| commit | 829b9f0571af9ed22114b70071a1ae7317706e4c (patch) | |
| tree | f44e9bc0352998d09c28934ee0760a5b01c632a1 /crds | |
| parent | ff7bb35c63ef298df2207dbfdc49e441cec0e2ae (diff) | |
| parent | d75fa7d104a59296efa95bafb7c17b46e7e18dd6 (diff) | |
| download | astroconda-contrib-829b9f0571af9ed22114b70071a1ae7317706e4c.tar.gz | |
Merge branch 'master' of https://github.com/astroconda/astroconda-contrib into update-crds-version
Diffstat (limited to 'crds')
| -rw-r--r-- | crds/meta.yaml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crds/meta.yaml b/crds/meta.yaml index b91a9b2..335bcb2 100644 --- a/crds/meta.yaml +++ b/crds/meta.yaml @@ -20,18 +20,22 @@ package: requirements: build: - astropy >=1.1 - - cfitsio >=3.430 + - cfitsio >=3.440 - numpy {{ numpy }} - requests - lxml - parsley + - filelock - setuptools +<<<<<<< HEAD - filelock +======= +>>>>>>> d75fa7d104a59296efa95bafb7c17b46e7e18dd6 - python {{ python }} run: - astropy >=1.1 - - cfitsio >=3.430 + - cfitsio - numpy - requests - lxml |