diff options
| author | Joseph Hunkeler <jhunkeler@users.noreply.github.com> | 2016-06-21 11:20:22 -0400 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-21 11:20:22 -0400 | 
| commit | c1795653e42b586e27a05d4abbce559b49960f18 (patch) | |
| tree | 81de7a35b2b1f959ccdf447f9fd59ae550e269bc | |
| parent | d01ed62ef230eeaa662b31643df0269dd472ce42 (diff) | |
| parent | bd0a1ec9b5d579a1ceebe7929f728f47f63e26e3 (diff) | |
| download | astroconda-contrib-c1795653e42b586e27a05d4abbce559b49960f18.tar.gz | |
Merge pull request #14 from jhunkeler/update-pyqtgraph
Update pyqtgraph to latest "develop" build; with inline retag
| -rw-r--r-- | pyqtgraph/build.sh | 4 | ||||
| -rw-r--r-- | pyqtgraph/meta.yaml | 22 | 
2 files changed, 17 insertions, 9 deletions
| diff --git a/pyqtgraph/build.sh b/pyqtgraph/build.sh index 4b71885..ba551f7 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 +git tag -a 0.9.11.dev -m 'Fake update to 0.9.11' +python setup.py install || exit 1 diff --git a/pyqtgraph/meta.yaml b/pyqtgraph/meta.yaml index 92d8ac1..69fd390 100644 --- a/pyqtgraph/meta.yaml +++ b/pyqtgraph/meta.yaml @@ -1,26 +1,34 @@  about:      home: http://www.pyqtgraph.org/      license: MIT -    summary: pyqtgraph +    summary: A pure-Python graphics library for PyQt/PySide (git master build) +  build:      number: '0' +  package:      name: pyqtgraph -    version: 0.9.10 +    version: 0.9.11 +  requirements:      build:      - setuptools +    - numpy x.x      - python x.x      run:      - pyqt      - pyopengl      - numpy x.x      - python x.x +  source: -    fn: pyqtgraph-0.9.10.tar.gz -    md5: bd84bf7537c43cf38db81cc1ad4f743a -    url: -    - https://pypi.python.org/packages/source/p/pyqtgraph/pyqtgraph-0.9.10.tar.gz +    git_rev: 670d63cd +    git_url: https://github.com/pyqtgraph/pyqtgraph.git +  test: -    imports: +  requires: +    - pyqt +    - numpy +  imports:      - pyqtgraph + | 
