diff options
author | Todd Miller <jmiller@stsci.edu> | 2018-06-22 09:10:14 -0400 |
---|---|---|
committer | Todd Miller <jmiller@stsci.edu> | 2018-06-22 09:10:14 -0400 |
commit | ff7bb35c63ef298df2207dbfdc49e441cec0e2ae (patch) | |
tree | 7cb17a5919c32a5aae5f627a77a0db239d6d19af /drizzlepac | |
parent | e3ccb95b25b6a978e8e2da7783cc53ec6b2d698a (diff) | |
parent | f6dbc50fd6569c11c4b0286f4d30a08a56b8463e (diff) | |
download | astroconda-contrib-ff7bb35c63ef298df2207dbfdc49e441cec0e2ae.tar.gz |
Merge branch 'master' of https://github.com/astroconda/astroconda-contrib into update-crds-version to resolve version conflicts.
Diffstat (limited to 'drizzlepac')
-rw-r--r-- | drizzlepac/bld.bat | 3 | ||||
-rw-r--r-- | drizzlepac/build.sh | 2 | ||||
-rw-r--r-- | drizzlepac/meta.yaml | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/drizzlepac/bld.bat b/drizzlepac/bld.bat index d6d7ec3..0702784 100644 --- a/drizzlepac/bld.bat +++ b/drizzlepac/bld.bat @@ -1,3 +1,6 @@ +pip install --no-deps --upgrade sphinx-automodapi +if errorlevel 1 exit 1 + %PYTHON% setup.py build build_ext --inplace -- build_sphinx if errorlevel 1 exit 1 diff --git a/drizzlepac/build.sh b/drizzlepac/build.sh index ccf863b..c975904 100644 --- a/drizzlepac/build.sh +++ b/drizzlepac/build.sh @@ -1,2 +1,4 @@ +pip install --no-deps --upgrade sphinx-automodapi + $PYTHON setup.py build build_ext --inplace -- build_sphinx $PYTHON setup.py install diff --git a/drizzlepac/meta.yaml b/drizzlepac/meta.yaml index acc2012..81a890b 100644 --- a/drizzlepac/meta.yaml +++ b/drizzlepac/meta.yaml @@ -1,5 +1,5 @@ {% set name = 'drizzlepac' %} -{% set version = '2.2.2' %} +{% set version = '2.2.3' %} {% set number = '0' %} about: |