Merge pull request #19 from desihub/18.6

desiconda updates for the 18.7 software release
desihub · Jul 18, 2018 · 1d1431e · 1d1431e
2 parents d65fc8b + ad59e4e
commit 1d1431e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/rules/astrometry_net.sh b/rules/astrometry_net.sh
@@ -1,6 +1,6 @@
-curl -SL https://github.com/dstndstn/astrometry.net/archive/0.73.tar.gz -o astrometry.net-0.73.tar.gz \
-    && tar xzf astrometry.net-0.73.tar.gz \
-    && cd astrometry.net-0.73 \
+curl -SL https://github.com/dstndstn/astrometry.net/archive/0.74.tar.gz -o astrometry.net-0.74.tar.gz \
+    && tar xzf astrometry.net-0.74.tar.gz \
+    && cd astrometry.net-0.74 \
     && CC="@CC@" CXX="@CXX@" CFLAGS="@CFLAGS@" CXXFLAGS="@CXXFLAGS@" \
     LDFLAGS="-L@AUX_PREFIX@/lib -lz" LDSHARED="@CC@ -shared" \
     WCSLIB_INC="-I@AUX_PREFIX@/include/wcslib" \

diff --git a/rules/conda_pkgs.sh b/rules/conda_pkgs.sh
@@ -5,10 +5,11 @@ conda install --copy --yes \
     cython \
     numpy \
     scipy \
-    matplotlib \
+    matplotlib=2.1.2 \
+    basemap \
     seaborn \
     pyyaml \
-    astropy=1.3.3 \
+    astropy=2 \
     hdf5 \
     h5py \
     psutil \
@@ -22,7 +23,8 @@ conda install --copy --yes \
     scikit-image \
     ipython \
     jupyter \
-    && conda install -c conda-forge --copy --yes basemap \
+    ipywidgets=6.0.0 \
+    bokeh \
     && mplrc="@CONDA_PREFIX@/lib/python@PYVERSION@/site-packages/matplotlib/mpl-data/matplotlibrc"; \
     cat ${mplrc} | sed -e "s#^backend.*#backend : TkAgg#" > ${mplrc}.tmp; \
     mv ${mplrc}.tmp ${mplrc} \

diff --git a/rules/pip_pkgs.sh b/rules/pip_pkgs.sh
@@ -3,4 +3,5 @@ pip install --no-binary :all: \
     hpsspy \
     photutils \
     coveralls \
+    line_profiler \
     https://github.com/esheldon/fitsio/archive/v0.9.12rc1.zip
diff --git a/rules/tractor.sh b/rules/tractor.sh
@@ -1,7 +1,7 @@
-curl -SL https://github.com/dstndstn/tractor/archive/dr6.2.tar.gz \
-    -o tractor-dr6.2.tar.gz \
-    && tar xzf tractor-dr6.2.tar.gz \
-    && cd tractor-dr6.2 && patch -p1 < ../rules/patch_tractor \
+curl -SL https://github.com/dstndstn/tractor/archive/dr7.0.tar.gz \
+    -o tractor-dr7.0.tar.gz \
+    && tar xzf tractor-dr7.0.tar.gz \
+    && cd tractor-dr7.0 && patch -p1 < ../rules/patch_tractor \
     && CERES_LIB_DIR="@AUX_PREFIX@/lib" \
     CC="@CC@" CFLAGS="@CFLAGS@" LDSHARED="@CC@ -shared" \
     CXX="@CXX@" CXXFLAGS="@CXXFLAGS@" BLAS_LIB="@BLAS@" \