diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2018-02-22 08:53:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 08:53:06 -0500 |
| commit | d4ccb57a335dfda4b3583107767a081691352b2f (patch) | |
| tree | 43dd1892560bcc467c5eaf1373390cefe4707acd /pyregion | |
| parent | ebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff) | |
| parent | e027b0e371ddedc4377b43b425d2f67282ff45b7 (diff) | |
| download | astroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz | |
Merge branch 'master' into patch-3
Diffstat (limited to 'pyregion')
| -rw-r--r-- | pyregion/bld.bat | 8 | ||||
| -rw-r--r-- | pyregion/build.sh | 5 | ||||
| -rw-r--r-- | pyregion/meta.yaml | 22 |
3 files changed, 16 insertions, 19 deletions
diff --git a/pyregion/bld.bat b/pyregion/bld.bat index d1ddf28..39b5e1f 100644 --- a/pyregion/bld.bat +++ b/pyregion/bld.bat @@ -1,7 +1 @@ - -echo This d2to1 hack is deadly. -pip install --no-deps --upgrade --force d2to1 -if errorlevel 1 exit 1 - -python setup.py install || exit 1 -if errorlevel 1 exit 1
\ No newline at end of file +%PYTHON% setup.py install diff --git a/pyregion/build.sh b/pyregion/build.sh index 5e8b365..5a5aeeb 100644 --- a/pyregion/build.sh +++ b/pyregion/build.sh @@ -1,4 +1 @@ - -echo This d2to1 hack is deadly. -pip install --no-deps --upgrade --force d2to1 || exit 1 -python setup.py install || exit 1
\ No newline at end of file +$PYTHON setup.py install diff --git a/pyregion/meta.yaml b/pyregion/meta.yaml index f5451ce..5dc3949 100644 --- a/pyregion/meta.yaml +++ b/pyregion/meta.yaml @@ -1,9 +1,12 @@ {% set name = 'pyregion' %} -{% set version = '1.1.2' %} -{% set number = '1' %} +{% set version = '2.0' %} +{% if version[0] == 'v' %} +{% set version = version[1:] %} +{% endif %} +{% set number = '0' %} about: - home: https://github.com/spacetelescope/{{ name }} + home: https://github.com/astropy/{{ name }} license: BSD summary: Python parser for ds9 region files @@ -16,20 +19,23 @@ package: requirements: build: - - d2to1 - - numpy + - astropy + - cython + - numpy {{ numpy }} - pyparsing - - python x.x + - python {{ python }} - setuptools run: + - astropy + - cython - numpy - pyparsing - setuptools - - python x.x + - python source: git_tag: {{ version }} - git_url: https://github.com/spacetelescope/{{ name }}.git + git_url: https://github.com/astropy/{{ name }}.git test: imports: |