From 051f8327f00e927ba4c060f9f296388c8620a53e Mon Sep 17 00:00:00 2001
From: Alexey Shkarin <alexey.shkarin@mpl.mpg.de>
Date: Tue, 5 Oct 2021 20:09:28 +0200
Subject: [PATCH] Update to 1.2.1

---
 docs/changelog.rst  | 12 ++++++++++++
 docs/conf.py        |  2 +-
 docs/misc_utils.rst |  1 +
 setup.py            |  2 +-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 3152104..ea61c43 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -23,6 +23,18 @@ you can write
     import pylablib.legacy as pll
     from pylablib.legacy.aux_libs.devices import Lakeshore
 
+1.2.1
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- General
+
+    * Added restarting methods for regular and threaded applications.
+
+- Threading
+
+    * Bugfixes in cameras and camera threads.
+    * Bugfixes in streaming.
+
 1.2.0
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/conf.py b/docs/conf.py
index 9a0a13d..20dbb51 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-release = '1.2.0'
+release = '1.2.1'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/docs/misc_utils.rst b/docs/misc_utils.rst
index 8e9152a..0c02168 100644
--- a/docs/misc_utils.rst
+++ b/docs/misc_utils.rst
@@ -84,6 +84,7 @@ A variety of small useful methods and classes:
     - :class:`.utils.general.DummyResource`: a "dummy" resource class, which can be used in a ``with`` block but does nothing; can be used to, e.g., replace multi-threading resources such as locks to turn them off.
     - Unique ID generators: :class:`.utils.general.UIDGenerator` and :class:`.utils.general.NamedUIDGenerator`, which generate unique names (based on a counter), with a thread-safe option (useful to create, e.g., unique data markers).
     - Timekeeping: :class:`.utils.general.Countdown` for single shot and :class:`.utils.general.Timer` for repeating tasks. Simplify checking how much time is left (including options for infinite timeout), checking if timeout is passed, resetting, etc.
+    - Script restarting vua :func:`.utils.general.restart` (thread-controller style applications can also use :func:`.thread.controller.restart_app` for a more managed restart).
     - :class:`.utils.general.StreamFileLogger`, which can be set up to log all outputs into a stream (e.g., ``stdout``)::
 
         from pylablib import StreamFileLogger
diff --git a/setup.py b/setup.py
index 65e2629..1d30d7e 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@
 setup(
     name='pylablib',
     # name='pylablib-lightweight',
-    version='1.2.0',
+    version='1.2.1',
     description='Code for use in lab environment: experiment automation, data acquisition, device communication',
     long_description=long_description,
     long_description_content_type="text/x-rst",