Skip to content

Commit

Permalink
Merge pull request #3044 from nabobalis/image
Browse files Browse the repository at this point in the history
image file reviews
  • Loading branch information
Cadair committed Apr 15, 2019
2 parents d69cf82 + b9a4cec commit 7d177a6
Show file tree
Hide file tree
Showing 14 changed files with 287 additions and 297 deletions.
2 changes: 2 additions & 0 deletions changelog/3044.breaking.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Renamed ``sunpy/image/rescale.py`` to ``sunpy/image/resample.py``.
Therefore imports will have to change.
2 changes: 1 addition & 1 deletion docs/code_ref/image.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ functions in other places.

.. automodapi:: sunpy.image

.. automodapi:: sunpy.image.rescale
.. automodapi:: sunpy.image.resample
:headings: ".#"

.. automodapi:: sunpy.image.transform
Expand Down
8 changes: 4 additions & 4 deletions sunpy/coordinates/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class GreatArc(object):
center : `~astropy.coordinates.SkyCoord`
Center of the sphere.
points : `None`, `int`, `~numpy.ndarray`
points : `None`, `int`, `numpy.ndarray`
Number of points along the great arc. If None, the arc is calculated
at 100 equally spaced points from start to end. If int, the arc is
calculated at "points" equally spaced points from start to end. If a
Expand Down Expand Up @@ -167,7 +167,7 @@ def inner_angles(self, points=None):
Parameters
----------
points : `None`, `int`, `~numpy.ndarray`
points : `None`, `int`, `numpy.ndarray`
If None, use the default locations of parameterized points along the
arc. If int, the arc is calculated at "points" equally spaced
points from start to end. If a numpy.ndarray is passed, it must be
Expand All @@ -193,7 +193,7 @@ def distances(self, points=None):
Parameters
----------
points : `None`, `int`, `~numpy.ndarray`
points : `None`, `int`, `numpy.ndarray`
If None, use the default locations of parameterized points along the
arc. If int, the arc is calculated at "points" equally spaced
points from start to end. If a numpy.ndarray is passed, it must be
Expand All @@ -220,7 +220,7 @@ def coordinates(self, points=None):
Parameters
----------
points : `None`, `int`, `~numpy.ndarray`
points : `None`, `int`, `numpy.ndarray`
If None, use the default locations of parameterized points along the
arc. If int, the arc is calculated at "points" equally spaced
points from start to end. If a numpy.ndarray is passed, it must be
Expand Down
Loading

0 comments on commit 7d177a6

Please sign in to comment.