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 | |
| 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
38 files changed, 397 insertions, 56 deletions
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 }} 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 }} 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 }} 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 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/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..6f9a341 --- /dev/null +++ b/ci-watson/meta.yaml @@ -0,0 +1,34 @@ +{% set name = 'ci-watson' %} +{% set reponame = 'ci_watson' %} +{% set version = '0.1.2' %} +{% 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 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 }} 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 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 diff --git a/ds9/meta.yaml b/ds9/meta.yaml index 36ee1ef..bbffac1 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/ @@ -18,8 +18,10 @@ package:  requirements:      build:      - gcc >=4.6 [osx] +    - autoconf +    - m4  source:      fn: {{ name }}.{{ version }}.tar.gz      url: http://ds9.si.edu/download/source/{{ name }}.{{ version }}.tar.gz -    md5: 5684be5f6123f3d0426ea3db46466cb4 +    md5: b700dd815fe1f7fa93e3e3bba1132ca7 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/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' %} 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 }} 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/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 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: 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/relic/meta.yaml b/relic/meta.yaml index 0eab507..1c463f4 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: @@ -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: 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 diff --git a/spherical-geometry/meta.yaml b/spherical-geometry/meta.yaml index 2b0f2fc..68b8e1f 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.4' %} +{% set number = '0' %}  about:      home: https://github.com/spacetelescope/{{ reponame }} 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 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 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 }} diff --git a/stsci.imagestats/meta.yaml b/stsci.imagestats/meta.yaml index d92854d..3f24a05 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.5.3' %}  {% set number = '0' %}  about: diff --git a/stsci.skypac/meta.yaml b/stsci.skypac/meta.yaml index 2609221..1c612fc 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.15' %}  {% set number = '0' %}  about: 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: 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 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 }} 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:  | 
