Skip to content

Commit 7cc3b09

Browse files
committed
Update to 1.2.0
1 parent 06f0e40 commit 7cc3b09

File tree

3 files changed

+46
-11
lines changed

3 files changed

+46
-11
lines changed

docs/changelog.rst

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,41 @@ you can write
2323
import pylablib.legacy as pll
2424
from pylablib.legacy.aux_libs.devices import Lakeshore
2525
26+
1.2.0
27+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
28+
29+
- General
30+
31+
* Added ``timing`` context manager for simple code timing checks.
32+
* Improved RPyC wrapper logging and reliability.
33+
* Added Anaconda support.
34+
* Added minor network and file functions.
35+
36+
- Devices
37+
38+
* Added Newport Picomotor 8742 motor controller, Toptica iBeam Smart laser, older version of Thorlabs FW motorized filter wheel.
39+
* Added camera frame output format (list or array).
40+
* Added ``use_cavity`` option to M2 Solstis laser.
41+
* Added method for auto-detecting associations between PhotonFocus cameras and frame grabbers.
42+
* Updated some generic classes (DCAM cameras, Thorlabs TLCamera cameras).
43+
* Updated SCPI failsafe operation, improved Thorlabs FW reliability.
44+
* Fixed several minor bugs.
45+
46+
- GUI
47+
48+
* Rewritten GUI values handling to pass calls in a hierarchical manner. This makes the operation more predictable and overloading the behavior a bit easier.
49+
* Added out-of-range value action for combo boxes.
50+
* Fixed ``ImagePlotter`` incompatibility with the newer pyqtgraph versions, added separate x and y axis line cuts selection.
51+
* Minor layout handling bugfixes.
52+
53+
- Threading
54+
55+
* Released advanced threading functionality: table/frame streaming, device threads, basic frame processing.
56+
* Task thread additions: delayed batch job stopping, context manager for task loop pausing.
57+
* Added argument-dependent call queue limit.
58+
* Improved threading speed and stability.
59+
60+
2661
1.1.0
2762
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2863

@@ -34,8 +69,8 @@ you can write
3469
- Devices
3570

3671
* Added Silicon Software frame grabbers interface and rearranged PhotonFocus code to include both IMAQ and SiliconSoftware frame grabbers.
37-
* 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
38-
* Addressed issue with occasional uc480 acquisition restarts, fixed M2 communication report errors,
72+
* 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.
73+
* Addressed issue with occasional uc480 acquisition restarts, fixed M2 communication report errors.
3974

4075
- GUI and threading
4176

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
# The short X.Y version
3030
version = ''
3131
# The full version, including alpha/beta/rc tags
32-
release = '1.1.0'
32+
release = '1.2.0'
3333

3434

3535
# -- General configuration ---------------------------------------------------

setup.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,22 @@
1818
dep_extra=['rpyc','numba']
1919
dep_devio=['pyft232','pyvisa>=1.6','pyserial','pyusb']
2020
dep_devio_extra=['nidaqmx','websocket-client']
21-
dep_pyqt5=['pyqt5>5.10','pyqtgraph']
21+
dep_pyqt5=['pyqt5>=5.9','pyqtgraph']
2222
dep_pyside2=['pyside2','shiboken2','pyqtgraph>0.10']
2323
setup(
2424
name='pylablib',
2525
# name='pylablib-lightweight',
26-
version='1.1.0',
26+
version='1.2.0',
2727
description='Code for use in lab environment: experiment automation, data acquisition, device communication',
2828
long_description=long_description,
2929
long_description_content_type="text/x-rst",
3030
url='https://github.com/AlexShkarin/pyLabLib',
3131
author='Alexey Shkarin',
3232
author_email='[email protected]',
33+
license="GPLv3",
3334
classifiers=[
34-
'Development Status :: 3 - Alpha',
35-
'Operating System :: Microsoft :: Windows ',
35+
'Development Status :: 4 - Beta',
36+
'Operating System :: Microsoft :: Windows',
3637
'Intended Audience :: Developers',
3738
'Intended Audience :: Science/Research',
3839
'Topic :: Scientific/Engineering',
@@ -42,17 +43,16 @@
4243
'Programming Language :: Python :: 3.7',
4344
'Programming Language :: Python :: 3.8',
4445
'Programming Language :: Python :: 3.9',
45-
'Operating System :: Microsoft :: Windows'
4646
],
4747
project_urls={
4848
'Documentation': 'https://pylablib.readthedocs.io',
4949
'Source': 'https://github.com/AlexShkarin/pyLabLib/',
5050
'Tracker': 'https://github.com/AlexShkarin/pyLabLib/issues'
5151
},
52-
packages=find_packages(include=['pylablib*'],exclude=['pylablib.thread*']),
53-
install_requires=dep_base+dep_extra+dep_devio+dep_devio_extra+dep_pyqt5,
52+
packages=find_packages(include=['pylablib*']),
53+
install_requires=dep_base+dep_extra+dep_devio+dep_pyqt5,
5454
extras_require={
55-
'devio-full':['nidaqmx','websocket-client'],
55+
'devio-full':dep_devio_extra,
5656
}
5757
# install_requires=dep_base,
5858
# extras_require={

0 commit comments

Comments
 (0)