Merge pull request #54 from instamatic-dev/bump_version

Bump version and update authors for release

Author: stefsmeets

.zenodo.json

@@ -9,7 +9,11 @@
     {
       "affiliation": "Stockholm University",
       "name": "Bin Wang"
-    }
+    },
+    {
+      "affiliation": "Amsterdam Scientific Instruments",
+      "name": "Erik Hogenbirk",
+    },
   ],
   "keywords": [
     "electron-crystallography",

CITATION.cff

@@ -11,11 +11,15 @@ authors:
     affiliation: Vironova
     family-names: Wang
     given-names: Bin
+  -
+    affiliation: "Amsterdam Scientific Instruments"
+    family-names: Hogenbirk
+    given-names: Erik
 cff-version: "1.1.0"
-date-released: 2020-06-02
-doi: "10.5281/zenodo.4072976"
+date-released: 2021-08-09
+doi: "10.5281/zenodo.1090388"
 license: "GPL-3.0"
 message: "If you use this software, please cite it using these metadata."
 title: Instamatic
-version: "1.6.1"
+version: "1.7.0"
 ...

THANKS.md

@@ -6,12 +6,6 @@ See [Github contributors list](https://github.com/nipy/nipype/graphs/contributor
 Special thanks
 --------------
 
-- Bin Wang
-  - Many tweaks and bug fixes
-  - FEI API implementation
-  - Development and testing of cRED integration and automated tracking
-  - Development and testing of SerialRED automated data collection
-
 - Magdalena O. Cichocka
   - Testing and feedback on cRED implementation
 

docs/conf.py

@@ -80,7 +80,7 @@ def setup(app):
 author = 'Stef Smeets'
 
 # The short X.Y version.
-version = release = '1.6.1'
+version = release = '1.7.0'
 
 # The language for content autogenerated by Sphinx.
 language = 'english'

instamatic/__init__.py

@@ -9,14 +9,16 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 """
 
-__version__ = '1.6.1'
+__version__ = '1.7.0'
 __title__ = 'instamatic'
 __long_title__ = f'{__title__} v{__version__}'
 __author__ = 'Stef Smeets'
-__author_email__ = 's.smeets@tudelft.nl'
+__author_email__ = 's.smeets@esciencecenter.nl'
 __description__ = 'Python program for automated serial electron diffraction data collection'
 __license__ = 'GPLv3'
-__url__ = 'http://github.com/instamatic-dev/instamatic'
+__url__ = 'https://github.com/instamatic-dev/instamatic'
+__issues__ = __url__ + '/issues'
+__docs__ = 'https://instamatic.readthedocs.io'
 __doi__ = 'https://doi.org/10.5281/zenodo.1090388'
 __citation__ = f'Instamatic (v.{__version__}), Zenodo, {__doi__}'
 __citation_cred__ = 'J. Appl. Cryst. (2018). 51, 1652–1661, https://doi.org/10.1107/S1600576718015145'

instamatic/gui/about_frame.py

@@ -95,21 +95,21 @@ def __init__(self, parent):
 
         Label(frame, text='').grid(row=0, column=0, sticky='W')
         Label(frame, text='Contact:').grid(row=1, column=0, sticky='W', padx=10)
-        Label(frame, text='Stef Smeets ([email protected])').grid(row=1, column=1, sticky='W')
+        Label(frame, text=f'{instamatic.__author__} ({instamatic.__author_email__}').grid(row=1, column=1, sticky='W')
         Label(frame, text='').grid(row=5, column=0, sticky='W')
 
         Label(frame, text='Source code:').grid(row=10, column=0, sticky='W', padx=10)
         link = Link_Button(frame, text=instamatic.__url__, action=self.link_github)
         link.grid(row=10, column=1, sticky='W')
         Label(frame, text='').grid(row=12, column=0, sticky='W')
 
-        Label(frame, text='Manual:').grid(row=20, column=0, sticky='W', padx=10)
-        link = Link_Button(frame, text=instamatic.__url__ + '/docs', action=self.link_github)
+        Label(frame, text='Docs:').grid(row=20, column=0, sticky='W', padx=10)
+        link = Link_Button(frame, text=instamatic.__docs__, action=self.link_github)
         link.grid(row=20, column=1, sticky='W')
         Label(frame, text='').grid(row=22, column=0, sticky='W')
 
         Label(frame, text='Bugs:').grid(row=30, column=0, sticky='W', padx=10)
-        link = Link_Button(frame, text=instamatic.__url__ + '/issues', action=self.link_github)
+        link = Link_Button(frame, text=instamatic.__issues__, action=self.link_github)
         link.grid(row=30, column=1, sticky='W')
         Label(frame, text='').grid(row=32, column=0, sticky='W')
 

notebooks/readme.md

@@ -5,6 +5,6 @@ These are some demo's that show some of the functions of `instamatic`
 - [Interactive data collection](data_collection.ipynb)
 - [Example of grid montage acquisition](grid_montage_collection.ipynb)
 - [Montage processing](montage_processing.ipynb)
-- [Montage processing (SerialEM data)](http://github.com/stefsmeets/pyserialem/demos/montage_processing_serialem.ipynb)
+- [Montage processing (SerialEM data)](https://github.com/instamatic-dev/pyserialem/demos/montage_processing_serialem.ipynb)
 
 Use `jupyter notebook` to run these notebooks offline.

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = 'instamatic'
-version = "1.6.1"
+version = "1.7.0"
 description = 'Python program for automated electron diffraction data collection'
 license = 'GPL-3.0-only'
 classifiers = [

setup.py

@@ -17,7 +17,7 @@
 setup(
     long_description=readme,
     name='instamatic',
-    version='1.6.1',
+    version='1.7.0',
     description='Python program for automated electron diffraction data collection',
     python_requires='>=3.7',
     project_urls={