summaryrefslogtreecommitdiff
path: root/pyqtgraph
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@users.noreply.github.com>2018-01-05 15:01:53 -0500
committerMatt Rendina <rendinam@users.noreply.github.com>2018-01-05 15:01:53 -0500
commit286c9d0cd069759d090007da647e78afdb937596 (patch)
treed418f7d652cc5de4fe638143c30549a4fe9267b6 /pyqtgraph
parent90e6679788b9b9f81ef2ec1bad0d7b255ab5300d (diff)
downloadastroconda-dev-286c9d0cd069759d090007da647e78afdb937596.tar.gz
[WIP] Next (#75)
* Purge x.x style selectors * Add python jinja2 selectors * Add numpy jinja2 selectors * Add basic build matrix configuration * Delete iraf package; see astroconda/astroconda-iraf * Bump all build revisions * Remove drizzlepac and nose dependencies * Fixup dependencies * Strip newlines in version declaration * Implements new package versioning scheme * Revert sandboxing * Purge old or unnecessary packages * Clean up meta-packages * Use fake version * Minor clean up * Add missing md5 hashes * Python is not a dependency of XPA * Remove GIT_ usage in non-git recipe * Initial commit of asteval * cubeviz: sed patching glue/numpy/pytest * Add missing curly braces * Remove references to pywcs * Add mosviz * Fix up specutils * Forcefully strip all "v" version prefixes. Please stop using them. * Fix ginga * Use PYTHON * Remove d2to1 dep * Remove d2to1 dep * Remove d2to1 dep * Remove d2to1 dep * Remove deprecated JWST pipeline packages * Simplify python builds * Simplify python builds (windows) * Remove d2to1 dep * Remove d2to1 dep * Stop using 2to3 * Remove ATLAS * Move sextractor to mainline * Sextractor Intel MKL integration patches (i.e NO ATLAS)
Diffstat (limited to 'pyqtgraph')
-rw-r--r--pyqtgraph/bld.bat3
-rw-r--r--pyqtgraph/build.sh2
-rw-r--r--pyqtgraph/meta.yaml8
3 files changed, 6 insertions, 7 deletions
diff --git a/pyqtgraph/bld.bat b/pyqtgraph/bld.bat
index b290566..760380e 100644
--- a/pyqtgraph/bld.bat
+++ b/pyqtgraph/bld.bat
@@ -1,3 +1,2 @@
-python setup.py install
-if errorlevel 1 exit 1 \ No newline at end of file
+%PYTHON% setup.py install
diff --git a/pyqtgraph/build.sh b/pyqtgraph/build.sh
index 4b71885..6bd6081 100644
--- a/pyqtgraph/build.sh
+++ b/pyqtgraph/build.sh
@@ -1,2 +1,2 @@
-python setup.py install || exit 1 \ No newline at end of file
+$PYTHON setup.py install
diff --git a/pyqtgraph/meta.yaml b/pyqtgraph/meta.yaml
index b9233f8..da3b4ac 100644
--- a/pyqtgraph/meta.yaml
+++ b/pyqtgraph/meta.yaml
@@ -1,6 +1,6 @@
{% set name = 'pyqtgraph' %}
{% set version = '0.10.0' %}
-{% set number = '1' %}
+{% set number = '2' %}
about:
home: http://www.pyqtgraph.org/
@@ -17,13 +17,13 @@ package:
requirements:
build:
- setuptools
- - python x.x
+ - python {{ python }}
run:
- pyqt
- pyopengl
- - numpy
- - python x.x
+ - numpy {{ numpy }}
+ - python
source:
fn: {{ name }}-{{ version }}.tar.gz