merge RELEASE_next_minor from upstream

CHANGES.rst

@@ -8,14 +8,24 @@ We only cover here the main highlights, for a detailed list of all the changes
 see `the commits in the GITHUB milestones
 <https://github.com/hyperspy/hyperspy/milestones?state=closed>`_.
 
+.. _changes_1.3.2:
+v1.3.2
+++++++
+
+This is a maintenance release. Follow the following links for details on all
+the `bugs fixed
+<https://github.com/hyperspy/hyperspy/issues?q=label%3A"type%3A+bug"+is%3Aclosed+milestone%3Av1.3.2>`_
+and `enhancements <https://github.com/hyperspy/hyperspy/issues?q=is%3Aclosed+milestone%3Av1.3.2+label%3A"type%3A+enhancement">`_.
+
+
 .. _changes_1.3.1:
 v1.3.1
 ++++++
 
 This is a maintenance release. Follow the following links for details on all
 the `bugs fixed
 <https://github.com/hyperspy/hyperspy/issues?q=label%3A"type%3A+bug"+is%3Aclosed+milestone%3Av1.3.1>`_
-and `enhancements <https://github.com/hyperspy/hyperspy/issues?q=is%3Aclosed+milestone%3Av1.1.2+label%3A"type%3A+enhancement">`_.
+and `enhancements <https://github.com/hyperspy/hyperspy/issues?q=is%3Aclosed+milestone%3Av1.3.1+label%3A"type%3A+enhancement">`_.
 
 Starting with this version, the HyperSpy WinPython Bundle distribution is
 no longer released in sync with HyperSpy. For HyperSpy WinPython Bundle

README.rst

@@ -2,14 +2,14 @@
 
 |Travis|_ |AppVeyor|_ |Coveralls|_ |pypi_version|_  |rtd|_ |gitter|_ |saythanks|_
 
-.. |Travis| image:: https://api.travis-ci.org/hyperspy/hyperspy.png?branch=RELEASE_next_minor
+.. |Travis| image:: https://api.travis-ci.org/hyperspy/hyperspy.png?branch=RELEASE_next_patch
 .. _Travis: https://travis-ci.org/hyperspy/hyperspy
 
-.. |AppVeyor| image:: https://ci.appveyor.com/api/projects/status/github/hyperspy/hyperspy?svg=true&branch=RELEASE_next_minor
-.. _AppVeyor: https://ci.appveyor.com/project/hyperspy/hyperspy/branch/RELEASE_next_minor
+.. |AppVeyor| image:: https://ci.appveyor.com/api/projects/status/github/hyperspy/hyperspy?svg=true&branch=RELEASE_next_patch
+.. _AppVeyor: https://ci.appveyor.com/project/hyperspy/hyperspy/branch/RELEASE_next_patch
 
-.. |Coveralls| image:: https://coveralls.io/repos/hyperspy/hyperspy/badge.svg
-.. _Coveralls: https://coveralls.io/r/hyperspy/hyperspy
+.. |Coveralls| image:: https://coveralls.io/repos/github/hyperspy/hyperspy/badge.svg?branch=RELEASE_next_minor
+.. _Coveralls: https://coveralls.io/github/hyperspy/hyperspy?branch=RELEASE_next_minor
 
 .. |pypi_version| image:: http://img.shields.io/pypi/v/hyperspy.svg?style=flat
 .. _pypi_version: https://pypi.python.org/pypi/hyperspy
@@ -56,5 +56,5 @@ Cite
 
 |DOI|_
 
-.. |DOI| image:: https://zenodo.org/badge/doi/10.5281/zenodo.1221347.svg
-.. _DOI: https://doi.org/10.5281/zenodo.1221347
+.. |DOI| image:: https://zenodo.org/badge/doi/10.5281/zenodo.1304308.svg
+.. _DOI: https://doi.org/10.5281/zenodo.1304308

doc/api/hyperspy._components.rst

@@ -1,187 +1,187 @@
-hyperspy\.\_components package
-==============================
+hyperspy.\_components package
+=============================
 
 Submodules
 ----------
 
-hyperspy\.\_components\.arctan module
--------------------------------------
+hyperspy.\_components.arctan module
+-----------------------------------
 
 .. automodule:: hyperspy._components.arctan
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.bleasdale module
-----------------------------------------
+hyperspy.\_components.bleasdale module
+--------------------------------------
 
 .. automodule:: hyperspy._components.bleasdale
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.eels\_cl\_edge module
----------------------------------------------
+hyperspy.\_components.eels\_cl\_edge module
+-------------------------------------------
 
 .. automodule:: hyperspy._components.eels_cl_edge
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.eels\_double\_power\_law module
--------------------------------------------------------
+hyperspy.\_components.eels\_double\_power\_law module
+-----------------------------------------------------
 
 .. automodule:: hyperspy._components.eels_double_power_law
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.eels\_vignetting module
------------------------------------------------
+hyperspy.\_components.eels\_vignetting module
+---------------------------------------------
 
 .. automodule:: hyperspy._components.eels_vignetting
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.error\_function module
-----------------------------------------------
+hyperspy.\_components.error\_function module
+--------------------------------------------
 
 .. automodule:: hyperspy._components.error_function
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.exponential module
-------------------------------------------
+hyperspy.\_components.exponential module
+----------------------------------------
 
 .. automodule:: hyperspy._components.exponential
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.expression module
------------------------------------------
+hyperspy.\_components.expression module
+---------------------------------------
 
 .. automodule:: hyperspy._components.expression
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.gaussian module
----------------------------------------
+hyperspy.\_components.gaussian module
+-------------------------------------
 
 .. automodule:: hyperspy._components.gaussian
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.gaussian2d module
------------------------------------------
+hyperspy.\_components.gaussian2d module
+---------------------------------------
 
 .. automodule:: hyperspy._components.gaussian2d
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.gaussianhf module
------------------------------------------
+hyperspy.\_components.gaussianhf module
+---------------------------------------
 
 .. automodule:: hyperspy._components.gaussianhf
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.heaviside module
-----------------------------------------
+hyperspy.\_components.heaviside module
+--------------------------------------
 
 .. automodule:: hyperspy._components.heaviside
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.logistic module
----------------------------------------
+hyperspy.\_components.logistic module
+-------------------------------------
 
 .. automodule:: hyperspy._components.logistic
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.lorentzian module
------------------------------------------
+hyperspy.\_components.lorentzian module
+---------------------------------------
 
 .. automodule:: hyperspy._components.lorentzian
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.offset module
--------------------------------------
+hyperspy.\_components.offset module
+-----------------------------------
 
 .. automodule:: hyperspy._components.offset
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.pes\_core\_line\_shape module
------------------------------------------------------
+hyperspy.\_components.pes\_core\_line\_shape module
+---------------------------------------------------
 
 .. automodule:: hyperspy._components.pes_core_line_shape
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.pes\_see module
----------------------------------------
+hyperspy.\_components.pes\_see module
+-------------------------------------
 
 .. automodule:: hyperspy._components.pes_see
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.polynomial module
------------------------------------------
+hyperspy.\_components.polynomial module
+---------------------------------------
 
 .. automodule:: hyperspy._components.polynomial
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.power\_law module
------------------------------------------
+hyperspy.\_components.power\_law module
+---------------------------------------
 
 .. automodule:: hyperspy._components.power_law
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.rc module
----------------------------------
+hyperspy.\_components.rc module
+-------------------------------
 
 .. automodule:: hyperspy._components.rc
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.scalable\_fixed\_pattern module
--------------------------------------------------------
+hyperspy.\_components.scalable\_fixed\_pattern module
+-----------------------------------------------------
 
 .. automodule:: hyperspy._components.scalable_fixed_pattern
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.voigt module
-------------------------------------
+hyperspy.\_components.voigt module
+----------------------------------
 
 .. automodule:: hyperspy._components.voigt
     :members:
     :undoc-members:
     :show-inheritance:
 
-hyperspy\.\_components\.volume\_plasmon\_drude module
------------------------------------------------------
+hyperspy.\_components.volume\_plasmon\_drude module
+---------------------------------------------------
 
 .. automodule:: hyperspy._components.volume_plasmon_drude
     :members: