APLpy - npm Package Compare versions

Comparing version 2.0 to 2.0.1

aplpy/_astropy_init.py

@@ -37,8 +37,4 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst
     """
-    Run the tests using `py.test <http://pytest.org/latest>`__. A proper set
-    of arguments is constructed and passed to `pytest.main`_.
+    Run the tests using `py.test <https://docs.pytest.org/en/latest/>`__.
 
-    .. _py.test: http://pytest.org/latest/
-    .. _pytest.main: http://pytest.org/latest/builtin.html#pytest.main
-
     Parameters
@@ -56,15 +52,15 @@ ----------
     args : str, optional
-        Additional arguments to be passed to pytest.main_ in the ``args``
+        Additional arguments to be passed to pytest.main in the ``args``
         keyword argument.
 
     plugins : list, optional
-        Plugins to be passed to pytest.main_ in the ``plugins`` keyword
+        Plugins to be passed to pytest.main in the ``plugins`` keyword
         argument.
 
     verbose : bool, optional
-        Convenience option to turn on verbose output from py.test_. Passing
+        Convenience option to turn on verbose output from py.test. Passing
         True is the same as specifying ``'-v'`` in ``args``.
 
     pastebin : {'failed','all',None}, optional
-        Convenience option for turning on py.test_ pastebin output. Set to
+        Convenience option for turning on py.test pastebin output. Set to
         ``'failed'`` to upload info for failed tests, or ``'all'`` to upload
@@ -80,3 +76,3 @@ info for all tests.
         Turn on PEP8 checking via the `pytest-pep8 plugin
-        <http://pypi.python.org/pypi/pytest-pep8>`_ and disable normal
+        <https://pypi.org/project/pytest-pep8/>`_ and disable normal
         tests. Same as specifying ``'--pep8 -k pep8'`` in ``args``.
@@ -95,3 +91,3 @@
         this adds extra run time to the test suite.  Requires the
-        `psutil <https://pypi.python.org/pypi/psutil>`_ package.
+        `psutil <https://pypi.org/project/psutil/>`_ package.
 
@@ -102,3 +98,3 @@ parallel : int, optional
         the cores on the machine.  Requires the
-        `pytest-xdist <https://pypi.python.org/pypi/pytest-xdist>`_ plugin
+        `pytest-xdist <https://pypi.org/project/pytest-xdist/>`_ plugin
         installed. Only available when using Astropy 0.3 or later.
@@ -105,0 +101,0 @@

aplpy/rgb.py

@@ -230,3 +230,3 @@ from __future__ import absolute_import, print_function, division
 
-def make_rgb_cube(files, output, north=False, system=None, equinox=None):
+def make_rgb_cube(files, output, north=True):
     """
@@ -237,3 +237,3 @@ Make an RGB data cube from a list of three FITS images.
     projections/sizes/resolutions and uses the `reproject
-    <http://reproject.readthedocs.io/en/stable/>`_ package to reproject them all
+    <https://reproject.readthedocs.io/en/stable/>`_ package to reproject them all
     to the same projection.
@@ -265,10 +265,2 @@
         to use the north of that frame.
-
-    system : str, optional
-       Specifies the system for the header (default is EQUJ).
-       Possible values are: EQUJ EQUB ECLJ ECLB GAL SGAL
-
-    equinox : str, optional
-       If a coordinate system is specified, the equinox can also be given
-       in the form YYYY. Default is J2000.
     """
@@ -281,9 +273,11 @@
 
-    if north:
+    if north is not False:
         frame = ICRS() if north is True else north
+        auto_rotate = False
     else:
         frame = None
+        auto_rotate = True
 
     # Find optimal WCS and shape based on input images
-    wcs, shape = find_optimal_celestial_wcs(files, frame=frame)
+    wcs, shape = find_optimal_celestial_wcs(files, frame=frame, auto_rotate=auto_rotate)
     header = wcs.to_header()
@@ -290,0 +284,0 @@

aplpy/tests/test_downsample.py

@@ -6,13 +6,5 @@ from __future__ import absolute_import, print_function, division
 
-try:
-    import skimage  # noqa
-except ImportError:
-    SKIMAGE_INSTALLED = False
-else:
-    SKIMAGE_INSTALLED = True
-
 from .. import FITSFigure
 
 
[e-mail]("not SKIMAGE_INSTALLED")
 def test_numpy_downsample():
@@ -19,0 +11,0 @@ data = np.arange(256).reshape((16, 16))

aplpy/tests/test_images.py

@@ -9,16 +9,2 @@ from __future__ import absolute_import, print_function, division
 
-try:
-    import pyregion  # noqa
-except ImportError:
-    PYREGION_INSTALLED = False
-else:
-    PYREGION_INSTALLED = True
-
-try:
-    import reproject  # noqa
-except ImportError:
-    REPROJECT_INSTALLED = False
-else:
-    REPROJECT_INSTALLED = True
-
 from .. import FITSFigure
@@ -212,3 +198,2 @@ from .helpers import generate_file
     @pytest.mark.remote_data
-    @pytest.mark.skipif("not PYREGION_INSTALLED")
     @pytest.mark.mpl_image_compare(style={}, savefig_kwargs={'adjust_bbox': False}, baseline_dir=baseline_dir, tolerance=5)
@@ -229,3 +214,2 @@ def test_regions(self):
     @pytest.mark.remote_data
-    @pytest.mark.skipif("not REPROJECT_INSTALLED")
     @pytest.mark.mpl_image_compare(style={}, savefig_kwargs={'adjust_bbox': False}, baseline_dir=baseline_dir, tolerance=5)
@@ -232,0 +216,0 @@ def test_north(self):

aplpy/tests/test_rgb.py

@@ -9,10 +9,4 @@ from __future__ import absolute_import, print_function, division
 from astropy.io import fits
+from astropy.coordinates import Galactic
 
-try:
-    import pyavm  # noqa
-except ImportError:
-    PYAVM_INSTALLED = False
-else:
-    PYAVM_INSTALLED = True
-
 from .. import FITSFigure
@@ -38,5 +32,2 @@ from ..rgb import make_rgb_image, make_rgb_cube
 
-        if embed_avm_tags:
-            pytest.importorskip('pyavm')
-
         # Regression test to check that RGB recenter works properly
@@ -81,10 +72,9 @@
     @pytest.mark.remote_data
+    @pytest.mark.parametrize('north', ['default', 'galactic', 'false'])
     @pytest.mark.mpl_image_compare(style={}, savefig_kwargs={'adjust_bbox': False},
                                    baseline_dir=baseline_dir, tolerance=7.5)
-    def test_make_rgb_cube(self, tmpdir):
+    def test_make_rgb_cube(self, tmpdir, north):
 
         # Regression test to check that RGB recenter works properly
 
-        pytest.importorskip('pyavm')
-
         header = generate_header(os.path.join(ROOT, 'data', '2d_fits', '2MASS_k_rot.hdr'))
@@ -110,13 +100,20 @@
 
-        r = fits.PrimaryHDU(np.ones((12, 12)), header_r)
+        r = fits.PrimaryHDU(np.ones((128, 128)), header_r)
         r.writeto(r_file)
 
-        g = fits.PrimaryHDU(np.ones((12, 12)), header_g)
+        g = fits.PrimaryHDU(np.ones((128, 128)), header_g)
         g.writeto(g_file)
 
-        b = fits.PrimaryHDU(np.ones((12, 12)), header_b)
+        b = fits.PrimaryHDU(np.ones((128, 128)), header_b)
         b.writeto(b_file)
 
-        make_rgb_cube([r_file, g_file, b_file], rgb_cube)
+        if north == 'default':
+            kwargs = {}
+        elif north == 'galactic':
+            kwargs = {'north': Galactic()}
+        elif north == 'false':
+            kwargs = {'north': False}
 
+        make_rgb_cube([r_file, g_file, b_file], rgb_cube, **kwargs)
+
         make_rgb_image(rgb_cube, rgb_file, embed_avm_tags=True,
@@ -133,3 +130,4 @@ vmin_r=0, vmax_r=1, vmin_g=0, vmax_g=1, vmin_b=0, vmax_b=1)
         f.axis_labels.hide()
+        f.add_grid()
 
         return f._figure

aplpy/ticks.py

@@ -17,2 +17,6 @@ from __future__ import absolute_import, print_function, division
     def set_tick_direction(self, direction):
+        """
+        Set the direction of the ticks to be facing out of the axes (``out``)
+        or into the axes (``in``).
+        """
         if direction in ('in', 'out'):
@@ -19,0 +23,0 @@ self.ax.coords[self.x].ticks.set_tick_out(direction == 'out')

aplpy/version.py

@@ -1,2 +0,2 @@
-# Autogenerated by Astropy-affiliated package aplpy's setup.py on 2019-02-17 11:50:54 UTC
+# Autogenerated by Astropy-affiliated package aplpy's setup.py on 2019-02-18 13:11:44 UTC
 from __future__ import unicode_literals
@@ -190,4 +190,4 @@ import datetime
 _packagename = "aplpy"
-_last_generated_version = "2.0"
-_last_githash = "a3f9352a73debc7a0f9be1205c4c028873529f96"
+_last_generated_version = "2.0.1"
+_last_githash = "c8d33a56b6516f786fd621c3fdb88c847fc6206c"
 
@@ -210,3 +210,3 @@ # Determine where the source code for this module
 minor = 0
-bugfix = 0
+bugfix = 1
 
@@ -216,3 +216,3 @@ version_info = (major, minor, bugfix)
 release = True
-timestamp = datetime.datetime(2019, 2, 17, 11, 50, 54)
+timestamp = datetime.datetime(2019, 2, 18, 13, 11, 44)
 debug = False
@@ -219,0 +219,0 @@

CHANGES.rst

 CHANGES
 --------
 
-2.0 (2018-12-30)
+2.0.1 (2019-02-18)
+------------------
+
+- Remove unused arguments in ``make_rgb_cube`` and fix behavior of
+  ``north=False``. [#417]
+
+- Fixed bug in image extent for non-square RGB images. [#417]
+
+2.0 (2019-02-17)
 ----------------
@@ -6,0 +14,0 @@

docs/fitsfigure/arbitrary_coordinate_systems.rst

@@ -21,3 +21,3 @@ .. _arbitrary:
     f.set_xaxis_coord_type('latitude')
-    
+
 Valid coordinate types are ``longitude``, ``latitude``, and ``scalar``.
@@ -50,3 +50,3 @@ Longitudes are forced to be in the 0 to 360 degree range, latitudes are forced
 information, see `String Formatting Operations
-<http://docs.python.org/library/stdtypes.html#string-formatting>`_.
+<https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting>`_.
 
@@ -65,2 +65,2 @@ In both cases, the default label format can be overridden::
 :meth:`~aplpy.FITSFigure.show_colorscale`, simply add ``aspect='auto'``
-which will override the ``aspect='equal'`` default.
+which will override the ``aspect='equal'`` default.

docs/fitsfigure/quickstart.rst

@@ -8,3 +8,3 @@ Beginner Tutorial
 The following tutorial will take you, step by step, through the main features
-of APLpy. You will need to download the following `file <http://aplpy.github.com/downloads/tutorial.tar.gz>`_.
+of APLpy. You will need to download the following `file <http://aplpy.github.io/downloads/tutorial.tar.gz>`_.
 
@@ -11,0 +11,0 @@ First, unpack the example files and go to the ``tutorial`` directory::

docs/index.rst

@@ -13,3 +13,3 @@ *******************
 to draw the coordinate axes and grids, which in turn uses `Matplotlib
-<http://matplotlib.org>`_ to do the rendering. This is a big change compared to
+<https://matplotlib.org>`_ to do the rendering. This is a big change compared to
 previous versions of APLpy, which handled the drawing of the coordinate axes and
@@ -21,2 +21,5 @@ grids directly. For information about backward-compatibility, see the
 
+If you use APLpy for a publication, please consider citing it as described in
+the `CITATION <https://github.com/aplpy/aplpy/blob/master/CITATION>`__ file.
+
 Should you use APLpy?
@@ -42,5 +45,5 @@ =====================
 
-To include all optional dependencies, you can do::
+If you prefer to use conda, you can install APLpy with::
 
-    pip install aplpy[all]
+    conda install -c astropy aplpy
 
@@ -47,0 +50,0 @@ Using APLpy

docs/index.txt

 APLpy documentation
 ===================
 
-This is the documentation for APLpy. The APLpy homepage is located at http://aplpy.github.com
+This is the documentation for APLpy. The APLpy homepage is located at http://aplpy.github.io
  
@@ -6,0 +6,0 @@ .. toctree::

docs/rgb.rst

@@ -19,3 +19,3 @@ Making RGB images
 This method makes use of the `reproject
-<http://reproject.readthedocs.io/en/stable/>`_ package to reproject the images
+<https://reproject.readthedocs.io/en/stable/>`_ package to reproject the images
 to a common projection. The above example produces a FITS cube named
@@ -22,0 +22,0 @@ ``2mass_cube.fits`` which contains the three channels in the same projection.

PKG-INFO

 Metadata-Version: 2.1
 Name: APLpy
-Version: 2.0
+Version: 2.0.1
 Summary: The Astronomical Plotting Library in Python
@@ -34,24 +34,17 @@ Home-page: http://aplpy.github.io
         -  `Astropy <http://www.astropy.org>`__ 3.1 or later
-        -  `reproject <http://reproject.readthedocs.org>`__ 0.4 or later
-        
-        and the following are optional:
-        
+        -  `reproject <https://reproject.readthedocs.org>`__ 0.4 or later
         -  `PyAVM <http://astrofrog.github.io/pyavm/>`__ 0.9.4 or later
         -  `pyregion <http://pyregion.readthedocs.org/>`__ 2.0 or later
         -  `pillow <https://pypi.org/project/Pillow/>`__ 4.0 or later
-        -  `scikit-image <https://pypi.org/project/scikit-image/>`__ 0.14 or
-           later
+        -  `scikit-image <https://pypi.org/project/scikit-image/>`__ 0.14 or later
+        -  `shapely <https://shapely.readthedocs.io/en/stable/project.html>`__ 1.6 or later
         
-        You can install APLpy with:
+        You can install APLpy and all its dependencies with::
         
-        ::
+            pip install aplpy
         
-           pip install aplpy
+        or if you use conda::
         
-        If you want to install all optional dependencies, you can do:
+            conda install -c astropy aplpy
         
-        ::
-        
-           pip install aplpy[all]
-        
         .. |Build Status| image:: https://travis-ci.org/aplpy/aplpy.svg?branch=master
@@ -68,4 +61,3 @@ :target: https://travis-ci.org/aplpy/aplpy
 Requires-Python: >=3.5
-Provides-Extra: all
+Provides-Extra: test
 Provides-Extra: docs
-Provides-Extra: test

README.rst

@@ -26,24 +26,17 @@ |Build Status| |CircleCI| |codecov| |Documentation Status|
 -  `Astropy <http://www.astropy.org>`__ 3.1 or later
--  `reproject <http://reproject.readthedocs.org>`__ 0.4 or later
-
-and the following are optional:
-
+-  `reproject <https://reproject.readthedocs.org>`__ 0.4 or later
 -  `PyAVM <http://astrofrog.github.io/pyavm/>`__ 0.9.4 or later
 -  `pyregion <http://pyregion.readthedocs.org/>`__ 2.0 or later
 -  `pillow <https://pypi.org/project/Pillow/>`__ 4.0 or later
--  `scikit-image <https://pypi.org/project/scikit-image/>`__ 0.14 or
-   later
+-  `scikit-image <https://pypi.org/project/scikit-image/>`__ 0.14 or later
+-  `shapely <https://shapely.readthedocs.io/en/stable/project.html>`__ 1.6 or later
 
-You can install APLpy with:
+You can install APLpy and all its dependencies with::
 
-::
+    pip install aplpy
 
-   pip install aplpy
+or if you use conda::
 
-If you want to install all optional dependencies, you can do:
+    conda install -c astropy aplpy
 
-::
-
-   pip install aplpy[all]
-
 .. |Build Status| image:: https://travis-ci.org/aplpy/aplpy.svg?branch=master
@@ -50,0 +43,0 @@ :target: https://travis-ci.org/aplpy/aplpy

setup.cfg

@@ -31,5 +31,5 @@ [build_sphinx]
 github_project = aplpy/aplpy
-install_requires = numpy, astropy>=3.1, matplotlib>=2.0, reproject>=0.4
+install_requires = numpy, astropy>=3.1, matplotlib>=2.0, reproject>=0.4, pyregion>=2.0, pillow>=4.0, pyavm>=0.9.4, scikit-image>=0.14, shapely>=1.6
 # version should be PEP440 compatible (https://www.python.org/dev/peps/pep-0440/)
-version = 2.0
+version = 2.0.1
 
@@ -39,2 +39,1 @@ [options.extras_require]
 test = pytest-astropy; codecov; pytest-mpl
-all = pyregion>=2.0; pillow>=4.0; pyavm>=0.9.4; scikit-image>=0.14

Alert delta unavailable

Currently unable to show alert delta for PyPI packages.

Improved metrics

Number of package files

146

0.69%

Worsened metrics

Total package byte prevSize

1893842

-8.86%

Lines of code

11392

-0.22%