Adding `bounding_box` defaults and wcs support to `render_model`. #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

patti wants to merge 82 commits into boundingboxes from bbox2

.continuous-integration/travis/setup_dependencies_common.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -41,12 +41,13 @@ then
  
    fi

    # DOCUMENTATION DEPENDENCIES

    # build_sphinx needs sphinx and matplotlib (for plot_directive). Note that

    # this matplotlib will *not* work with py 3.x, but our sphinx build is

    # build_sphinx needs sphinx as well as matplotlib and wcsaxes (for plot_directive). 

    # Note that this matplotlib will *not* work with py 3.x, but our sphinx build is

    # currently 2.7, so that's fine

    if [[ $SETUP_CMD == build_sphinx* ]]

    then

      $CONDA_INSTALL Sphinx=1.2.2 Pygments matplotlib

      pip install wcsaxes

    fi

    # COVERAGE DEPENDENCIES

CHANGES.rst

-Original file line number
+Diff line change
@@ Expand Up / @@ -60,6 +60,8 @@ New Features @@
       - Add a function ``get_read_trace()`` that returns a traceback of the
         attempted read formats for the last call to ``astropy.io.ascii.read``. [#3688]
+      - Supports LZMA decompression via ``get_readable_fileobj`` [#3667]
     - ``astropy.io.fits``
       - Support reading and writing from bzip2 compressed files. i.e. ``.fits.bz2``
@@ Expand Down Expand Up / @@ -118,6 +120,9 @@ New Features @@
       - Added ``cenfunc``, ``stdfunc``, and ``axis`` keywords to
         ``sigma_clipped_stats``. [#3792]
+      - ``sigma_clip`` automatically masks invalid input values (NaNs, Infs) before
+        performing the clipping [#4051]
       - Added the ``histogram`` routine, which is similar to ``np.histogram`` but
         includes several additional options for automatic determination of optimal
         histogram bins. Associated helper routines include ``bayesian_blocks``,
@@ Expand Down Expand Up / @@ -191,11 +196,21 @@ New Features @@
     - ``astropy.utils``
+      - Added new ``OrderedDescriptor`` and ``OrderedDescriptorContainer`` utility
+        classes that make it easier to implement classes with declarative APIs,
+        wherein class-level attributes have an inherit "ordering" to them that is
+        specified by the order in which those attributes are defined in the class
+        declaration (by defining them using special descriptors that have
+        ``OrderedDescriptor`` as a base class).  See the API documentation for
+        these classes for more details. Coordinate frames and models now use this
+        interface. [#3679]
       - Added function ``dtype_info_name`` to the ``data_info`` module to provide
         the name of a ``dtype`` for human-readable informational purposes. [#3868]
       - Added ``classproperty`` decorator--this is to ``property`` as
         ``classmethod`` is to normal instance methods. [#3982]
+      - ``iers.open`` now handles network URLs, as well as local paths. [#3850]
       - The ``astropy.utils.wraps`` decorator now takes an optional
         ``exclude_args`` argument not shared by the standard library ``wraps``
@@ Expand All / @@ -205,6 +220,14 @@ New Features @@
         of the wrapper function.  This is particularly useful when wrapping an
         instance method as a function (to exclude the ``self`` argument). [#4017]
+      - ``get_readable_fileobj`` can automatically decompress LZMA ('.xz')
+        files using the ``lzma`` module of Python 3.3+ or, when available, the
+        ``backports.lzma`` package on earlier versions. [#3667]
+      - The ``resolve_name`` utility now accepts any number of additional
+        positional arguments that are automatically dotted together with the
+        first ``name`` argument. [#4083]
     - ``astropy.visualization``
       - Added the ``hist`` function, which is similar to ``plt.hist`` but
@@ Expand Down Expand Up / @@ -440,13 +463,6 @@ Bug fixes @@
     - ``astropy.units``
-      - Added frequency-equivalency check when declaring doppler equivalencies
-        [#3728]
-      - Define ``floor_divide`` (``//``) for ``Quantity`` to be consistent
-        ``divmod``, such that it only works where the quotient is dimensionless.
-        This guarantees that ``(q1 // q2) * q2 + (q1 % q2) == q1``. [#3817]
     - ``astropy.utils``
     - ``astropy.visualization``
@@ Expand All / @@ -463,6 +479,8 @@ Other Changes and Additions @@
     - The version of ``PLY`` that ships with astropy has been updated to 3.6.
+    - WCSAxes is now required for doc builds. [#4074]
 .0.5 (unreleased)
     ------------------
@@ Expand Down Expand Up / @@ -547,6 +565,9 @@ API Changes @@
     - ``astropy.utils``
+      - ``console`` was updated to support IPython 4.x and Jupyter 1.x.
+        [#4078]
     - ``astropy.vo``
     - ``astropy.wcs``
@@ Expand All / @@ -568,6 +589,9 @@ Bug Fixes @@
     - ``astropy.io.fits``
+      - Fix bug when extending one header (without comments) with another
+        (with comments). [#3967]
     - ``astropy.io.misc``
     - ``astropy.io.registry``
@@ Expand All / @@ -576,6 +600,8 @@ Bug Fixes @@
     - ``astropy.modeling``
+      - Cleaned up ``repr`` of models that have no parameters. [#4076]
     - ``astropy.nddata``
     - ``astropy.stats``
@@ Expand All / @@ -590,6 +616,10 @@ Bug Fixes @@
     - ``astropy.utils``
+      - ``resolve_name`` no longer causes ``sys.modules`` to be cluttered with
+        additional copies of modules under a package imported like
+        ``resolve_name('numpy')``. [#4084]
     - ``astropy.vo``
     - ``astropy.wcs``
@@ Expand All / @@ -600,7 +630,7 @@ Other Changes and Additions @@
     - Nothing changed yet.
-.0.4 (unreleased)
+.0.4 (2015-08-11)
     ------------------
     New Features
@@ Expand Down Expand Up / @@ -699,6 +729,13 @@ Bug Fixes @@
     - ``astropy.units``
+      - Added frequency-equivalency check when declaring doppler equivalencies
+        [#3728]
+      - Define ``floor_divide`` (``//``) for ``Quantity`` to be consistent
+        ``divmod``, such that it only works where the quotient is dimensionless.
+        This guarantees that ``(q1 // q2) * q2 + (q1 % q2) == q1``. [#3817]
       - Fixed the documentation of supported units to correctly report support for
         SI prefixes.  Previously the table of supported units incorrectly showed
         several derived unit as not supporting prefixes, when in fact they do.
@@ Expand Down @@

astropy/_erfa/core.c.templ

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -38,7 +38,10 @@ typedef struct {
  
    static PyObject *Py_{{ func.pyname }}(PyObject *self, PyObject *args, PyObject *kwds)

    {

        {%- for arg in func.args_by_inout('in|inout|out|ret|stat') %}

        {%- for arg in func.args_by_inout('in|inout|out') %}

        {{ arg.ctype }} (*_{{ arg.name }}){{ arg.cshape }};

        {%- endfor %}

        {%- for arg in func.args_by_inout('ret|stat') %}

        {{ arg.ctype_ptr }} _{{ arg.name }};

        {%- endfor %}

        {%- if func.args_by_inout('stat')|length > 0 %}

    @@ -52,10 +55,10 @@ static PyObject *Py_{{ func.pyname }}(PyObject *self, PyObject *args, PyObject *
  
        do {

            {%- for arg in func.args_by_inout('in|inout|out') %}

            _{{ arg.name }} = (({{ arg.ctype }} *)(dataptrarray[{{ func.args.index(arg) }}])){%- if arg.ctype_ptr[-1] != '*' %}[0]{%- endif %};

            _{{ arg.name }} = (({{ arg.ctype }} (*){{ arg.cshape }})(dataptrarray[{{ func.args.index(arg) }}]));

            {%- endfor %}

            {{ func.args_by_inout('ret|stat')|map(attribute='name')|surround('_', ' = ')|join }}{{func.name}}({{ func.args_by_inout('in|inout|out')|map(attribute='name')|prefix('_')|join(', ') }});

            {{ func.args_by_inout('ret|stat')|map(attribute='name')|surround('_', ' = ')|join }}{{func.name}}({{ func.args_by_inout('in|inout|out')|map(attribute='name_for_call')|join(', ') }});

            {%- for arg in func.args_by_inout('ret|stat') %}

            *(({{ arg.ctype_ptr }} *)(dataptrarray[{{ func.args.index(arg) }}])) = _{{ arg.name }};

astropy/_erfa/erfa_generator.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ @@
     import re
     import os.path
+    from astropy.utils.compat.odict import OrderedDict
     ctype_to_dtype = {'double'     : "numpy.double",
@@ Expand Down Expand Up / @@ -181,6 +182,17 @@ def dtype(self): @@
         def ndim(self):
             return len(self.shape)
+        @property
+        def cshape(self):
+            return ''.join(['[{0}]'.format(s) for s in self.shape])
+        @property
+        def name_for_call(self):
+            if self.is_ptr:
+                return '_'+self.name
+            else:
+                return '*_'+self.name
         def __repr__(self):
             return "Argument('{0}', name='{1}', ctype='{2}', inout_state='{3}')".format(self.definition, self.name, self.ctype, self.inout_state)
@@ Expand Down Expand Up / @@ -378,7 +390,7 @@ def surround(a_list, pre, post): @@
         with open(erfahfn, "r") as f:
             erfa_h = f.read()
-        funcs = {}
+        funcs = OrderedDict()
         section_subsection_functions = re.findall('/\* (\w*)/(\w*) \*/\n(.*?)\n\n',
                                                   erfa_h, flags=re.DOTALL|re.MULTILINE)
         for section, subsection, functions in section_subsection_functions:
@@ Expand Down @@

astropy/config/configuration.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ @@
     from ..extern.configobj import configobj, validate
     from ..utils.exceptions import AstropyWarning, AstropyDeprecationWarning
     from ..utils import find_current_module
+    from ..utils.introspection import resolve_name
     from ..utils.misc import InheritDocstrings
     from .paths import get_config_dir
@@ Expand Down Expand Up / @@ -219,6 +220,11 @@ class _Conf(config.ConfigNamespace): @@
         # this is used to make validation faster so a Validator object doesn't
         # have to be created every time
         _validator = validate.Validator()
+        cfgtype = None
+        """
+        A type specifier like those used as the *values* of a particular key in a
+        ``configspec`` file of ``configobj``.
+        """
         def __init__(self, defaultvalue='', description=None, cfgtype=None,
                      module=None, aliases=None):
@@ Expand Down Expand Up / @@ -308,12 +314,14 @@ def set_temp(self, value): @@
             Sets this item to a specified value only inside a with block.
             Use as::
                 ITEM = ConfigItem('ITEM', 'default', 'description')
                 with ITEM.set_temp('newval'):
-                    ... do something that wants ITEM's value to be 'newval' ...
+                    #... do something that wants ITEM's value to be 'newval' ...
+                    print(ITEM)
-                 # ITEM is now 'default' after the with block
+                # ITEM is now 'default' after the with block
             Parameters
             ----------
@@ Expand Down Expand Up / @@ -565,11 +573,7 @@ def _deprecation_warning(self): @@
                 AstropyDeprecationWarning)
         def _get_target(self):
-            if self._new_module not in sys.modules:
-                __import__(self._new_module)
-            mod = sys.modules[self._new_module]
-            cfg = getattr(mod, 'conf')
-            return cfg
+            return resolve_name(self._new_module, 'conf')
         def set(self, value):
             self._deprecation_warning()
@@ Expand Down Expand Up @@
                 identical = False
         if version is None:
-            mod = __import__(pkg)
-            version = mod.__version__
+            version = resolve_name(pkg, '__version__')
         # Don't install template files for dev versions, or we'll end up
         # spamming `~/.astropy/config`.
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding `bounding_box` defaults and wcs support to `render_model`. #3

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Adding bounding_box defaults and wcs support to render_model. #3

Are you sure you want to change the base?

Uh oh!

Adding bounding_box defaults and wcs support to render_model. #3

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Adding `bounding_box` defaults and wcs support to `render_model`. #3

Adding `bounding_box` defaults and wcs support to `render_model`. #3