aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaul Infante-Sainz <infantesainz@gmail.com>2020-03-20 19:05:27 +0000
committerRaul Infante-Sainz <infantesainz@gmail.com>2020-03-20 19:15:48 +0000
commit9000d98e7f273447c424b18fed8d3c84beeb6a79 (patch)
tree8cdf7b239ac1fb2b179aba77979e6430068616fe
parentc1bf1cac9c6bde529e3a67ded0a0a11ea034f077 (diff)
Adding PyYAML, Html5lib, and Beautifulsoup4 as prerequsites of Astropy
Until this commit, PyYAML was not set as prerequisite of Astropy. This package is an optional dependency of Astropy for some particular functions. However, we have already included PyYAML into this project so it is available. With this commit, PyYAML has been set as a prerequisite of Astropy. In addition to this, Html5lib and Beautifulsoup4 have been also added as prerequsites of Astropy (and removed from Astroquery prerequisites). I noticed that both of them are optional dependencies of Astropy.
-rw-r--r--.file-metadatabin7883 -> 7883 bytes
-rw-r--r--reproduce/software/make/python.mk8
2 files changed, 4 insertions, 4 deletions
diff --git a/.file-metadata b/.file-metadata
index 033cf44..5cc3694 100644
--- a/.file-metadata
+++ b/.file-metadata
Binary files differ
diff --git a/reproduce/software/make/python.mk b/reproduce/software/make/python.mk
index 11ac543..fef1605 100644
--- a/reproduce/software/make/python.mk
+++ b/reproduce/software/make/python.mk
@@ -373,12 +373,9 @@ $(ipydir)/asteval: $(ipydir)/numpy \
$(call pybuild, tar xf, asteval-$(asteval-version), , \
ASTEVAL $(asteval-version))
-$(ipydir)/astroquery: $(ipydir)/numpy \
- $(ipydir)/astropy \
+$(ipydir)/astroquery: $(ipydir)/astropy \
$(ipydir)/keyring \
- $(ipydir)/html5lib \
$(ipydir)/requests \
- $(ipydir)/beautifulsoup4 \
| $(tdir)/astroquery-$(astroquery-version).tar.gz
$(call pybuild, tar xf, astroquery-$(astroquery-version), ,\
Astroquery $(astroquery-version))
@@ -386,6 +383,9 @@ $(ipydir)/astroquery: $(ipydir)/numpy \
$(ipydir)/astropy: $(ipydir)/h5py \
$(ipydir)/scipy \
$(ipydir)/numpy \
+ $(ipydir)/pyyaml \
+ $(ipydir)/html5lib \
+ $(ipydir)/beautifulsoup4 \
| $(tdir)/astropy-$(astropy-version).tar.gz
$(call pybuild, tar xf, astropy-$(astropy-version)) \
&& cp $(dtexdir)/astropy.tex $(ictdir)/ \