summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--astropy/meta.yaml3
-rw-r--r--cubeviz/meta.yaml9
-rw-r--r--glue-core/LICENSE13
-rw-r--r--glue-core/meta.yaml78
-rw-r--r--glue-ginga/bld.bat2
-rw-r--r--glue-ginga/build.sh2
-rw-r--r--glue-ginga/meta.yaml40
-rw-r--r--glue-vispy-viewers/LICENSE13
-rw-r--r--glue-vispy-viewers/meta.yaml37
-rw-r--r--glueviz/LICENSE13
-rw-r--r--glueviz/meta.yaml45
-rw-r--r--mosviz/meta.yaml2
-rw-r--r--sextractor/build.sh5
-rw-r--r--sextractor/meta.yaml12
-rw-r--r--stsci.tools/meta.yaml3
-rw-r--r--stwcs/build.sh2
-rw-r--r--stwcs/meta.yaml5
17 files changed, 220 insertions, 64 deletions
diff --git a/astropy/meta.yaml b/astropy/meta.yaml
index dc1c88b..16244ea 100644
--- a/astropy/meta.yaml
+++ b/astropy/meta.yaml
@@ -3,7 +3,6 @@
{% if version[0] == 'v' %}
{% set version = version[1:] %}
{% endif %}
-{% set commit = '76c58d4b8d7baa6641a114c3927b2464805e1a09' %}
{% set number = '1' %}
about:
@@ -46,7 +45,7 @@ requirements:
- python
source:
- git_rev: {{ commit }}
+ git_rev: "master"
git_url: https://github.com/astropy/{{ name }}.git
test:
diff --git a/cubeviz/meta.yaml b/cubeviz/meta.yaml
index 2bfb0d2..45ca75b 100644
--- a/cubeviz/meta.yaml
+++ b/cubeviz/meta.yaml
@@ -22,9 +22,10 @@ requirements:
- asdf
- asteval
- astropy
- - glueviz
+ - glueviz >=0.12
+ - specviz
+ - pytest >=3.1*
- numpy {{ numpy }}
- - pytest
- setuptools
- python {{ python }}
@@ -34,7 +35,9 @@ requirements:
- astropy
- glueviz
- numpy
- - pytest
+ - glueviz >=0.12
+ - specviz
+ - pytest >=3.1*
- python
source:
diff --git a/glue-core/LICENSE b/glue-core/LICENSE
new file mode 100644
index 0000000..04ad21b
--- /dev/null
+++ b/glue-core/LICENSE
@@ -0,0 +1,13 @@
+BSD 3-clause license
+Copyright (c) conda-forge
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/glue-core/meta.yaml b/glue-core/meta.yaml
new file mode 100644
index 0000000..e4344e0
--- /dev/null
+++ b/glue-core/meta.yaml
@@ -0,0 +1,78 @@
+{% set name = 'glue-core' %}
+{% set version = '0.12.0' %}
+{% set number = '1' %}
+
+package:
+ name: {{ name }}
+ version: {{ version }}
+
+source:
+ fn: {{ name }}-{{ version }}.tar.gz
+ url: https://pypi.io/packages/source/g/{{ name }}/{{ name }}-{{ version }}.tar.gz
+ sha256: db871285e9fe4ff0092d6803d573daa953ec9864b9128cd027cee97b2573e557
+
+build:
+ number: {{ number }}
+ script: python setup.py install --single-version-externally-managed --record record.txt
+ entry_points:
+ - glue = glue.main:main
+ - glue-config = glue.config_gen:main
+ - glue-deps = glue._deps:main
+ osx_is_app: True
+
+requirements:
+
+ build:
+ - numpy {{ numpy }}
+ - python {{ python }}
+ - setuptools
+ - pyqt
+
+ run:
+
+ # The following is needed to make sure that the package works as a GUI
+ # application (glue needs to be run with python.app, not python)
+ - python.app # [osx]
+
+ # Required dependencies
+ - python
+ - numpy
+ - pandas >=0.14
+ - astropy >=1.3
+ - matplotlib >=1.4
+ - qtpy >=1.2
+ - ipython >=4.0
+ - ipykernel
+ - qtconsole
+ - dill >=0.2
+ - xlrd >=1.0
+ - h5py >=2.4
+ - setuptools >=1.0
+ - pyqt
+
+ # Optional dependencies (defined in ``extras_require``)
+ - scipy
+ - scikit-image
+ - plotly
+
+ # Temporary: the scikit-image conda package is missing the dask dependency
+ # so we add it here for now
+ - dask
+
+test:
+ imports:
+ - glue
+ - glue.core
+ - glue.app.qt
+ commands:
+ - glue --version
+ - glue-deps list
+
+# NOTE: we deliberatey do NOT include an app entry here, because we instead do this
+# in the glueviz meta-package (we don't want glue to appear twice in the navigator)
+
+about:
+ home: http://glueviz.org
+ license: BSD 3-Clause
+ license_file: LICENSE
+ summary: Multi-dimensional linked data exploration
diff --git a/glue-ginga/bld.bat b/glue-ginga/bld.bat
new file mode 100644
index 0000000..85a7bc3
--- /dev/null
+++ b/glue-ginga/bld.bat
@@ -0,0 +1,2 @@
+%PYTHON% setup.py install
+if errorlevel 1 exit 1
diff --git a/glue-ginga/build.sh b/glue-ginga/build.sh
new file mode 100644
index 0000000..2038de1
--- /dev/null
+++ b/glue-ginga/build.sh
@@ -0,0 +1,2 @@
+echo > README.rst
+$PYTHON setup.py install || exit 1
diff --git a/glue-ginga/meta.yaml b/glue-ginga/meta.yaml
new file mode 100644
index 0000000..c7e3308
--- /dev/null
+++ b/glue-ginga/meta.yaml
@@ -0,0 +1,40 @@
+{% set name = 'glue-ginga' %}
+{% set version = '0.2' %}
+{% set tag = 'v' + version %}
+{% set number = '1' %}
+
+about:
+ home: https://github.com/ejeschke/{{ name }}
+ license: BSD
+ summary: Astronomical data visualization
+
+build:
+ number: {{ number }}
+
+package:
+ name: {{ name }}
+ version: {{ version }}
+
+requirements:
+ build:
+ - astropy >=1.2
+ - glue-core >=0.11.1
+ - glue-vispy-viewers >=0.8
+ - ginga >=2.6.1
+ - setuptools
+ - numpy {{ numpy }}
+ - python {{ python }}
+ run:
+ - astropy >=1.2
+ - glueviz >=0.10
+ - ginga >=2.6.1
+ - numpy
+ - python
+
+source:
+ git_tag: {{ tag }}
+ git_url: https://github.com/ejeschke/{{ name }}.git
+
+test:
+ imports:
+ - glue_ginga
diff --git a/glue-vispy-viewers/LICENSE b/glue-vispy-viewers/LICENSE
new file mode 100644
index 0000000..04ad21b
--- /dev/null
+++ b/glue-vispy-viewers/LICENSE
@@ -0,0 +1,13 @@
+BSD 3-clause license
+Copyright (c) conda-forge
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/glue-vispy-viewers/meta.yaml b/glue-vispy-viewers/meta.yaml
index bcd35e3..120fa0a 100644
--- a/glue-vispy-viewers/meta.yaml
+++ b/glue-vispy-viewers/meta.yaml
@@ -1,46 +1,45 @@
{% set name = 'glue-vispy-viewers' %}
-{% set version = '0.4' %}
-{% set number = '2' %}
-
-about:
- home: https://github.com/glue-viz/glue-vispy-viewers
- license: BSD 3-Clause
- summary: 3D viewers for Glue
+{% set version = "0.9" %}
+{% set number = '1' %}
package:
name: {{ name }}
version: {{ version }}
source:
- fn: {{ name }}-{{version}}.tar.gz
+ fn: {{ name }}-{{ version }}.tar.gz
url: https://pypi.io/packages/source/g/glue-vispy-viewers/{{ name }}-{{ version }}.tar.gz
- md5: ded543ba93070a71f322da650b792b16
+ sha256: 8af81e184fc2ed43421f5be4affb88b9c190dd6c5ef14317821bd6b921c591d3
build:
number: {{ number }}
script: python setup.py install --single-version-externally-managed --record record.txt
+ preserve_egg_dir: True
requirements:
build:
- python {{ python }}
- setuptools
+ - numpy {{ numpy }}
+ - pyopengl
+ - glue-core >=0.12
run:
- python
- - numpy {{ numpy }}
+ - numpy
- pyopengl
- - glueviz
- - scikit-image
+ - glue-core >=0.12
- matplotlib
+ - qtpy
+ - pyqt
test:
- requires:
- - mock
- - pytest
imports:
- glue_vispy_viewers
+ - glue_vispy_viewers.scatter
+ - glue_vispy_viewers.volume
-
-extra:
- recipe-maintainers:
- - astrofrog
+about:
+ home: https://github.com/glue-viz/glue-vispy-viewers
+ license: BSD 3-Clause
+ summary: 3D viewers for Glue
diff --git a/glueviz/LICENSE b/glueviz/LICENSE
new file mode 100644
index 0000000..04ad21b
--- /dev/null
+++ b/glueviz/LICENSE
@@ -0,0 +1,13 @@
+BSD 3-clause license
+Copyright (c) conda-forge
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/glueviz/meta.yaml b/glueviz/meta.yaml
index e1e5848..144fab4 100644
--- a/glueviz/meta.yaml
+++ b/glueviz/meta.yaml
@@ -1,5 +1,9 @@
+# NOTE: this is a meta-package that includes the core glue code as well as stable
+# plugins. This is the main conda package we want in the Navigator, so we add the
+# app: entry here and not in the glue-core package.
+
{% set name = 'glueviz' %}
-{% set version = '0.8.2' %}
+{% set version = '0.12.0' %}
{% set number = '2' %}
package:
@@ -8,43 +12,26 @@ package:
source:
fn: {{ name }}-{{ version }}.tar.gz
- url: https://pypi.io/packages/source/g/glueviz/{{ name }}-{{ version }}.tar.gz
- md5: 92dd7de2621a6ab6861cc9b689e86c3e
+ url: https://pypi.io/packages/source/g/{{ name }}/{{ name }}-{{ version }}.tar.gz
+ sha256: 4b41b9bb41d88567e9fef76af545059ba9bb6c3a3645a07619fa5b1b47adbc5e
build:
number: {{ number }}
script: python setup.py install --single-version-externally-managed --record record.txt
- osx_is_app: True
requirements:
build:
+ # Conda-build is not smart enough to use 'python' on its own.
+ # DO NOT REMOVE THIS LINE:
- python {{ python }}
run:
+ - glue-core >=0.12
+ - glue-vispy-viewers >=0.9
+ - glue-ginga
+ # Conda-build is not smart enough to use 'python' on its own.
+ # DO NOT REMOVE THIS LINE:
- python
- - numpy {{ numpy }}
- - scipy
- - matplotlib
- - astropy
- - ipython
- - ipykernel
- - h5py
- - pandas
- - pyqt
- - qtconsole
- - xlrd
- - scikit-image
- - python.app # [osx]
-
-test:
- requires:
- - mock
- - pytest
- imports:
- - glue
- commands:
- - glue --version
- - glue-deps list
app:
entry: glue
@@ -56,7 +43,3 @@ about:
home: http://glueviz.org
license: BSD 3-Clause
summary: Multi-dimensional linked data exploration
-
-extra:
- recipe-maintainers:
- - astrofrog
diff --git a/mosviz/meta.yaml b/mosviz/meta.yaml
index 5deea70..c2a6667 100644
--- a/mosviz/meta.yaml
+++ b/mosviz/meta.yaml
@@ -27,6 +27,7 @@ requirements:
- specutils
- glueviz
- matplotlib
+ - qtpy
- numpy {{ numpy }}
- python {{ python }}
@@ -35,6 +36,7 @@ requirements:
- specutils
- glueviz
- matplotlib
+ - qtpy
- numpy
- python
diff --git a/sextractor/build.sh b/sextractor/build.sh
index 674229e..e9bfed7 100644
--- a/sextractor/build.sh
+++ b/sextractor/build.sh
@@ -1,8 +1,11 @@
+rm -rf aclocal.m4 autom4te.cache
+libtoolize -f -i
autoreconf -i
+
./configure --prefix=$PREFIX \
--disable-static \
--enable-mkl-gcc \
--with-mkl-dir=$PREFIX
-make -j ${CPU_COUNT}
+make -j ${CPU_COUNT} LDFLAGS=-liomp5
make install
diff --git a/sextractor/meta.yaml b/sextractor/meta.yaml
index cc6efab..f30e637 100644
--- a/sextractor/meta.yaml
+++ b/sextractor/meta.yaml
@@ -16,13 +16,15 @@ package:
requirements:
build:
- - autoconf [osx]
+ - autoconf
+ - automake
- fftw
- gcc
- - libtool [osx]
- - m4 [osx]
+ - libtool
+ - m4
- mkl-devel
- pkgconfig
+
run:
- mkl
- libgcc
@@ -33,8 +35,8 @@ source:
- {{ name }}-mkl-gcc.patch
fn: {{ name }}-{{ version }}.tar.gz
- url: http://www.astromatic.net/download/sextractor/{{ name }}-{{ version }}.tar.gz
- md5: 2115556b5d30571306608b7c023a318f
+ url: https://github.com/astromatic/sextractor/archive/{{ version }}.tar.gz
+ md5: 8b5d957c80d93396503a8bf6698f000a
test:
commands:
diff --git a/stsci.tools/meta.yaml b/stsci.tools/meta.yaml
index 12c3009..e220797 100644
--- a/stsci.tools/meta.yaml
+++ b/stsci.tools/meta.yaml
@@ -3,7 +3,7 @@
{% if version[0] == 'v' %}
{% set version = version[1:] %}
{% endif %}
-{% set number = '2' %}
+{% set number = '3' %}
about:
home: https://github.com/spacetelescope/{{ name }}
@@ -30,7 +30,6 @@ requirements:
run:
- astropy
- - stsci.distutils
- pytools
- numpy
- python
diff --git a/stwcs/build.sh b/stwcs/build.sh
index 5a5aeeb..6152189 100644
--- a/stwcs/build.sh
+++ b/stwcs/build.sh
@@ -1 +1 @@
-$PYTHON setup.py install
+$PYTHON setup.py install --single-version-externally-managed --record=null.txt
diff --git a/stwcs/meta.yaml b/stwcs/meta.yaml
index 4fb72a8..abd024d 100644
--- a/stwcs/meta.yaml
+++ b/stwcs/meta.yaml
@@ -20,12 +20,17 @@ package:
requirements:
build:
- astropy >=1.1
+ - lxml
+ - pytest
+ - requests
- stsci.tools
- setuptools
- numpy {{ numpy }}
- python {{ python }}
run:
- astropy >=1.1
+ - lxml
+ - requests
- stsci.tools
- numpy
- python