From 7cc3b09239da5cb7d41a6d2056d16b1eb51725b0 Mon Sep 17 00:00:00 2001
From: Alexey Shkarin <alexey.shkarin@mpl.mpg.de>
Date: Wed, 29 Sep 2021 22:28:19 +0200
Subject: [PATCH] Update to 1.2.0

---
 docs/changelog.rst | 39 +++++++++++++++++++++++++++++++++++++--
 docs/conf.py       |  2 +-
 setup.py           | 16 ++++++++--------
 3 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 45e2acf..3152104 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -23,6 +23,41 @@ you can write
     import pylablib.legacy as pll
     from pylablib.legacy.aux_libs.devices import Lakeshore
 
+1.2.0
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- General
+
+    * Added ``timing`` context manager for simple code timing checks.
+    * Improved RPyC wrapper logging and reliability.
+    * Added Anaconda support.
+    * Added minor network and file functions.
+
+- Devices
+
+    * Added Newport Picomotor 8742 motor controller, Toptica iBeam Smart laser, older version of Thorlabs FW motorized filter wheel.
+    * Added camera frame output format (list or array).
+    * Added ``use_cavity`` option to M2 Solstis laser.
+    * Added method for auto-detecting associations between PhotonFocus cameras and frame grabbers.
+    * Updated some generic classes (DCAM cameras, Thorlabs TLCamera cameras).
+    * Updated SCPI failsafe operation, improved Thorlabs FW reliability.
+    * Fixed several minor bugs.
+
+- GUI
+
+    * Rewritten GUI values handling to pass calls in a hierarchical manner. This makes the operation more predictable and overloading the behavior a bit easier.
+    * Added out-of-range value action for combo boxes.
+    * Fixed ``ImagePlotter`` incompatibility with the newer pyqtgraph versions, added separate x and y axis line cuts selection.
+    * Minor layout handling bugfixes.
+
+- Threading
+
+    * Released advanced threading functionality: table/frame streaming, device threads, basic frame processing.
+    * Task thread additions: delayed batch job stopping, context manager for task loop pausing.
+    * Added argument-dependent call queue limit.
+    * Improved threading speed and stability.
+
+
 1.1.0
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -34,8 +69,8 @@ you can write
 - Devices
     
     * Added Silicon Software frame grabbers interface and rearranged PhotonFocus code to include both IMAQ and SiliconSoftware frame grabbers.
-    * Fixed various compatibility bugs arising for specific versions of Python or dependency modules: Kinesis error with specific pyft232 versions, some DLL-dependent devices errors with Python 3.8+, DLL types in 32-bit Python
-    * Addressed issue with occasional uc480 acquisition restarts, fixed M2 communication report errors,
+    * Fixed various compatibility bugs arising for specific versions of Python or dependency modules: Kinesis error with specific pyft232 versions, some DLL-dependent devices errors with Python 3.8+, DLL types in 32-bit Python.
+    * Addressed issue with occasional uc480 acquisition restarts, fixed M2 communication report errors.
 
 - GUI and threading
 
diff --git a/docs/conf.py b/docs/conf.py
index 8b51c73..9a0a13d 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.1.0'
+release = '1.2.0'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/setup.py b/setup.py
index ebfae1e..65e2629 100644
--- a/setup.py
+++ b/setup.py
@@ -18,21 +18,22 @@
 dep_extra=['rpyc','numba']
 dep_devio=['pyft232','pyvisa>=1.6','pyserial','pyusb']
 dep_devio_extra=['nidaqmx','websocket-client']
-dep_pyqt5=['pyqt5>5.10','pyqtgraph']
+dep_pyqt5=['pyqt5>=5.9','pyqtgraph']
 dep_pyside2=['pyside2','shiboken2','pyqtgraph>0.10']
 setup(
     name='pylablib',
     # name='pylablib-lightweight',
-    version='1.1.0',
+    version='1.2.0',
     description='Code for use in lab environment: experiment automation, data acquisition, device communication',
     long_description=long_description,
     long_description_content_type="text/x-rst",
     url='https://github.com/AlexShkarin/pyLabLib',
     author='Alexey Shkarin',
     author_email='pylablib@gmail.com',
+    license="GPLv3",
     classifiers=[
-    'Development Status :: 3 - Alpha',
-    'Operating System :: Microsoft :: Windows ',
+    'Development Status :: 4 - Beta',
+    'Operating System :: Microsoft :: Windows',
     'Intended Audience :: Developers',
     'Intended Audience :: Science/Research',
     'Topic :: Scientific/Engineering',
@@ -42,17 +43,16 @@
     'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3.9',
-    'Operating System :: Microsoft :: Windows'
     ],
     project_urls={
     'Documentation': 'https://pylablib.readthedocs.io',
     'Source': 'https://github.com/AlexShkarin/pyLabLib/',
     'Tracker': 'https://github.com/AlexShkarin/pyLabLib/issues'
     },
-    packages=find_packages(include=['pylablib*'],exclude=['pylablib.thread*']),
-    install_requires=dep_base+dep_extra+dep_devio+dep_devio_extra+dep_pyqt5,
+    packages=find_packages(include=['pylablib*']),
+    install_requires=dep_base+dep_extra+dep_devio+dep_pyqt5,
     extras_require={
-        'devio-full':['nidaqmx','websocket-client'],
+        'devio-full':dep_devio_extra,
     }
     # install_requires=dep_base,
     # extras_require={