Skip to content

Commit

Permalink
Update version number to 0.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
mretegan committed Feb 1, 2019
1 parent 0b959e5 commit 75249e3
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ docs/_drafts
.vscode

# Quanty binaries
crispy/resources/modules/quanty/bin/
crispy/modules/quanty/bin/

# Pipenv
Pipfile.lock
Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
Changelog
=========

v0.7.2 (2019-02-01)
-------------------
What's new:

* XES calculations for 3d transition metals
* update the Quanty version in the package installers

v0.7.1 (2018-10-07)
-------------------
What's new:
Expand Down Expand Up @@ -41,7 +48,7 @@ What's new:

* XPS calculations
* automatic check for updates
* important changes to Quanty templates
* important changes to Quanty templates

v0.5.0 (2018-03-26)
-------------------
Expand Down
12 changes: 6 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Crispy is a modern graphical user interface to calculate core-level spectra using the semi-empirical multiplet approaches implemented in `Quanty <http://quanty.org>`_. The interface provides a set of tools to generate input files, submit calculations, and plot the resulting spectra.

|release| |downloads| |DOI| |licence|
|release| |downloads| |DOI| |licence|

.. |downloads| image:: https://img.shields.io/github/downloads/mretegan/crispy/total.svg
:target: https://github.com/mretegan/crispy/releases

.. |release| image:: https://img.shields.io/github/release/mretegan/crispy.svg
:target: https://github.com/mretegan/crispy/releases

.. |DOI| image:: https://zenodo.org/badge/53660512.svg
:target: https://zenodo.org/badge/latestdoi/53660512
.. |licence| image:: https://img.shields.io/github/license/mretegan/crispy.svg

.. |licence| image:: https://img.shields.io/github/license/mretegan/crispy.svg
:target: https://github.com/mretegan/crispy/blob/master/LICENSE.txt

.. first-marker
Expand Down Expand Up @@ -121,8 +121,8 @@ Crispy is a scientific software. If you use it for a scientific publication, ple

@misc{retegan_crispy,
author = {Retegan, Marius},
title = {Crispy: v0.7.1},
year = {2018},
title = {Crispy: v0.7.2},
year = {2019},
doi = {10.5281/zenodo.1451209},
url = {https://zenodo.org/badge/latestdoi/53660512}
}
Expand Down
2 changes: 1 addition & 1 deletion assets/create_dmg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RESOURCES="${ROOT}"/crispy/assets
ARTIFACTS="${ROOT}"/artifacts
TEMPLATE="${ARTIFACTS}"/template
TEMPLATE_DMG="${ARTIFACTS}"/template.dmg
DMG="${ARTIFACTS}"/Crispy-0.7.1.dmg
DMG="${ARTIFACTS}"/Crispy-0.7.2.dmg

echo "Removing previous images."
if [[ -e "${DMG}" ]]; then rm -rf "${DMG}"; fi
Expand Down
4 changes: 2 additions & 2 deletions assets/create_installer.iss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Setup]
AppId={{1B71F614-D6B1-4E28-83C8-E04068C7F91A}
AppName=Crispy
AppVersion=0.7.2a0
AppVersion=0.7.2
AppVerName=Crispy
AppPublisher=Marius Retegan
AppPublisherURL=https://github.com/mretegan/crispy
Expand All @@ -11,7 +11,7 @@ DefaultDirName={pf}\Crispy
DefaultGroupName=Crispy
LicenseFile=..\LICENSE.txt
OutputDir=..\..\artifacts
OutputBaseFilename=Crispy-0.7.2a0-x64
OutputBaseFilename=Crispy-0.7.2-x64
Compression=lzma
SolidCompression=yes
ArchitecturesAllowed=x64
Expand Down
2 changes: 1 addition & 1 deletion crispy/gui/plot.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# coding: utf-8
# /*##########################################################################
#
# Copyright (c) 2016-2017 European Synchrotron Radiation Facility
# Copyright (c) 2016-2019 European Synchrotron Radiation Facility
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
Expand Down
5 changes: 4 additions & 1 deletion crispy/gui/quanty.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

__authors__ = ['Marius Retegan']
__license__ = 'MIT'
__date__ = '14/01/2019'
__date__ = '01/02/2019'


import copy
Expand Down Expand Up @@ -2001,6 +2001,9 @@ def loadSettings(self):
self.move(QPoint(pos))

path = self.settings.value('Path')
# In the future remove some settings if there is an version update.
if version <= '0.7.2':
path = None
if path is None or not path:
path = self._findExecutable()
self.pathLineEdit.setText(path)
Expand Down
2 changes: 1 addition & 1 deletion crispy/gui/uis/about.ui
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ font-weight: bold;</string>
<string notr="true">font-size: 12px;</string>
</property>
<property name="text">
<string>© Copyright 2016–2018,
<string>© Copyright 2016–2019,
European Synchrotron Radiation Facility.</string>
</property>
<property name="alignment">
Expand Down
2 changes: 1 addition & 1 deletion crispy/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
MAJOR = 0
MINOR = 7
MICRO = 2
RELEV = 'devel' # <16
RELEV = 'final' # <16
SERIAL = 0 # <16

date = __date__
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

# General information about the project.
project = 'Crispy'
copyright = '2016–2018, Marius Retegan, European Synchrotron Radiation Facility, Grenoble, France'
copyright = '2016–2019, Marius Retegan, European Synchrotron Radiation Facility, Grenoble, France'
author = 'Marius Retegan'

# The version info for the project you're documenting, acts as replacement for
Expand Down
10 changes: 5 additions & 5 deletions docs/downloads.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ Downloads
+----------------------------------+------------------------------+-----------------------------+
| |Windows| | |macOS| | |Linux| |
+----------------------------------+------------------------------+-----------------------------+
| `Crispy-0.7.1-x64.exe (64-bit)`_ | `Crispy-0.7.1.dmg (64-bit)`_ | see the :doc:`installation` |
| `Crispy-0.7.2-x64.exe (64-bit)`_ | `Crispy-0.7.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.8.0 | - silx 0.8.0 | |
| - Quanty Autumn 2018 | - Quanty Autumn 2018 | |
| - silx 0.9.0 | - silx 0.9.0 | |
| - Quanty Autumn 2018 (0.6) | - Quanty Autumn 2018 (0.6) | |
+----------------------------------+------------------------------+-----------------------------+

**Notes**:
Expand All @@ -34,6 +34,6 @@ Downloads
:width: 90pt
:align: middle

.. _Crispy-0.7.1-x64.exe (64-bit): https://github.com/mretegan/crispy/releases/download/v0.7.1/Crispy-0.7.1-x64.exe
.. _Crispy-0.7.2-x64.exe (64-bit): https://github.com/mretegan/crispy/releases/download/v0.7.2/Crispy-0.7.2-x64.exe

.. _Crispy-0.7.1.dmg (64-bit): https://github.com/mretegan/crispy/releases/download/v0.7.1/Crispy-0.7.1.dmg
.. _Crispy-0.7.2.dmg (64-bit): https://github.com/mretegan/crispy/releases/download/v0.7.2/Crispy-0.7.2.dmg

0 comments on commit 75249e3

Please sign in to comment.