From 9f7260e358ed8065695adf47a1a8476d7e60c5af Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 22 Jun 2018 11:21:28 -0400 Subject: Update meta.yaml (#374) --- gwcs/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gwcs/meta.yaml b/gwcs/meta.yaml index fc74a33..df4efda 100644 --- a/gwcs/meta.yaml +++ b/gwcs/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'gwcs' %} {% set version = '0.9.1' %} -{% set number = '1' %} +{% set number = '2' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -9,6 +9,7 @@ about: build: number: {{ number }} + skip: True [py27] package: name: {{ name }} -- cgit From ae027a2f30dddcbc41ba1b16811e230ce24d257b Mon Sep 17 00:00:00 2001 From: Todd Miller Date: Fri, 22 Jun 2018 11:22:52 -0400 Subject: Update crds version (#373) * Updated version CRDS version to 7.2.4 corresponding to JWST DMS B7.1.3. Changed dependency on lockfile to filelock since lockfile is deprecated. * Reset build number --- crds/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crds/meta.yaml b/crds/meta.yaml index aff65a2..117b7e7 100644 --- a/crds/meta.yaml +++ b/crds/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'crds' %} -{% set version = '7.2.2' %} -{% set number = '4' %} +{% set version = '7.2.4' %} +{% set number = '0' %} about: home: http://www.stsci.edu/hst/observatory/crds/ @@ -26,7 +26,7 @@ requirements: - lxml - parsley - setuptools - - lockfile + - filelock - python {{ python }} run: @@ -37,7 +37,7 @@ requirements: - lxml - fitsverify - parsley - - lockfile + - filelock - python source: -- cgit From dbac2472e992c421a4e58129e9e5150cd80c3b85 Mon Sep 17 00:00:00 2001 From: Bernie Simon Date: Fri, 22 Jun 2018 11:23:59 -0400 Subject: spherical-geometry: Bump the version number to the most recent version (#372) * Bump the version number to the most recent version * Reset build number --- spherical-geometry/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spherical-geometry/meta.yaml b/spherical-geometry/meta.yaml index 2b0f2fc..e1cf3fe 100644 --- a/spherical-geometry/meta.yaml +++ b/spherical-geometry/meta.yaml @@ -1,7 +1,7 @@ {% set name = 'spherical-geometry' %} {% set reponame = 'spherical_geometry' %} -{% set version = '1.2.2' %} -{% set number = '1' %} +{% set version = '1.2.3' %} +{% set number = '0' %} about: home: https://github.com/spacetelescope/{{ reponame }} -- cgit From 5f645a1302ce7d43e615e706134da044ff81eabf Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 22 Jun 2018 11:35:54 -0400 Subject: asdf: drop 27 support (#375) --- asdf/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/asdf/meta.yaml b/asdf/meta.yaml index 6d71018..2dfbcf6 100644 --- a/asdf/meta.yaml +++ b/asdf/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'asdf' %} {% set version = '2.0.1' %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -9,6 +9,7 @@ about: build: number: {{ number }} + skip: True [py27] package: name: {{ name }} -- cgit From 6bf22430b5424a39dd4d6d9ce6f0df0828159950 Mon Sep 17 00:00:00 2001 From: Mihai Cara Date: Sat, 23 Jun 2018 13:53:35 -0400 Subject: Added optional parameters to PAM utilities in stsci.skypac (#376) See https://github.com/spacetelescope/stsci.skypac/pull/36 for more details. Skipped v0.9.13 due to an incorrectly (prematurely) applied tag. --- stsci.skypac/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stsci.skypac/meta.yaml b/stsci.skypac/meta.yaml index 2609221..a4bf5e9 100644 --- a/stsci.skypac/meta.yaml +++ b/stsci.skypac/meta.yaml @@ -1,5 +1,5 @@ {% set name = 'stsci.skypac' %} -{% set version = '0.9.12' %} +{% set version = '0.9.14' %} {% set number = '0' %} about: -- cgit From a608b0819365981bf96c7538c2bfb01648d7ef7d Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 27 Jun 2018 10:54:46 -0400 Subject: Initial commit of stregion (#377) --- stregion/bld.bat | 1 + stregion/build.sh | 1 + stregion/meta.yaml | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 stregion/bld.bat create mode 100644 stregion/build.sh create mode 100644 stregion/meta.yaml diff --git a/stregion/bld.bat b/stregion/bld.bat new file mode 100644 index 0000000..39b5e1f --- /dev/null +++ b/stregion/bld.bat @@ -0,0 +1 @@ +%PYTHON% setup.py install diff --git a/stregion/build.sh b/stregion/build.sh new file mode 100644 index 0000000..5a5aeeb --- /dev/null +++ b/stregion/build.sh @@ -0,0 +1 @@ +$PYTHON setup.py install diff --git a/stregion/meta.yaml b/stregion/meta.yaml new file mode 100644 index 0000000..419a24c --- /dev/null +++ b/stregion/meta.yaml @@ -0,0 +1,39 @@ +{% set name = 'stregion' %} +{% set version = '1.1.4' %} +{% set number = '0' %} + +about: + home: https://github.com/spacetelescope/{{ name }} + license: BSD + summary: Python parser for ds9 region files + +build: + number: {{ number }} + +package: + name: {{ name }} + version: {{ version }} + +requirements: + build: + - astropy + - cython + - numpy {{ numpy }} + - pyparsing + - python {{ python }} + - setuptools + run: + - astropy + - cython + - numpy + - pyparsing + - setuptools + - python + +source: + git_tag: {{ version }} + git_url: https://github.com/spacetelescope/{{ name }}.git + +test: + imports: + - stregion -- cgit From 405390f7eff98a34ad55707d0cccdf4c2353a0b6 Mon Sep 17 00:00:00 2001 From: Mihai Cara Date: Fri, 29 Jun 2018 14:54:48 -0400 Subject: Switch drizzlepac to using stregion (#379) * Switch drizzlepac to using stregion See https://github.com/spacetelescope/drizzlepac/issues/163 * Change pyregion to stregion --- drizzlepac/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drizzlepac/meta.yaml b/drizzlepac/meta.yaml index 81a890b..31c2f50 100644 --- a/drizzlepac/meta.yaml +++ b/drizzlepac/meta.yaml @@ -1,5 +1,5 @@ {% set name = 'drizzlepac' %} -{% set version = '2.2.3' %} +{% set version = '2.2.4' %} {% set number = '0' %} about: @@ -37,7 +37,7 @@ requirements: - stsci.stimage - stsci.tools - stwcs - - pyregion + - stregion - python {{ python }} - setuptools run: @@ -56,7 +56,7 @@ requirements: - stsci.stimage - stsci.tools - stwcs - - pyregion + - stregion - setuptools - python -- cgit From 1cd4f122155b8c447cdff07891ae3cd0e58492c9 Mon Sep 17 00:00:00 2001 From: Bernie Simon Date: Fri, 29 Jun 2018 14:55:37 -0400 Subject: Install the latest version of the spherical geometry library, 1.2.4 (#378) --- spherical-geometry/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spherical-geometry/meta.yaml b/spherical-geometry/meta.yaml index e1cf3fe..68b8e1f 100644 --- a/spherical-geometry/meta.yaml +++ b/spherical-geometry/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'spherical-geometry' %} {% set reponame = 'spherical_geometry' %} -{% set version = '1.2.3' %} +{% set version = '1.2.4' %} {% set number = '0' %} about: -- cgit From 62a71a56b1b094e51389f29eb00ceca2913b7342 Mon Sep 17 00:00:00 2001 From: Mihai Cara Date: Mon, 16 Jul 2018 11:31:35 -0500 Subject: Enhancements to Pixel Area Map computation (#380) See https://github.com/spacetelescope/stsci.skypac/pull/37 --- stsci.skypac/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stsci.skypac/meta.yaml b/stsci.skypac/meta.yaml index a4bf5e9..1c612fc 100644 --- a/stsci.skypac/meta.yaml +++ b/stsci.skypac/meta.yaml @@ -1,5 +1,5 @@ {% set name = 'stsci.skypac' %} -{% set version = '0.9.14' %} +{% set version = '0.9.15' %} {% set number = '0' %} about: -- cgit From 41812adeba07ad25f67eeb61281f8e2ea753caa0 Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Mon, 16 Jul 2018 12:32:32 -0400 Subject: Bump Ginga to 2.7.1 (#381) --- ginga/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ginga/meta.yaml b/ginga/meta.yaml index dccbba8..2344bbc 100644 --- a/ginga/meta.yaml +++ b/ginga/meta.yaml @@ -1,5 +1,5 @@ {% set name = 'ginga' %} -{% set version = '2.7.0' %} +{% set version = '2.7.1' %} {% set tag = 'v' ~ version %} {% set number = '0' %} -- cgit From 61f55ad8c992ae7f138dee598e3d6ebbb04f8699 Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Wed, 18 Jul 2018 16:21:20 -0400 Subject: Bump stsynphot to 0.1.1 --- stsynphot/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stsynphot/meta.yaml b/stsynphot/meta.yaml index 3ef087c..dbb6142 100644 --- a/stsynphot/meta.yaml +++ b/stsynphot/meta.yaml @@ -1,7 +1,7 @@ {% set reponame = 'stsynphot_refactor' %} {% set name = 'stsynphot' %} -{% set version = '0.1' %} -{% set number = '1' %} +{% set version = '0.1.1' %} +{% set number = '0' %} about: home: https://github.com/spacetelescope/{{ reponame }} -- cgit From 2d2e58df0307a05c44a5a58e3538b9bd8e2d704b Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Thu, 19 Jul 2018 13:04:12 -0400 Subject: Bump synphot to 0.1.2 --- synphot/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synphot/meta.yaml b/synphot/meta.yaml index b08b666..506c1a6 100644 --- a/synphot/meta.yaml +++ b/synphot/meta.yaml @@ -1,6 +1,6 @@ {% set reponame = 'synphot_refactor' %} {% set name = 'synphot' %} -{% set version = '0.1.1' %} +{% set version = '0.1.2' %} {% set number = '0' %} about: -- cgit From 79cb1bbdcb69c9704997825fb899c4462812093c Mon Sep 17 00:00:00 2001 From: Robert Jedrzejewski Date: Thu, 19 Jul 2018 16:12:41 -0400 Subject: Bumped version for updated timefilter.py --- costools/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/costools/meta.yaml b/costools/meta.yaml index dddfb25..0c8041c 100644 --- a/costools/meta.yaml +++ b/costools/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'costools' %} -{% set version = '1.2.1' %} -{% set number = '3' %} +{% set version = '1.2.2' %} +{% set number = '0' %} about: home: https://github.com/spacetelescope/{{ name }} -- cgit From 44c0e17a1740262e17a9f377a2ba7301f2cf093b Mon Sep 17 00:00:00 2001 From: Larry Bradley Date: Tue, 7 Aug 2018 00:48:50 -0400 Subject: Update photutils to v0.5 (#387) --- photutils/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/photutils/meta.yaml b/photutils/meta.yaml index 2b27508..cbd4448 100644 --- a/photutils/meta.yaml +++ b/photutils/meta.yaml @@ -1,7 +1,7 @@ {% set name = 'photutils' %} -{% set version = '0.4' %} +{% set version = '0.5' %} {% set tag = 'v' + version %} -{% set number = '1' %} +{% set number = '0' %} about: home: https://github.com/astropy/{{ name }} @@ -10,6 +10,7 @@ about: build: number: {{ number }} + skip: True [py27] package: name: {{ name }} @@ -20,22 +21,21 @@ requirements: - astropy >=2.0 - cython - matplotlib >=1.3 - - numpy >=1.9 + - numpy >=1.10 - scikit-image >=0.11 - scikit-learn >=0.18 - scipy >=0.16 - - six - setuptools - python {{ python }} run: - astropy >=2.0 + - pytest-astropy - cython - matplotlib >=1.3 - - numpy >=1.9 + - numpy >=1.10 - scikit-image >=0.11 - scikit-learn >=0.18 - scipy >=0.16 - - six - setuptools - python -- cgit From 6a4484790fefb15b48a11b9640590196e45caaa5 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 9 Aug 2018 11:10:15 -0400 Subject: Cfitsio disable cURL (#385) * Bump build number for affected recipes --- cfitsio/0001-cfitsio-autoconf-disable-curl.patch | 203 +++++++++++++++++++++++ cfitsio/build.sh | 6 +- cfitsio/meta.yaml | 12 +- crds/meta.yaml | 8 +- fitsverify/meta.yaml | 12 +- hstcal/build.sh | 9 +- hstcal/meta.yaml | 16 +- stsci/meta.yaml | 2 +- 8 files changed, 245 insertions(+), 23 deletions(-) create mode 100644 cfitsio/0001-cfitsio-autoconf-disable-curl.patch diff --git a/cfitsio/0001-cfitsio-autoconf-disable-curl.patch b/cfitsio/0001-cfitsio-autoconf-disable-curl.patch new file mode 100644 index 0000000..bd0189b --- /dev/null +++ b/cfitsio/0001-cfitsio-autoconf-disable-curl.patch @@ -0,0 +1,203 @@ +Only in b/cfitsio: autom4te.cache +diff --recursive -u -p a/cfitsio/configure b/cfitsio/configure +--- a/cfitsio/configure 2018-05-09 15:16:00.000000000 -0400 ++++ b/cfitsio/configure 2018-08-06 15:42:35.000000000 -0400 +@@ -710,6 +710,7 @@ enable_reentrant + enable_sse2 + enable_ssse3 + enable_hera ++enable_curl + with_bzip2 + with_gsiftp + with_gsiftp_flavour +@@ -1341,6 +1342,7 @@ Optional Features: + --enable-ssse3 Enable use of instructions in the SSSE3 extended + instruction set + --enable-hera Build for HERA (ASD use only) ++ --disable-curl Disable use of cURL library (HTTPS) + + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +@@ -2264,6 +2266,13 @@ if test "x$BUILD_HERA" = xyes; then + + fi + ++# Check whether --enable-curl was given. ++if test "${enable_curl+set}" = set; then : ++ enableval=$enable_curl; if test $enableval = yes; then CURL_DISABLED=yes; fi ++ ++fi ++ ++ + # Optional support for bzip2 compression: + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -4780,17 +4789,18 @@ if test "x$CFITSIO_SHLIB" = x; then CFIT + + # Curl library (will be pulled in to the shared CFITSIO library): + # --------------------------------------------------------------- +-CURL_LIB="" +-CURL_INC="" +-# Use curl-config to get compiler & linker flags, if available. +-# On Macs, prefer XCode curl-config, and reject MacPorts version +-# until further notice to prevent build errors: +-if test "x$EXT" = xdarwin -a -x /usr/bin/curl-config; then +- CURLCONFIG="/usr/bin/curl-config" +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for curl-config... choosing /usr/bin/curl-config on Mac" >&5 ++if test "x$CURL_DISABLED" != x; then ++ CURL_LIB="" ++ CURL_INC="" ++ # Use curl-config to get compiler & linker flags, if available. ++ # On Macs, prefer XCode curl-config, and reject MacPorts version ++ # until further notice to prevent build errors: ++ if test "x$EXT" = xdarwin -a -x /usr/bin/curl-config; then ++ CURLCONFIG="/usr/bin/curl-config" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for curl-config... choosing /usr/bin/curl-config on Mac" >&5 + $as_echo "checking for curl-config... choosing /usr/bin/curl-config on Mac" >&6; } +-else +- # Extract the first word of "curl-config", so it can be a program name with args. ++ else ++ # Extract the first word of "curl-config", so it can be a program name with args. + set dummy curl-config; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +@@ -4844,30 +4854,34 @@ $as_echo "no" >&6; } + fi + + +-fi +-if test "x$CURLCONFIG" != x; then +- CURL_LIB=`$CURLCONFIG --libs` +- CURL_INC=`$CURLCONFIG --cflags` +- # Also reject anaconda curl on Macs until further notice: +- if test "x$EXT" = xdarwin -a `echo $CURL_LIB $CURL_INC | grep -ci anaconda` -gt 0; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Rejecting Anaconda curl. Disabling HTTPS support." >&5 ++ fi ++ if test "x$CURLCONFIG" != x; then ++ CURL_LIB=`$CURLCONFIG --libs` ++ CURL_INC=`$CURLCONFIG --cflags` ++ # Also reject anaconda curl on Macs until further notice: ++ if test "x$EXT" = xdarwin -a `echo $CURL_LIB $CURL_INC | grep -ci anaconda` -gt 0; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Rejecting Anaconda curl. Disabling HTTPS support." >&5 + $as_echo "$as_me: WARNING: Rejecting Anaconda curl. Disabling HTTPS support." >&2;} +- else +- LIBS="$CURL_LIB $LIBS" +- if test "x$CURL_INC" != x; then +- CFLAGS="$CURL_INC $CFLAGS" +- fi +- $as_echo "#define CFITSIO_HAVE_CURL 1" >>confdefs.h ++ else ++ LIBS="$CURL_LIB $LIBS" ++ if test "x$CURL_INC" != x; then ++ CFLAGS="$CURL_INC $CFLAGS" ++ fi ++ $as_echo "#define CFITSIO_HAVE_CURL 1" >>confdefs.h + ++ fi ++ # No curl-config: ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: curl-config not found. Disabling HTTPS support." >&5 ++$as_echo "$as_me: WARNING: curl-config not found. Disabling HTTPS support." >&2;} ++ # Incomplete stubs for possible future use: ++ # AC_CHECK_LIB([curl],[main],[], ++ # [AC_MSG_WARN(Not building curl support for CFITSIO)]) ++ # AC_CHECK_HEADER(curl.h,[]) + fi +-# No curl-config: + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: curl-config not found. Disabling HTTPS support." >&5 +-$as_echo "$as_me: WARNING: curl-config not found. Disabling HTTPS support." >&2;} +-# Incomplete stubs for possible future use: +-# AC_CHECK_LIB([curl],[main],[], +-# [AC_MSG_WARN(Not building curl support for CFITSIO)]) +-# AC_CHECK_HEADER(curl.h,[]) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: curl disabled. Disabling HTTPS support." >&5 ++$as_echo "$as_me: WARNING: curl disabled. Disabling HTTPS support." >&2;} + fi + + # GSIFTP flags: +diff --recursive -u -p a/cfitsio/configure.in b/cfitsio/configure.in +--- a/cfitsio/configure.in 2018-05-09 15:16:00.000000000 -0400 ++++ b/cfitsio/configure.in 2018-08-06 15:42:27.000000000 -0400 +@@ -53,6 +53,12 @@ if test "x$BUILD_HERA" = xyes; then + AC_DEFINE(BUILD_HERA) + fi + ++AC_ARG_ENABLE( ++ curl, ++ [AS_HELP_STRING([--disable-curl],[Disable use of cURL library (HTTPS)])], ++ [ if test $enableval = yes; then CURL_DISABLED=yes; fi ] ++) ++ + # Optional support for bzip2 compression: + AC_ARG_WITH( + bzip2, +@@ -441,37 +447,41 @@ if test "x$CFITSIO_SHLIB" = x; then CFIT + + # Curl library (will be pulled in to the shared CFITSIO library): + # --------------------------------------------------------------- +-CURL_LIB="" +-CURL_INC="" +-# Use curl-config to get compiler & linker flags, if available. +-# On Macs, prefer XCode curl-config, and reject MacPorts version +-# until further notice to prevent build errors: +-if test "x$EXT" = xdarwin -a -x /usr/bin/curl-config; then +- CURLCONFIG="/usr/bin/curl-config" +- AC_MSG_RESULT(checking for curl-config... choosing /usr/bin/curl-config on Mac) +-else +- AC_CHECK_PROG([CURLCONFIG], [curl-config], [curl-config], [], [], [/opt/local/bin/curl-config]) +-fi +-if test "x$CURLCONFIG" != x; then +- CURL_LIB=`$CURLCONFIG --libs` +- CURL_INC=`$CURLCONFIG --cflags` +- # Also reject anaconda curl on Macs until further notice: +- if test "x$EXT" = xdarwin -a `echo $CURL_LIB $CURL_INC | grep -ci anaconda` -gt 0; then +- AC_MSG_WARN(Rejecting Anaconda curl. Disabling HTTPS support.) ++if test "x$CURL_DISABLED" != x; then ++ CURL_LIB="" ++ CURL_INC="" ++ # Use curl-config to get compiler & linker flags, if available. ++ # On Macs, prefer XCode curl-config, and reject MacPorts version ++ # until further notice to prevent build errors: ++ if test "x$EXT" = xdarwin -a -x /usr/bin/curl-config; then ++ CURLCONFIG="/usr/bin/curl-config" ++ AC_MSG_RESULT(checking for curl-config... choosing /usr/bin/curl-config on Mac) + else +- LIBS="$CURL_LIB $LIBS" +- if test "x$CURL_INC" != x; then +- CFLAGS="$CURL_INC $CFLAGS" ++ AC_CHECK_PROG([CURLCONFIG], [curl-config], [curl-config], [], [], [/opt/local/bin/curl-config]) ++ fi ++ if test "x$CURLCONFIG" != x; then ++ CURL_LIB=`$CURLCONFIG --libs` ++ CURL_INC=`$CURLCONFIG --cflags` ++ # Also reject anaconda curl on Macs until further notice: ++ if test "x$EXT" = xdarwin -a `echo $CURL_LIB $CURL_INC | grep -ci anaconda` -gt 0; then ++ AC_MSG_WARN(Rejecting Anaconda curl. Disabling HTTPS support.) ++ else ++ LIBS="$CURL_LIB $LIBS" ++ if test "x$CURL_INC" != x; then ++ CFLAGS="$CURL_INC $CFLAGS" ++ fi ++ AC_DEFINE(CFITSIO_HAVE_CURL) + fi +- AC_DEFINE(CFITSIO_HAVE_CURL) ++ # No curl-config: ++ else ++ AC_MSG_WARN(curl-config not found. Disabling HTTPS support.) ++ # Incomplete stubs for possible future use: ++ # AC_CHECK_LIB([curl],[main],[], ++ # [AC_MSG_WARN(Not building curl support for CFITSIO)]) ++ # AC_CHECK_HEADER(curl.h,[]) + fi +-# No curl-config: + else +- AC_MSG_WARN(curl-config not found. Disabling HTTPS support.) +-# Incomplete stubs for possible future use: +-# AC_CHECK_LIB([curl],[main],[], +-# [AC_MSG_WARN(Not building curl support for CFITSIO)]) +-# AC_CHECK_HEADER(curl.h,[]) ++ AC_MSG_WARN(curl disabled. Disabling HTTPS support.) + fi + + # GSIFTP flags: diff --git a/cfitsio/build.sh b/cfitsio/build.sh index 5368e6b..c76e193 100644 --- a/cfitsio/build.sh +++ b/cfitsio/build.sh @@ -1,8 +1,8 @@ case "$(uname)" in Darwin) export CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=200112L" - ;; + ;; esac -./configure --prefix=$PREFIX --disable-static --enable-reentrant -make -j $CPU_COUNT shared +./configure --prefix=$PREFIX --enable-reentrant --disable-curl +make shared make install diff --git a/cfitsio/meta.yaml b/cfitsio/meta.yaml index 31896b3..20be0ac 100644 --- a/cfitsio/meta.yaml +++ b/cfitsio/meta.yaml @@ -1,7 +1,7 @@ {% set name = 'cfitsio' %} {% set version = '3.440' %} {% set version_short = '3440' %} -{% set number = '0' %} +{% set number = '1' %} about: home: http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html @@ -19,13 +19,15 @@ package: requirements: build: - - curl - - gcc [osx] + - gcc >=4.6 run: - - curl - - libgcc [osx] + - libgcc >=4.6 source: + patches: + - 0001-cfitsio-autoconf-disable-curl.patch + fn: {{ name }}{{ version_short }}.tar.gz url: http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/{{ name }}{{ version_short }}.tar.gz + #md5: 8c9b3383752f1bd663b936c297f19feb # verification broken in conda-build through 3.7.1 diff --git a/crds/meta.yaml b/crds/meta.yaml index 117b7e7..01b916f 100644 --- a/crds/meta.yaml +++ b/crds/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'crds' %} {% set version = '7.2.4' %} -{% set number = '0' %} +{% set number = '1' %} about: home: http://www.stsci.edu/hst/observatory/crds/ @@ -20,18 +20,18 @@ package: requirements: build: - astropy >=1.1 - - cfitsio >=3.430 + - cfitsio >=3.440 - numpy {{ numpy }} - requests - lxml - parsley - - setuptools - filelock + - setuptools - python {{ python }} run: - astropy >=1.1 - - cfitsio >=3.430 + - cfitsio - numpy - requests - lxml diff --git a/fitsverify/meta.yaml b/fitsverify/meta.yaml index 76ffe35..96139d0 100644 --- a/fitsverify/meta.yaml +++ b/fitsverify/meta.yaml @@ -1,6 +1,11 @@ {% set name = 'fitsverify' %} {% set version = '4.18' %} -{% set number = '5' %} +{% set number = '6' %} +# number = 1 ; legacy, links against whatever is provided by available cfitsio package +# number = 2 ; links against cfitsio < 3.410 +# number = 3 ; links against cfitsio >= 3.410 +# number = 5 ; links against cfitsio >= 3.440 +# number = 6 ; links against cfitsio >= 3.440 (no curl) about: home: http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html @@ -19,15 +24,16 @@ package: requirements: build: - - cfitsio >=3.430 + - cfitsio >=3.440 - pkg-config [osx] run: - - cfitsio >=3.430 + - cfitsio >=3.440 source: fn: {{ name }}-{{ version }}.tar.gz url: https://heasarc.gsfc.nasa.gov/docs/software/ftools/{{ name }}/{{ name }}-{{ version }}.tar.gz + #md5: 84f2930e802891392043cb8a6cbf4d5d # Checksumming broken in conda-build. test: commands: diff --git a/hstcal/build.sh b/hstcal/build.sh index 4845293..a9727f0 100644 --- a/hstcal/build.sh +++ b/hstcal/build.sh @@ -1,10 +1,11 @@ if [[ `uname` == Darwin ]]; then export CC=`which gcc` - export DARWIN_FLAGS='-m64' - export CFLAGS="$CFLAGS $DARWIN_FLAGS" - export LDFLAGS="$LDFLAGS $DARWIN_FLAGS" + if [[ `uname -m` == x86_64 ]]; then + export CFLAGS="$CFLAGS -m64" + export LDFLAGS="$LDFLAGS -m64" + fi fi -./waf configure --prefix=$PREFIX +./waf configure --prefix=$PREFIX --release-with-symbols ./waf build ./waf install diff --git a/hstcal/meta.yaml b/hstcal/meta.yaml index 26b999f..b6189ca 100644 --- a/hstcal/meta.yaml +++ b/hstcal/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'hstcal' %} {% set version = '2.0.0' %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://github.com/spacetelescope/{{ name }} @@ -16,10 +16,20 @@ package: requirements: build: - - gcc >=4.6 [osx] + - cfitsio >=3.440 + - pkg-config + - gcc >=4.7 + run: - - libgcc >=4.6 [osx] + - cfitsio + - libgcc >=4.7 source: git_tag: {{ version }} git_url: https://github.com/spacetelescope/{{ name }}.git + +test: + commands: + - calacs.e --gitinfo + - otool -L $(which calacs.e) [osx] + - ldd $(which calacs.e) [linux] diff --git a/stsci/meta.yaml b/stsci/meta.yaml index 0e66d61..dc3746d 100644 --- a/stsci/meta.yaml +++ b/stsci/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'stsci' %} {% set version = '3.0.2' %} -{% set number = '0' %} +{% set number = '1' %} about: home: http://ssb.stsci.edu -- cgit From 2bc906192e091787f3dbb5c15fab89896dbd16f3 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 9 Aug 2018 12:01:23 -0400 Subject: Initial commit of semantic_version (#392) --- semantic_version/bld.bat | 1 + semantic_version/build.sh | 1 + semantic_version/meta.yaml | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 semantic_version/bld.bat create mode 100644 semantic_version/build.sh create mode 100644 semantic_version/meta.yaml diff --git a/semantic_version/bld.bat b/semantic_version/bld.bat new file mode 100644 index 0000000..39b5e1f --- /dev/null +++ b/semantic_version/bld.bat @@ -0,0 +1 @@ +%PYTHON% setup.py install diff --git a/semantic_version/build.sh b/semantic_version/build.sh new file mode 100644 index 0000000..5a5aeeb --- /dev/null +++ b/semantic_version/build.sh @@ -0,0 +1 @@ +$PYTHON setup.py install diff --git a/semantic_version/meta.yaml b/semantic_version/meta.yaml new file mode 100644 index 0000000..633f047 --- /dev/null +++ b/semantic_version/meta.yaml @@ -0,0 +1,32 @@ +{% set name = 'semantic_version' %} +{% set version = '2.6.0' %} +{% set number = '0' %} + +about: + home: https://github.com/rbarrois/python-semanticversion + license: BSD + summary: A library implementing the 'Semver' scheme. + +package: + name: {{ name }} + version: {{ version }} + +build: + number: {{ number }} + +source: + fn: {{ name }}-{{ version }}.tar.gz + url: https://pypi.python.org/packages/72/83/f76958017f3094b072d8e3a72d25c3ed65f754cc607fdb6a7b33d84ab1d5/{{ name }}-{{ version }}.tar.gz + md5: 4388a5df93e4dbe7b48767b3694bb761 + +requirements: + build: + - setuptools + - python {{ python }} + + run: + - python + +test: + imports: + - semantic_version -- cgit From 19d49d137fa8ad6dac79488dcfcd976e4d17aada Mon Sep 17 00:00:00 2001 From: Nadia Dencheva Date: Thu, 9 Aug 2018 12:14:19 -0400 Subject: update stsci.tools to 3.4.13 (#390) --- stsci.tools/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stsci.tools/meta.yaml b/stsci.tools/meta.yaml index f1895ab..b6f1ecb 100644 --- a/stsci.tools/meta.yaml +++ b/stsci.tools/meta.yaml @@ -1,5 +1,5 @@ {% set name = 'stsci.tools' %} -{% set version = '3.4.12' %} +{% set version = '3.4.13' %} {% set number = '0' %} about: -- cgit From 66c548c666d7e60a298209d1152b5329456ae8a4 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 9 Aug 2018 12:42:21 -0400 Subject: astropy-healpix: drop setuptools constraint (#393) --- astropy-healpix/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/astropy-healpix/meta.yaml b/astropy-healpix/meta.yaml index 52a3607..176688a 100644 --- a/astropy-healpix/meta.yaml +++ b/astropy-healpix/meta.yaml @@ -19,7 +19,7 @@ requirements: build: - astropy - cython - - setuptools <38.5.1 + - setuptools - numpy {{ numpy }} - python {{ python }} -- cgit From 3d3ddb3bc3b5c941c9872d9d7c71e3247323ce2f Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 9 Aug 2018 12:43:53 -0400 Subject: astroscrappy: remove setuptools constraint (#394) --- astroscrappy/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/astroscrappy/meta.yaml b/astroscrappy/meta.yaml index afc19d0..3303c03 100644 --- a/astroscrappy/meta.yaml +++ b/astroscrappy/meta.yaml @@ -19,7 +19,7 @@ requirements: build: - astropy - cython - - setuptools <38.5.1 + - setuptools - numpy {{ numpy }} - python {{ python }} -- cgit From dd73590e07ca8792de32b0b7dcc935ba3c8dad92 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 10 Aug 2018 16:13:47 -0400 Subject: stsci.imagemanip: Update 1.1.2 -> 1.1.4 (#395) Fixes `stsci.tools.tester` incompatibility --- stsci.imagemanip/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stsci.imagemanip/meta.yaml b/stsci.imagemanip/meta.yaml index 654179a..9921141 100644 --- a/stsci.imagemanip/meta.yaml +++ b/stsci.imagemanip/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'stsci.imagemanip' %} -{% set version = '1.1.2' %} -{% set number = '2' %} +{% set version = '1.1.4' %} +{% set number = '0' %} about: home: https://github.com/spacetelescope/{{ name }} -- cgit From e4de63f844251daf51327bc5e605487fdf45e880 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 10 Aug 2018 16:41:45 -0400 Subject: Deprecate pyregion (#396) --- pyregion/meta.yaml | 1 + stsci-hst/meta.yaml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyregion/meta.yaml b/pyregion/meta.yaml index 2bb30ac..63c1e7e 100644 --- a/pyregion/meta.yaml +++ b/pyregion/meta.yaml @@ -9,6 +9,7 @@ about: build: number: {{ number }} + skip: True package: name: {{ name }} diff --git a/stsci-hst/meta.yaml b/stsci-hst/meta.yaml index 922df44..b644a32 100644 --- a/stsci-hst/meta.yaml +++ b/stsci-hst/meta.yaml @@ -1,5 +1,5 @@ {% set name = 'stsci-hst' %} -{% set version = '3.0.2' %} +{% set version = '3.0.3' %} {% set number = '0' %} about: @@ -31,7 +31,6 @@ requirements: - fitsblender >=0.3.2 - hstcal >=1.2.0 - nictools >=1.1.3 - - pyregion >=1.1.2 - pysynphot >=0.9.8.7 - reftools >=1.7.4 - stistools >=1.1 -- cgit From 98823944c7ea74d5a4d536b12fabc7277ce2b646 Mon Sep 17 00:00:00 2001 From: Pey Lian Lim <2090236+pllim@users.noreply.github.com> Date: Mon, 20 Aug 2018 09:52:02 -0400 Subject: Add ci-watson --- ci-watson/bld.bat | 2 ++ ci-watson/build.sh | 1 + ci-watson/meta.yaml | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 ci-watson/bld.bat create mode 100644 ci-watson/build.sh create mode 100644 ci-watson/meta.yaml diff --git a/ci-watson/bld.bat b/ci-watson/bld.bat new file mode 100644 index 0000000..760380e --- /dev/null +++ b/ci-watson/bld.bat @@ -0,0 +1,2 @@ + +%PYTHON% setup.py install diff --git a/ci-watson/build.sh b/ci-watson/build.sh new file mode 100644 index 0000000..5a5aeeb --- /dev/null +++ b/ci-watson/build.sh @@ -0,0 +1 @@ +$PYTHON setup.py install diff --git a/ci-watson/meta.yaml b/ci-watson/meta.yaml new file mode 100644 index 0000000..dbf7f5b --- /dev/null +++ b/ci-watson/meta.yaml @@ -0,0 +1,34 @@ +{% set name = 'ci-watson' %} +{% set reponame = 'ci_watson' %} +{% set version = '0.1' %} +{% set number = '0' %} + +about: + home: https://github.com/spacetelescope/{{ reponame }} + license: BSD + summary: CI helper for STScI Jenkins + +build: + number: {{ number }} + skip: true # [py2k] + +package: + name: {{ name }} + version: {{ version }} + +requirements: + build: + - pytest + - setuptools + - python {{ python }} + run: + - pytest + - python + +source: + git_tag: {{ version }} + git_url: https://github.com/spacetelescope/{{ reponame }}.git + +test: + imports: + - ci_watson -- cgit From 33aa356fabbdb0c23baf9263d43d4f6292a0b083 Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Tue, 11 Sep 2018 21:37:45 -0400 Subject: Remove sed from calcos build (#400) --- calcos/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/calcos/build.sh b/calcos/build.sh index b442f84..5a5aeeb 100644 --- a/calcos/build.sh +++ b/calcos/build.sh @@ -1,2 +1 @@ -sed -i -e 's|pyfits.*|astropy (>=0.3.1)|' setup.cfg $PYTHON setup.py install -- cgit From b1921d8fcb203e4ebc91d02850c18468e40bf378 Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Thu, 13 Sep 2018 14:13:22 -0400 Subject: Bump ci-watson to 0.1.1 --- ci-watson/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-watson/meta.yaml b/ci-watson/meta.yaml index dbf7f5b..a4511f4 100644 --- a/ci-watson/meta.yaml +++ b/ci-watson/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'ci-watson' %} {% set reponame = 'ci_watson' %} -{% set version = '0.1' %} +{% set version = '0.1.1' %} {% set number = '0' %} about: -- cgit From 3220d53a2b612ab9f9f42b52904624e277adcf7f Mon Sep 17 00:00:00 2001 From: "P. L. Lim" <2090236+pllim@users.noreply.github.com> Date: Fri, 14 Sep 2018 10:01:32 -0400 Subject: Bump ci-watson to 0.1.2 --- ci-watson/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-watson/meta.yaml b/ci-watson/meta.yaml index a4511f4..6f9a341 100644 --- a/ci-watson/meta.yaml +++ b/ci-watson/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'ci-watson' %} {% set reponame = 'ci_watson' %} -{% set version = '0.1.1' %} +{% set version = '0.1.2' %} {% set number = '0' %} about: -- cgit From 636caeac0741d7a8d61ee8f9398e8ce3c1cdce11 Mon Sep 17 00:00:00 2001 From: Mihai Cara Date: Mon, 17 Sep 2018 20:35:12 -0400 Subject: Fix handling of limits See https://github.com/spacetelescope/stsci.imagestats/pull/6 --- stsci.imagestats/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stsci.imagestats/meta.yaml b/stsci.imagestats/meta.yaml index d92854d..9ffbf78 100644 --- a/stsci.imagestats/meta.yaml +++ b/stsci.imagestats/meta.yaml @@ -1,5 +1,5 @@ {% set name = 'stsci.imagestats' %} -{% set version = '1.4.2' %} +{% set version = '1.4.3' %} {% set number = '0' %} about: -- cgit From 4c6ebe179da4094d4ca2101dca657b64424ea839 Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Fri, 28 Sep 2018 14:13:09 -0400 Subject: relic 1.1.2 --- relic/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relic/meta.yaml b/relic/meta.yaml index 0eab507..d281507 100644 --- a/relic/meta.yaml +++ b/relic/meta.yaml @@ -1,5 +1,5 @@ {% set name = 'relic' %} -{% set version = '1.0.5' %} +{% set version = '1.1.2' %} {% set number = '1' %} about: -- cgit From 196fe98c3c6dd3e47ba118993b4af515d9618917 Mon Sep 17 00:00:00 2001 From: Mihai Cara Date: Sat, 29 Sep 2018 22:34:10 -0400 Subject: Documentation update and readthedocs support. Quiet C numpy warnings See https://github.com/spacetelescope/stsci.imagestats/pull/10 and https://github.com/spacetelescope/stsci.imagestats/pull/11 for more details --- stsci.imagestats/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stsci.imagestats/meta.yaml b/stsci.imagestats/meta.yaml index 9ffbf78..3f24a05 100644 --- a/stsci.imagestats/meta.yaml +++ b/stsci.imagestats/meta.yaml @@ -1,5 +1,5 @@ {% set name = 'stsci.imagestats' %} -{% set version = '1.4.3' %} +{% set version = '1.5.3' %} {% set number = '0' %} about: -- cgit From 40f3eec9c84f628d1e63e39061ad3b207cac7d78 Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Mon, 1 Oct 2018 09:44:40 -0400 Subject: Update versions of ds9 & pyds9 --- ds9/meta.yaml | 6 +++--- pyds9/meta.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ds9/meta.yaml b/ds9/meta.yaml index 36ee1ef..b57e5bc 100644 --- a/ds9/meta.yaml +++ b/ds9/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'ds9' %} -{% set version = '7.5' %} -{% set number = '1' %} +{% set version = '7.6' %} +{% set number = '0' %} about: home: http://ds9.si.edu/download/source/ @@ -22,4 +22,4 @@ requirements: source: fn: {{ name }}.{{ version }}.tar.gz url: http://ds9.si.edu/download/source/{{ name }}.{{ version }}.tar.gz - md5: 5684be5f6123f3d0426ea3db46466cb4 + md5: b700dd815fe1f7fa93e3e3bba1132ca7 diff --git a/pyds9/meta.yaml b/pyds9/meta.yaml index 1bc5fcf..510f3d4 100644 --- a/pyds9/meta.yaml +++ b/pyds9/meta.yaml @@ -33,7 +33,7 @@ requirements: - python source: - git_rev: 3761d7ac151f8c8729d0fb6cdba017cadf278283 + git_rev: c1bf67ab195bd7eb0c662755c2df35df014482b0 git_url: https://github.com/ericmandel/{{ name }}.git test: -- cgit From 607cb52dc6f5a75733b2c5bfb572045e73dcaf08 Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Tue, 2 Oct 2018 16:35:57 -0400 Subject: Add deps needed for use on default linux build machine. --- ds9/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ds9/meta.yaml b/ds9/meta.yaml index b57e5bc..bbffac1 100644 --- a/ds9/meta.yaml +++ b/ds9/meta.yaml @@ -18,6 +18,8 @@ package: requirements: build: - gcc >=4.6 [osx] + - autoconf + - m4 source: fn: {{ name }}.{{ version }}.tar.gz -- cgit From 740685a8e3e1c45ba09d32f3fe860b983222125d Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Mon, 8 Oct 2018 09:12:18 -0400 Subject: Change relic to use production repo. --- relic/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relic/meta.yaml b/relic/meta.yaml index d281507..1c463f4 100644 --- a/relic/meta.yaml +++ b/relic/meta.yaml @@ -23,7 +23,7 @@ requirements: source: git_tag: {{ version }} - git_url: https://github.com/jhunkeler/{{ name }}.git + git_url: https://github.com/spacetelescope/{{ name }}.git test: imports: -- cgit