Merge pull request #194 from ericpre/release_v1.1.2

Release v1.1.2

Author: ericpre

CHANGES.rst

@@ -4,19 +4,18 @@ What's new
 Current Version
 ===============
 
-v1.1.1
+v1.1.2
 ++++++
 
-
 This is a maintenance release and the main highlights are:
 
-* Fix issue with recent matplotlib release (>=3.1).
-* Add support for EELS zlp "also align".
-* Add support for linux desktop integratin.
+* Fix issue with embedded console on windows and python 3.8.
+* Fix issue with jupyter_client v6.0 and ipykernel <5.2.
+* Documentation improvement.
 
 For a detailed list of all the changes
-see `the commits in the GITHUB milestones 1.1.1
-<https://github.com/hyperspy/hyperspyUI/milestone/6?closed=1>`_.
+see `the commits in the GITHUB milestones 1.1.2
+<https://github.com/hyperspy/hyperspyUI/milestone/7?closed=1>`_.
 
 
 Changelog
@@ -25,6 +24,20 @@ Changelog
 Previous Versions
 =================
 
+v1.1.1
+++++++
+
+
+This is a maintenance release and the main highlights are:
+
+* Fix issue with recent matplotlib release (>=3.1).
+* Add support for EELS zlp "also align".
+* Add support for linux desktop integratin.
+
+For a detailed list of all the changes
+see `the commits in the GITHUB milestones 1.1.1
+<https://github.com/hyperspy/hyperspyUI/milestone/6?closed=1>`_.
+
 
 v1.1.0
 ++++++

README.rst

@@ -43,15 +43,15 @@ the `HyperSpy bundle`_ installer, which includes HyperSpyUI.
 Anaconda/Miniconda on Mac or Linux
 ----------------------------------
 
-Download and install the `Miniconda`_ distribution and run the following command 
+Download and install the `Miniconda`_ or `Anaconda`_ distribution and run the following command 
 in the anaconda prompt: 
 
 .. code-block:: bash
 
-    conda install -c conda-forge hyperspy
-    pip install hyperspyui
+    conda install -c conda-forge hyperspyui
 
-.. _Miniconda: https://conda.io/miniconda.html
+.. _Miniconda: https://docs.conda.io/en/latest/miniconda.html
+.. _Anaconda: https://www.anaconda.com/products/individual
 
 Installation via pip
 --------------------
@@ -75,10 +75,17 @@ Run HyperSpyUI
 
 After installation, you can run HyperSpyUI from the command prompt with:
 
+.. code-block:: bash
+
+    hyperspyui
+    
+or 
+
 .. code-block:: bash
 
     python -m hyperspyui
 
+
 For further information, see the full documentation_.
 
 .. _HyperSpy: http://hyperspy.org

hyperspyui/info.py

@@ -21,4 +21,4 @@
 @author: Vidar Tonaas Fauske
 """
 
-__version__ = '1.2.0.dev'
+__version__ = '1.1.2'