Update to 2.1.2

AlexShkarin · Dec 23, 2021 · 1c58d2c · 1c58d2c
1 parent 745608f
commit 1c58d2c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -3,6 +3,17 @@
 Release history
 ============================
 
+`Version 2.1.2 <https://github.com/AlexShkarin/pyLabLib-cam-control/releases/download/v2.1.2/cam-control.zip>`__
+---------------------------------------------------------------------------------------------------------------------------------------------
+
+2021-12-23
+
+* Graphics and UI update: added launcher executables, "About" windows, popup error messages.
+
+`Download <https://github.com/AlexShkarin/pyLabLib-cam-control/releases/download/v2.1.2/cam-control.zip>`__
+
+|
+
 `Version 2.1.1 <https://github.com/AlexShkarin/pyLabLib-cam-control/releases/download/v2.1.1/cam-control.zip>`__
 ---------------------------------------------------------------------------------------------------------------------------------------------
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -26,7 +26,7 @@
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-release = '2.1.1'
+release = '2.1.2'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/docs/expanding.rst b/docs/expanding.rst
@@ -25,7 +25,7 @@ where ``"some-package"`` is the name of the package to install (e.g., ``"scikit-
 Running from source
 ~~~~~~~~~~~~~~~~~~~~~~
 
-It is also possible to run cam-control in your own Python environment. All of the required code is contained in ``cam-control`` folder and can be obtained either on `GitHub <https://github.com/AlexShkarin/pylablib-cam-control/>`__ or directly from the folder. To run it, you also need to install the necessary dependencies: `NumPy <https://docs.scipy.org/doc/numpy/>`_, `SciPy <https://docs.scipy.org/doc/scipy/reference/>`_, `pandas <https://pandas.pydata.org/>`_, `Numba <https://numba.pydata.org/>`_, `RPyC <https://rpyc.readthedocs.io/en/latest/>`_, `PyQt5 <https://www.riverbankcomputing.com/software/pyqt/>`_ (or `PySide2 <https://www.pyside.org/>`_ with `shiboken2 <https://wiki.qt.io/Qt_for_Python/Shiboken>`_), `pyqtgraph <http://www.pyqtgraph.org/>`_, and `imageio <https://imageio.readthedocs.io/en/stable/>`_. All of the dependencies are included in ``requirements.txt`` file inside the ``cam-control`` folder (it can also be extracted by running ``python -m pip freeze`` in the local python command line). In addition, the GitHub-hosted version requires `pylablib <https://pylablib.readthedocs.io/en/stable/>`_ v1.3.1 (not included in ``requirements.txt``).
+It is also possible to run cam-control in your own Python environment. All of the required code is contained in ``cam-control`` folder and can be obtained either on `GitHub <https://github.com/AlexShkarin/pylablib-cam-control/>`__ or directly from the folder. To run it, you also need to install the necessary dependencies: `NumPy <https://docs.scipy.org/doc/numpy/>`_, `SciPy <https://docs.scipy.org/doc/scipy/reference/>`_, `pandas <https://pandas.pydata.org/>`_, `Numba <https://numba.pydata.org/>`_, `RPyC <https://rpyc.readthedocs.io/en/latest/>`_, `PyQt5 <https://www.riverbankcomputing.com/software/pyqt/>`_ (or `PySide2 <https://www.pyside.org/>`_ with `shiboken2 <https://wiki.qt.io/Qt_for_Python/Shiboken>`_), `pyqtgraph <http://www.pyqtgraph.org/>`_, and `imageio <https://imageio.readthedocs.io/en/stable/>`_. All of the dependencies are included in ``requirements.txt`` file inside the ``cam-control`` folder (it can also be extracted by running ``python -m pip freeze`` in the local python command line). In addition, the GitHub-hosted version requires `pylablib <https://pylablib.readthedocs.io/en/stable/>`_ v1.3.2 (not included in ``requirements.txt``).
 
 
 .. _expanding_filter:

diff --git a/utils/__init__.py b/utils/__init__.py
@@ -1,4 +1,4 @@
-version="2.1.1"
+version="2.1.2"
 
 import re
 def compare_version(v):