Squashed commit of the following:

commit 95965b8
Merge: a88582d f2f0ac7
Author: Chris Billington <[email protected]>
Date:   Thu Mar 17 08:02:09 2022 +1100

    Merge pull request #86 from dihm/replace_distutils

    Replace distutils

commit f2f0ac7
Author: David Meyer <[email protected]>
Date:   Wed Mar 16 09:43:51 2022 -0400

    Replace `distutils.log` with basic `logging` in `setup.py`.

commit b6b7823
Author: David Meyer <[email protected]>
Date:   Wed Mar 16 09:04:46 2022 -0400

    Replace `distutils.sysconfig` with stdlib `sysconfig` in `modulewatcher`.

commit 9840228
Author: David Meyer <[email protected]>
Date:   Wed Mar 16 09:04:10 2022 -0400

    Replace `distutils.version.LooseVersion` with `packaging.version.Version` in `ls_zprocess`.

commit a88582d
Merge: 66c68ab 75a7df6
Author: David Meyer <[email protected]>
Date:   Thu Mar 3 09:28:57 2022 -0500

    Merge pull request #84 from dihm/generic_freq_conv

    Add generic frequency conversion class

commit 75a7df6
Author: David Meyer <[email protected]>
Date:   Wed Feb 9 12:27:17 2022 -0500

    Add generic frequency conversion class that goes between standard SI prefixes from a base of Hz.

commit 66c68ab
Merge: 7a3d58c 27501a3
Author: David Meyer <[email protected]>
Date:   Wed Feb 9 10:47:36 2022 -0500

    Merge pull request #83 from dihm/fix_docs_build

    Prevent starting a zlock server when importing `h5_lock` on RTD.

commit 27501a3
Author: David Meyer <[email protected]>
Date:   Wed Feb 9 10:34:22 2022 -0500

    Prevent starting a zlock server when importing `h5_lock` on RTD.

commit 7a3d58c
Author: David Meyer <[email protected]>
Date:   Wed Feb 2 17:24:26 2022 -0500

    Pin `mistune` to fix doc builds on RTD.

commit 36c3c6a
Author: chrisjbillington <[email protected]>
Date:   Fri Jan 7 17:23:48 2022 +1100

    Ensure only ints passed to QFrame.move in splash

    Otherwise this is a TypeError in the latest PyQt5.

commit f4da12e
Author: David Meyer <[email protected]>
Date:   Tue Nov 30 13:00:27 2021 -0500

    Triggering build of release branch by undoing unnecessary pin change for pyqtgraph.

commit a79d0e4
Author: David Meyer <[email protected]>
Date:   Tue Nov 30 11:20:27 2021 -0500

    Update setup.cfg in preparation for release.

commit 811b43d
Merge: b8726ad a3be0db
Author: David Meyer <[email protected]>
Date:   Wed Nov 10 17:07:51 2021 -0500

    Merge pull request #81 from chrisjbillington/py36-path-bug

    Fix bug on Python3.6

commit b8726ad
Merge: d309a5f c4dd2a8
Author: David Meyer <[email protected]>
Date:   Wed Nov 10 17:06:47 2021 -0500

    Merge pull request #78 from zakv/setup-logging-jupyter

    Make setup_logging() more Jupyter-friendly.

commit d309a5f
Merge: d5dfea7 12db878
Author: David Meyer <[email protected]>
Date:   Wed Nov 10 17:06:02 2021 -0500

    Merge pull request #82 from dihm/zlog_port_profile

    Add default zlog port to default profile configuration file.

commit c4dd2a8
Author: Zak V <[email protected]>
Date:   Tue Nov 9 20:12:19 2021 -0500

    Removed duplicate call to sys.stdout.fileno() in setup_logging.setup_logging().

    Probably best practice to call it just once rather than calling it first to check if it raises an error then again later to actually use the value it returns.

commit 2e38107
Author: Zak V <[email protected]>
Date:   Tue Nov 9 20:04:37 2021 -0500

    Restructured try/except block in setup_logging.setup_logging() to avoid catching any UnsupportedOperation errors thrown by code other than sys.stdout.fileno().

commit 97e70c7
Author: Zak V <[email protected]>
Date:   Tue Nov 9 19:56:07 2021 -0500

    Added warning message when setup_logging.setup_logging() cannot send output to stdout and stderr.

commit b711923
Author: Zak V <[email protected]>
Date:   Mon Jun 7 17:48:41 2021 -0400

    setup_logging.py is now more Jupyter-friendly.

commit d5dfea7
Merge: 9b76dcb b149e19
Author: David Meyer <[email protected]>
Date:   Wed Nov 10 08:54:21 2021 -0500

    Merge pull request #74 from zakv/unitconversions-import-bugfix

    Fixed bug in unitconversions._All._import_all()

commit 12db878
Author: David Meyer <[email protected]>
Date:   Mon Nov 8 10:20:28 2021 -0500

    Add default zlog port to default profile configuration file.

commit 9b76dcb
Merge: e13c992 e5cf3fb
Author: David Meyer <[email protected]>
Date:   Fri Oct 22 17:53:17 2021 -0400

    Merge pull request #80 from dihm/default_labconfig_docs

    Add default labconfig file to docs

commit a3be0db
Author: chrisjbillington <[email protected]>
Date:   Tue Sep 21 13:45:13 2021 +1000

    Fix bug on Python3.6, where Path object not able to be treated as a
    string in ConfigParser.

commit e5cf3fb
Author: David Meyer <[email protected]>
Date:   Tue Aug 31 15:29:45 2021 -0400

    Create a doc page that displays the current default labconfig.ini file,
    for easy reference.

commit e13c992
Merge: e74472c 461dc9f
Author: David Meyer <[email protected]>
Date:   Fri Jul 16 15:12:37 2021 -0400

    Merge pull request #79 from dihm/labscript_utils-docs

    Update docs to match autogenerating templates used in other modules of labscript.

commit 461dc9f
Author: David Meyer <[email protected]>
Date:   Thu Jul 15 10:26:41 2021 -0400

    Add docstring coverage test to build.

commit f90a4cc
Author: David Meyer <[email protected]>
Date:   Thu Jul 15 10:26:26 2021 -0400

    Update sphinx version.

commit e45107d
Author: David Meyer <[email protected]>
Date:   Mon Jul 12 12:57:18 2021 -0400

    Converting docs build to fully automated version based on recursive
    autosummary calls.

    This more closely resembles how docs are built in the other modules,
    but is slightly different in that submodules are also recursively generated.

commit 56d64f7
Author: David Meyer <[email protected]>
Date:   Mon Jul 12 09:25:18 2021 -0400

    Update sphinx pins to same versions as rest of suite.

commit e74472c
Merge: f0999f5 c543328
Author: Chris Billington <[email protected]>
Date:   Tue Feb 9 08:54:16 2021 +1100

    Merge pull request #76 from zakv/fix-27

    Work around infinite recursion in ToolPalette.resizeEvent()

commit c543328
Author: Zak V <[email protected]>
Date:   Mon Feb 8 13:30:47 2021 -0500

    Removed some python 2 debugging print statements from toolpalette.py.

commit d9eb80f
Author: Zak V <[email protected]>
Date:   Sun Feb 7 23:44:47 2021 -0500

    Fixed #27; worked around bug where ToolPalette.resizeEvent() could trigger itself in an infinite resursion loop.

commit f0999f5
Merge: 8371585 7d14b65
Author: Chris Billington <[email protected]>
Date:   Mon Jan 4 13:46:54 2021 +1100

    Merge pull request #75 from chrisjbillington/master

    Do not use deprecated set-env command

commit 7d14b65
Author: chrisjbillington <[email protected]>
Date:   Mon Jan 4 13:40:14 2021 +1100

    Do not use deprecated set-env command

commit b149e19
Author: Zak V <[email protected]>
Date:   Tue Nov 24 18:06:11 2020 -0500

    Fixed bug in unitconversions._All._import_all() where self.__all__ wasn't always changed from None to an empty list before appending things to it.

Author: dihm

labscript_utils/h5_lock.py

@@ -89,6 +89,9 @@ def hack_locks_onto_h5py():
     # Monkeypatch h5py so all files are locked:
     h5py.File = File
 
-
-connect_to_zlock_server()
-hack_locks_onto_h5py()
+if os.environ.get('READTHEDOCS'):
+    # prevent starting a zlock server on RTD, which always fails
+    pass
+else:
+    connect_to_zlock_server()
+    hack_locks_onto_h5py()

labscript_utils/ls_zprocess.py

@@ -13,7 +13,7 @@
 import sys
 import os
 from socket import gethostbyname
-from distutils.version import LooseVersion
+from packaging.version import Version
 import zmq
 
 import zprocess
@@ -337,7 +337,7 @@ def connect_to_zlock_server():
     global _zlock_server_supports_readwrite
     if hasattr(client, 'get_protocol_version'):
         version = client.get_protocol_version()
-        if LooseVersion(version) >= LooseVersion('1.1.0'):
+        if Version(version) >= Version('1.1.0'):
             _zlock_server_supports_readwrite = True
 
     # The user can call these functions to change the timeouts later if they

labscript_utils/modulewatcher.py

@@ -16,16 +16,16 @@
 import os
 import imp
 import site
-import distutils.sysconfig
+import sysconfig
 
 
 # Directories in which the standard library and installed packages may be located.
 # Modules in these locations will be whitelisted:
 PKGDIRS = [
-    distutils.sysconfig.get_python_lib(plat_specific=True, standard_lib=True),
-    distutils.sysconfig.get_python_lib(plat_specific=True, standard_lib=False),
-    distutils.sysconfig.get_python_lib(plat_specific=False, standard_lib=True),
-    distutils.sysconfig.get_python_lib(plat_specific=False, standard_lib=False),
+    sysconfig.get_path('platstdlib'),
+    sysconfig.get_path('platlib'),
+    sysconfig.get_path('stdlib'),
+    sysconfig.get_path('purelib'),
     site.getusersitepackages(),
 ]
 PKGDIRS += site.getsitepackages()

labscript_utils/splash.py

@@ -72,7 +72,7 @@ def __init__(self, imagepath):
 
         center_point = QtWidgets.QDesktopWidget().availableGeometry().center()
         x0, y0 = center_point.x(), center_point.y()
-        self.move(x0 - self.w / 2, y0 - self.h / 2)
+        self.move(x0 - self.w // 2, y0 - self.h // 2)
         self._first_paint_complete = False
 
     def paintEvent(self, event):

labscript_utils/unitconversions/generic_frequency.py

@@ -0,0 +1,54 @@
+#####################################################################
+#                                                                   #
+# generic_frequency.py                                              #
+#                                                                   #
+# Copyright 2022, Monash University and contributors                #
+#                                                                   #
+# This file is part of the labscript suite (see                     #
+# http://labscriptsuite.org) and is licensed under the Simplified   #
+# BSD License. See the license.txt file in the root of the project  #
+# for the full license.                                             #
+#                                                                   #
+#####################################################################
+"""Generic frequency conversion"""
+
+from .UnitConversionBase import *
+
+class FreqConversion(UnitConversion):
+    """
+    A Generic frequency conversion class that covers standard SI prefixes from a base of Hz.
+    """
+
+    base_unit = 'Hz' # must be defined here and match default hardware unit in BLACS tab
+
+    def __init__(self, calibration_parameters = None):
+        self.parameters = calibration_parameters
+        if hasattr(self, 'derived_units'):
+            self.derived_units += ['kHz', 'MHz', 'GHz']
+        else:
+            self.derived_units = ['kHz', 'MHz', 'GHz']
+        UnitConversion.__init__(self,self.parameters)
+    
+    def kHz_to_base(self,kHz):
+        Hz = kHz*1e3
+        return Hz
+
+    def kHz_from_base(self,Hz):
+        kHz = Hz*1e-3
+        return kHz
+
+    def MHz_to_base(self,MHz):
+        Hz = MHz*1e6
+        return Hz
+
+    def MHz_from_base(self,Hz):
+        MHz = Hz*1e-6
+        return MHz
+
+    def GHz_to_base(self,GHz):
+        Hz = GHz*1e9
+        return Hz
+
+    def GHz_from_base(self,Hz):
+        GHz = Hz*1e-9
+        return GHz

setup.cfg

@@ -43,6 +43,7 @@ docs =
   sphinx-rtd-theme==0.5.2
   recommonmark==0.6.0
   m2r==0.2.1
+  mistune<2.0.0
 
 [options.package_data]
 labscript_profile = ../labscript-suite.pth

setup.py

@@ -1,7 +1,7 @@
 import os
 from setuptools import setup
 from setuptools.command.develop import develop
-from distutils import log
+import logging
 
 
 class develop_command(develop):
@@ -11,7 +11,7 @@ def run(self):
         path = os.path.join(self.install_dir, 'labscript-suite.pth')
         super().run()
         if not self.uninstall:
-            log.info(f'Copying labscript-suite.pth to {path}')
+            logging.info(f'Copying labscript-suite.pth to {path}')
             if not self.dry_run:
                 self.copy_file('labscript-suite.pth', path)