Skip to content

Commit

Permalink
Merge pull request #111 from spacetelescope/0.8.x
Browse files Browse the repository at this point in the history
0.8.x
  • Loading branch information
nden authored Nov 2, 2017
2 parents 2d204c6 + f310043 commit 5a56e1c
Show file tree
Hide file tree
Showing 20 changed files with 828 additions and 387 deletions.
28 changes: 14 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,21 @@ addons:
- dvipng

python:
- 2.7
- 3.5
- 3.6

env:
global:
# The following versions are the 'default' for tests, unless
# overidden underneath. They are defined here in order to save having
# to repeat them for all configurations.
- NUMPY_VERSION=1.9
- NUMPY_VERSION=1.11
- ASTROPY_VERSION=development
- MAIN_CMD='python setup.py'
- CONDA_DEPENDENCIES=''
- PIP_DEPENDENCIES='git+https://github.com/spacetelescope/pyasdf.git#egg=pyasdf'
- CONDA_DEPENDENCIES='scipy'
- PIP_DEPENDENCIES='git+https://github.com/spacetelescope/asdf.git#egg=asdf'
- ASTROPY_USE_SYSTEM_PYTEST=1

matrix:
- SETUP_CMD='egg_info'
- SETUP_CMD='test'
Expand All @@ -37,22 +39,20 @@ matrix:

include:

# Do a coverage test in Python 2.
- python: 2.7
# Do a coverage test.
- python: 3.5
env: SETUP_CMD='test --coverage'

# Check for sphinx doc build warnings - we do this first because it
# may run for a long time
- python: 2.7
- python: 3.6
env: SETUP_CMD='build_sphinx -w'

# Numpy
- python: 2.7
env: NUMPY_VERSION=1.8 SETUP_CMD="test"
- python: 2.7
env: NUMPY_VERSION=1.10 SETUP_CMD="test"
- python: 3.5
env: NUMPY_VERSION=1.10 SETUP_CMD="test"
- python: 3.6
env: NUMPY_VERSION=1.12 SETUP_CMD="test"
- python: 3.6
env: NUMPY_VERSION=1.13 SETUP_CMD="test"

# Do a PEP8 test with pycodestyle
- python: 3.5
Expand All @@ -66,7 +66,7 @@ matrix:

install:
- git clone git://github.com/astropy/ci-helpers.git
- source ci-helpers/travis/setup_conda_$TRAVIS_OS_NAME.sh
- source ci-helpers/travis/setup_conda.sh

script:
- $MAIN_CMD $SETUP_CMD
Expand Down
22 changes: 22 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
0.8.0 (2017-11-02)
----------------

- ``LabelMapperRange`` now returns ``LabelMapperRange._no_label`` when the key is
not within any range. [#71]

- ``LabelMapperDict`` now returns ``LabelMapperDict._no_label`` when the key does
not match. [#72]

- Replace ``domain`` with ``bounding_box``. [#74]

- Added a ``LabelMapper`` model where ``mapper`` is an instance of
`~astropy.modeling.core.Model`. [#78]

- Evaluating a WCS with bounding box was moved to ``astropy.modeling``. [#86]

- RegionsSelector now handles the case when a label does not have a corresponding
transform and returns RegionsSelector.undefined_transform_value. [#86]

- GWCS now deals with axes types which are neither celestial nor spectral as "unknown"
and creates a transform equivalent to the FITS linear transform. [#92]

0.7 (2016-12-23)
----------------

Expand Down
57 changes: 14 additions & 43 deletions ah_bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,24 @@
use_setuptools()


# typing as a dependency for 1.6.1+ Sphinx causes issues when imported after
# initializing submodule with ah_boostrap.py
# See discussion and references in
# https://github.com/astropy/astropy-helpers/issues/302

try:
import typing # noqa
except ImportError:
pass


# Note: The following import is required as a workaround to
# https://github.com/astropy/astropy-helpers/issues/89; if we don't import this
# module now, it will get cleaned up after `run_setup` is called, but that will
# later cause the TemporaryDirectory class defined in it to stop working when
# used later on by setuptools
try:
import setuptools.py31compat
import setuptools.py31compat # noqa
except ImportError:
pass

Expand Down Expand Up @@ -702,7 +713,7 @@ def _update_submodule(self, submodule, status):
if self.offline:
cmd.append('--no-fetch')
elif status == 'U':
raise _AHBoostrapSystemExit(
raise _AHBootstrapSystemExit(
'Error: Submodule {0} contains unresolved merge conflicts. '
'Please complete or abandon any changes in the submodule so that '
'it is in a usable state, then try again.'.format(submodule))
Expand Down Expand Up @@ -763,7 +774,7 @@ def run_cmd(cmd):
msg = 'Command not found: `{0}`'.format(' '.join(cmd))
raise _CommandNotFound(msg, cmd)
else:
raise _AHBoostrapSystemExit(
raise _AHBootstrapSystemExit(
'An unexpected error occurred when running the '
'`{0}` command:\n{1}'.format(' '.join(cmd), str(e)))

Expand Down Expand Up @@ -878,46 +889,6 @@ def __init__(self, *args):
super(_AHBootstrapSystemExit, self).__init__(msg, *args[1:])


if sys.version_info[:2] < (2, 7):
# In Python 2.6 the distutils log does not log warnings, errors, etc. to
# stderr so we have to wrap it to ensure consistency at least in this
# module
import distutils

class log(object):
def __getattr__(self, attr):
return getattr(distutils.log, attr)

def warn(self, msg, *args):
self._log_to_stderr(distutils.log.WARN, msg, *args)

def error(self, msg):
self._log_to_stderr(distutils.log.ERROR, msg, *args)

def fatal(self, msg):
self._log_to_stderr(distutils.log.FATAL, msg, *args)

def log(self, level, msg, *args):
if level in (distutils.log.WARN, distutils.log.ERROR,
distutils.log.FATAL):
self._log_to_stderr(level, msg, *args)
else:
distutils.log.log(level, msg, *args)

def _log_to_stderr(self, level, msg, *args):
# This is the only truly 'public' way to get the current threshold
# of the log
current_threshold = distutils.log.set_threshold(distutils.log.WARN)
distutils.log.set_threshold(current_threshold)
if level >= current_threshold:
if args:
msg = msg % args
sys.stderr.write('%s\n' % msg)
sys.stderr.flush()

log = log()


BOOTSTRAPPER = _Bootstrapper.main()


Expand Down
2 changes: 1 addition & 1 deletion astropy_helpers
Submodule astropy_helpers updated 62 files
+22 −27 .travis.yml
+79 −8 CHANGES.rst
+15 −0 README.rst
+14 −43 ah_bootstrap.py
+1 −4 appveyor.yml
+3 −3 astropy_helpers/commands/_test_compat.py
+6 −3 astropy_helpers/commands/build_ext.py
+17 −1 astropy_helpers/commands/build_sphinx.py
+1 −1 astropy_helpers/commands/test.py
+0 −38 astropy_helpers/compat/_subprocess_py2/__init__.py
+0 −18 astropy_helpers/compat/subprocess.py
+1 −1 astropy_helpers/distutils_helpers.py
+11 −0 astropy_helpers/extern/__init__.py
+1 −0 astropy_helpers/extern/automodapi/__init__.py
+28 −18 astropy_helpers/extern/automodapi/autodoc_enhancements.py
+58 −25 astropy_helpers/extern/automodapi/automodapi.py
+71 −53 astropy_helpers/extern/automodapi/automodsumm.py
+0 −1 astropy_helpers/extern/automodapi/smart_resolver.py
+0 −0 astropy_helpers/extern/automodapi/templates/autosummary_core/base.rst
+0 −0 astropy_helpers/extern/automodapi/templates/autosummary_core/class.rst
+0 −0 astropy_helpers/extern/automodapi/templates/autosummary_core/module.rst
+36 −0 astropy_helpers/extern/automodapi/utils.py
+5 −0 astropy_helpers/extern/numpydoc/__init__.py
+38 −20 astropy_helpers/extern/numpydoc/docscrape.py
+49 −24 astropy_helpers/extern/numpydoc/docscrape_sphinx.py
+96 −31 astropy_helpers/extern/numpydoc/numpydoc.py
+16 −0 astropy_helpers/extern/numpydoc/templates/numpydoc_docstring.rst
+4 −0 astropy_helpers/extern/setup_package.py
+9 −4 astropy_helpers/git_helpers.py
+107 −0 astropy_helpers/openmp_helpers.py
+47 −13 astropy_helpers/setup_helpers.py
+3 −1 astropy_helpers/sphinx/__init__.py
+17 −23 astropy_helpers/sphinx/conf.py
+0 −1 astropy_helpers/sphinx/ext/__init__.py
+0 −123 astropy_helpers/sphinx/ext/astropyautosummary.py
+4 −0 astropy_helpers/sphinx/ext/changelog_links.py
+0 −169 astropy_helpers/sphinx/ext/comment_eater.py
+0 −865 astropy_helpers/sphinx/ext/compiler_unparse.py
+19 −1 astropy_helpers/sphinx/ext/doctest.py
+5 −2 astropy_helpers/sphinx/ext/edit_on_github.py
+0 −167 astropy_helpers/sphinx/ext/phantom_import.py
+0 −70 astropy_helpers/sphinx/ext/tests/__init__.py
+0 −56 astropy_helpers/sphinx/ext/tests/test_autodoc_enhancements.py
+0 −366 astropy_helpers/sphinx/ext/tests/test_automodapi.py
+0 −114 astropy_helpers/sphinx/ext/tests/test_automodsumm.py
+0 −791 astropy_helpers/sphinx/ext/tests/test_docscrape.py
+0 −34 astropy_helpers/sphinx/ext/tests/test_utils.py
+4 −0 astropy_helpers/sphinx/ext/tocdepthfix.py
+0 −143 astropy_helpers/sphinx/ext/traitsdoc.py
+0 −1 astropy_helpers/sphinx/setup_package.py
+14 −8 astropy_helpers/sphinx/themes/bootstrap-astropy/static/copybutton.js
+1 −1 astropy_helpers/test_helpers.py
+3 −0 astropy_helpers/tests/coveragerc
+13 −9 astropy_helpers/tests/test_ah_bootstrap.py
+25 −8 astropy_helpers/tests/test_git_helpers.py
+38 −0 astropy_helpers/tests/test_openmp_helpers.py
+113 −14 astropy_helpers/tests/test_setup_helpers.py
+4 −20 astropy_helpers/utils.py
+5 −3 astropy_helpers/version_helpers.py
+7 −29 ez_setup.py
+28 −0 licenses/LICENSE_ASTROSCRAPPY.rst
+1 −4 setup.py
Loading

0 comments on commit 5a56e1c

Please sign in to comment.