Adds DOI and updates version to 2.2.0 (#166)

ISISNeutronMuon · Aug 23, 2024 · c37d13c · c37d13c
1 parent 9417714
commit c37d13c
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/build_installer.yml b/.github/workflows/build_installer.yml
@@ -78,3 +78,4 @@ jobs:
         with:
           name: macos installer
           path: installer/macos/*.dmg
+          if-no-files-found: error
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![release](https://img.shields.io/github/release/ISISNeutronMuon/SScanSS-2.svg)](https://github.com/ISISNeutronMuon/SScanSS-2/releases)
 [![Actions Status](https://github.com/ISISNeutronMuon/SScanSS-2/workflows/Build/badge.svg)](https://github.com/ISISNeutronMuon/SScanSS-2/actions)
 [![Actions Status](https://github.com/ISISNeutronMuon/SScanSS-2/workflows/Docs/badge.svg)](https://github.com/ISISNeutronMuon/SScanSS-2/actions)
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7625691.svg)](https://doi.org/10.5281/zenodo.7625691)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.13359743.svg)](https://doi.org/10.5281/zenodo.13359743)
 
 SScanSS 2
 =========
@@ -23,5 +23,5 @@ Citing SScanSS 2
 1. J. A. James, J. R. Santisteban, L. Edwards and M. R. Daymond, “A virtual laboratory for neutron and synchrotron 
 strain scanning,” Physica B: Condensed Matter, vol. 350, no. 1-3, p. 743–746, 2004.
 
-2. Nneji Stephen, Sharp Paul, Farooq Rabiya, Zavileiskii Timofei, & Cooper Joshaniel FK. (2022). SScanSS 2—a redesigned 
-strain scanning simulation software (Version 2.1.0). [http://doi.org/10.5281/zenodo.7625691](http://doi.org/10.5281/zenodo.7625691).
+2. Nneji Stephen, Buchanan Rob, Farooq Rabiya, Sharp Paul, Zavileiskii Timofei, & Cooper Joshaniel FK. (2024). 
+SScanSS 2—a redesigned strain scanning simulation software (Version 2.2.0). [http://doi.org/10.5281/zenodo.13359743](http://doi.org/10.5281/zenodo.13359743).
diff --git a/docs/introduction.rst b/docs/introduction.rst
@@ -83,8 +83,8 @@ Citing SScanSS 2
 ****************
 1. J.A. James, J. R. Santisteban, L. Edwards and M. R. Daymond, “A virtual laboratory for neutron and synchrotron
 strain scanning,” Physica B: Condensed Matter, vol. 350, no. 1-3, p. 743–746, 2004.
-2. Nneji Stephen, Sharp Paul, Farooq Rabiya, Zavileiskii Timofei, & Cooper Joshaniel FK. (2022). SScanSS 2—a redesigned
-strain scanning simulation software (Version 2.1.0). |doi|.
+2. Nneji Stephen, Buchanan Rob, Farooq Rabiya, Sharp Paul, Zavileiskii Timofei, & Cooper Joshaniel FK. (2024).
+SScanSS 2—a redesigned strain scanning simulation software (Version 2.2.0). |doi|.
 
 
 .. |github| raw:: html
@@ -105,4 +105,4 @@ strain scanning simulation software (Version 2.1.0). |doi|.
 
 .. |doi| raw:: html
 
-   <a href="https://doi.org/10.5281/zenodo.7625691" target="_blank">https://doi.org/10.5281/zenodo.7625691</a>
+   <a href="https://doi.org/10.5281/zenodo.13359743" target="_blank">https://doi.org/10.5281/zenodo.13359743</a>
diff --git a/make.py b/make.py
@@ -153,7 +153,7 @@ def build_editor():
         '--name', 'editor', '--specpath',
         str(work_path), '--workpath',
         str(work_path), '--windowed', '--noconfirm', '--distpath',
-        str(dist_path), '--clean', '--log-level', 'CRITICAL',
+        str(dist_path), '--clean', '--log-level', 'ERROR',
         str(main_path)
     ]
 
@@ -186,7 +186,7 @@ def build_sscanss():
         '--name', 'sscanss', '--specpath',
         str(work_path), '--workpath',
         str(work_path), '--windowed', '--noconfirm', '--distpath',
-        str(dist_path), '--clean', '--log-level', 'CRITICAL',
+        str(dist_path), '--clean', '--log-level', 'ERROR',
         str(main_path)
     ]
 

diff --git a/requirements.txt b/requirements.txt
@@ -8,7 +8,7 @@ NLopt==2.7.1
 numpy==1.23.5
 gimpact==1.0.1
 Pillow==9.2.0
-PyInstaller==5.7.0
+PyInstaller==6.7.0
 PyOpenGL==3.1.6
 PyQt6==6.3.1
 PyQt6-Qt6==6.5.2

diff --git a/sscanss/__version.py b/sscanss/__version.py
@@ -64,5 +64,5 @@ def __repr__(self):
         return f'Version({self.major}, {self.minor}, {self.patch}, {self.pre_release}, {self.build})'
 
 
-__version__ = Version(2, 1, 0)
-__editor_version__ = Version(2, 1, 0)
+__version__ = Version(2, 2, 0)
+__editor_version__ = Version(2, 2, 0)
diff --git a/sscanss/app/dialogs/misc.py b/sscanss/app/dialogs/misc.py
@@ -54,10 +54,10 @@ def __init__(self, parent):
             '<ol><li>J. A. James, J. R. Santisteban, L. Edwards and M. R. Daymond, “A virtual laboratory for '
             'neutron and synchrotron strain scanning,” Physica B: Condensed Matter, vol. 350, no. 1-3, '
             'p. 743–746, 2004.</li>'
-            '<li>Nneji Stephen, Sharp Paul, Farooq Rabiya, Zavileiskii Timofei, & Cooper Joshaniel FK. (2022). '
-            'SScanSS 2—a redesigned strain scanning simulation software (Version 2.1.0). '
-            f'<a href="http://doi.org/10.5281/zenodo.7625691" style="color:{self.parent().themes.html_anchor.name()};">'
-            f'http://doi.org/10.5281/zenodo.7625691</a>.</li>'
+            '<li>Nneji Stephen, Buchanan Rob, Farooq Rabiya, Sharp Paul, Zavileiskii Timofei, & Cooper Joshaniel FK. (2024). '
+            'SScanSS 2—a redesigned strain scanning simulation software (Version 2.2.0). '
+            f'<a href="http://doi.org/10.5281/zenodo.13359743" style="color:{self.parent().themes.html_anchor.name()};">'
+            f'http://doi.org/10.5281/zenodo.13359743</a>.</li>'
             '</ol>'
             '<h3>Credit</h3>'
             '<ul><li>Icons from FontAwesome</li></ul>'