Update version number to 0.6.2

mretegan · Jun 8, 2018 · e79c10c · e79c10c
1 parent d4d3192
commit e79c10c
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 12 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+v0.6.2 (2018-06-08)
+-------------------
+What's new:
+
+* the package installers now contain the 2018 Summer version of Quanty
+* speedup of the RIXS calculations
+
 v0.6.1 (2018-06-05)
 -------------------
 This is a bug fix release.

diff --git a/README.rst b/README.rst
@@ -22,7 +22,7 @@ If you already have Python and all dependencies installed (see below), you can i
 
 .. code:: sh
 
-    pip install crispy --upgrade [--user]
+    pip install crispy
 
 Just as in the case of using the package installers, this will install the latest release, and not the development version (see below). Also, please note that when you install Crispy using pip, external programs needed to run the calculations have to be installed and their path must be set in the interface (preferred way) or using the PATH environment variable.
 
@@ -41,15 +41,15 @@ The dependencies can be installed using pip (only for Python 3.5 or greater):
 
 .. code:: sh
 
-    pip install -r https://raw.githubusercontent.com/mretegan/crispy/master/requirements.txt [--user]
+    pip install -r https://raw.githubusercontent.com/mretegan/crispy/master/requirements.txt
 
 It is possible, although unlikely, that the development version of Crispy requires features that are not yet available with the pip installable version of silx. In this case you have to also install the development version of silx. This is not always a very simple task, especially on Windows, but there is extensive `documentation <http://www.silx.org/doc/silx/latest>`_ on how to do it.
 
 Once Python and all dependencies are installed, you can proceed to installing Crispy:
 
 .. code:: sh
 
-    pip install https://github.com/mretegan/crispy/tarball/master --upgrade [--user]
+    pip install https://github.com/mretegan/crispy/tarball/master
 
 .. third-marker
 

diff --git a/assets/create_dmg.sh b/assets/create_dmg.sh
@@ -15,7 +15,7 @@ RESOURCES="${ROOT}"/crispy/assets
 ARTIFACTS="${ROOT}"/artifacts
 TEMPLATE="${ARTIFACTS}"/template
 TEMPLATE_DMG="${ARTIFACTS}"/template.dmg
-DMG="${ARTIFACTS}"/Crispy-0.6.1.dmg
+DMG="${ARTIFACTS}"/Crispy-0.6.2.dmg
 
 echo "Removing previous images."
 if [[ -e "${DMG}" ]]; then rm -rf "${DMG}"; fi

diff --git a/assets/create_installer.iss b/assets/create_installer.iss
@@ -1,7 +1,7 @@
 [Setup]
 AppId={{1B71F614-D6B1-4E28-83C8-E04068C7F91A}
 AppName=Crispy
-AppVersion=0.6.1
+AppVersion=0.6.2
 AppVerName=Crispy
 AppPublisher=Marius Retegan
 AppPublisherURL=https://github.com/mretegan/crispy
@@ -11,7 +11,7 @@ DefaultDirName={pf}\Crispy
 DefaultGroupName=Crispy
 LicenseFile=..\LICENSE.txt
 OutputDir=..\..\artifacts
-OutputBaseFilename=Crispy-0.6.1-x64
+OutputBaseFilename=Crispy-0.6.2-x64
 Compression=lzma
 SolidCompression=yes
 ; Remove for 32-bit applications

diff --git a/crispy/version.py b/crispy/version.py
@@ -65,7 +65,7 @@
 
 MAJOR = 0
 MINOR = 6
-MICRO = 1
+MICRO = 2
 RELEV = 'final'  # <16
 SERIAL = 0  # <16
 

diff --git a/docs/downloads.rst b/docs/downloads.rst
@@ -4,22 +4,23 @@ Downloads
 +----------------------------------+------------------------------+-----------------------------+
 | |Windows|                        | |macOS|                      | |Linux|                     |
 +----------------------------------+------------------------------+-----------------------------+
-| `Crispy-0.6.1-x64.exe (64-bit)`_ | `Crispy-0.6.1.dmg (64-bit)`_ | see the :doc:`installation` |
+| `Crispy-0.6.2-x64.exe (64-bit)`_ | `Crispy-0.6.2.dmg (64-bit)`_ | see the :doc:`installation` |
 |                                  |                              |                             |
 | The installer includes:          | The application includes:    | page for details.           |
 |   - Python 3.5.4                 |   - Python 3.5.4             |                             |
 |   - PyQt5 5.9.2                  |   - PyQt5 5.9.2              |                             |
 |   - NumPy 1.12.0                 |   - NumPy 1.14.0             |                             |
 |   - Matplotlib 2.1.0             |   - Matplotlib 2.1.0         |                             |
 |   - silx 0.7.0                   |   - silx 0.7.0               |                             |
-|   - Quanty 2016.03.25            |   - Quanty 2016.03.25        |                             |
+|   - Quanty Summer 2018           |   - Quanty Summer 2018       |                             |
 +----------------------------------+------------------------------+-----------------------------+
 
 **Notes**:
 
 - The files include the latest version of Quanty available at the time when the Crispy release was made. Therefore, if you haven't done so already, please register on the `Quanty <http://quanty.org/start?do=register>`_ website.
 - The macOS application is not signed and you will get an error when you try to launch it the first time. You can grant an exception for Crispy by clicking the "Open Anyway" button in the General pane of Security & Privacy preferences. You can find more about this in the `official documentation <https://support.apple.com/kb/PH25088?locale=en_US>`_.
 - On Windows, some antivirus programs might block the installation of the application and even delete the installer from disk. I assume that this is because the installer is not signed. Please rest assured that all releases are scanned using multiple antivirus programs on `VirusTotal <https://www.virustotal.com>`_. Also please make sure that you first uninstall older versions of Crispy before you proceed with the new installation.
+- You can download older versions from the `releases <https://github.com/mretegan/crispy/releases>`_ page on Github. 
 
 .. |Windows| image:: assets/windows.svg
     :width: 90pt
@@ -33,6 +34,6 @@ Downloads
     :width: 90pt
     :align: middle
 
-.. _Crispy-0.6.1-x64.exe (64-bit): https://github.com/mretegan/crispy/releases/download/v0.6.1/Crispy-0.6.1-x64.exe
+.. _Crispy-0.6.2-x64.exe (64-bit): https://github.com/mretegan/crispy/releases/download/v0.6.2/Crispy-0.6.2-x64.exe
 
-.. _Crispy-0.6.1.dmg (64-bit): https://github.com/mretegan/crispy/releases/download/v0.6.1/Crispy-0.6.1.dmg
+.. _Crispy-0.6.2.dmg (64-bit): https://github.com/mretegan/crispy/releases/download/v0.6.2/Crispy-0.6.2.dmg
diff --git a/requirements.txt b/requirements.txt
@@ -4,4 +4,4 @@
 PyQt5
 numpy
 matplotlib >= 1.2.0
-silx >= 0.6.1
+silx >= 0.7.0