From ff44a00615d976f96f2cdd86d4efc4daccafd377 Mon Sep 17 00:00:00 2001 From: Stef Smeets Date: Mon, 9 Aug 2021 16:42:53 +0200 Subject: [PATCH 1/3] Update authors and versions --- .zenodo.json | 6 +++++- CITATION.cff | 8 ++++++-- THANKS.md | 6 ------ docs/conf.py | 2 +- instamatic/__init__.py | 8 +++++--- instamatic/gui/about_frame.py | 8 ++++---- pyproject.toml | 2 +- setup.py | 2 +- 8 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index b06f6455..a320d372 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -9,7 +9,11 @@ { "affiliation": "Stockholm University", "name": "Bin Wang" - } + }, + { + "affiliation": "Amsterdam Scientific Instruments", + "name": "Erik Hogenbirk", + }, ], "keywords": [ "electron-crystallography", diff --git a/CITATION.cff b/CITATION.cff index 82dd9f41..2c235cb4 100644 --- a/CITATION.cff +++ b/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" +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" ... diff --git a/THANKS.md b/THANKS.md index 7387285d..fda7b974 100644 --- a/THANKS.md +++ b/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 diff --git a/docs/conf.py b/docs/conf.py index 16770ca4..6999699e 100644 --- a/docs/conf.py +++ b/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' diff --git a/instamatic/__init__.py b/instamatic/__init__.py index b40c4a43..06dbc19d 100644 --- a/instamatic/__init__.py +++ b/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' diff --git a/instamatic/gui/about_frame.py b/instamatic/gui/about_frame.py index 0a42870f..a434f76f 100644 --- a/instamatic/gui/about_frame.py +++ b/instamatic/gui/about_frame.py @@ -95,7 +95,7 @@ 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 (stef.smeets@tudelft.nl)').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) @@ -103,13 +103,13 @@ def __init__(self, parent): 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') diff --git a/pyproject.toml b/pyproject.toml index e8284dc1..443e1124 100644 --- a/pyproject.toml +++ b/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 = [ diff --git a/setup.py b/setup.py index 7e6362a1..20fc1fdd 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,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={ From ae5a349cf64d437a759cd7a8e69c29610ffea3b7 Mon Sep 17 00:00:00 2001 From: Stef Smeets Date: Mon, 9 Aug 2021 16:48:01 +0200 Subject: [PATCH 2/3] Update date --- CITATION.cff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CITATION.cff b/CITATION.cff index 2c235cb4..e1d4a002 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -16,7 +16,7 @@ authors: family-names: Hogenbirk given-names: Erik cff-version: "1.1.0" -date-released: 2020-06-02 +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." From 5da6e119494544f8cd391e5f6d7df54e74ab83b2 Mon Sep 17 00:00:00 2001 From: Stef Smeets Date: Mon, 9 Aug 2021 16:49:40 +0200 Subject: [PATCH 3/3] Update link --- notebooks/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notebooks/readme.md b/notebooks/readme.md index 9e51988a..de6d6bb5 100644 --- a/notebooks/readme.md +++ b/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.