From 9840228ebc3033771b0e27e5152ae04da8c0fd1d Mon Sep 17 00:00:00 2001 From: David Meyer Date: Wed, 16 Mar 2022 09:04:10 -0400 Subject: [PATCH 1/3] Replace `distutils.version.LooseVersion` with `packaging.version.Version` in `ls_zprocess`. --- labscript_utils/ls_zprocess.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/labscript_utils/ls_zprocess.py b/labscript_utils/ls_zprocess.py index 7173719..802e229 100644 --- a/labscript_utils/ls_zprocess.py +++ b/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 From b6b78231b0c40801817f3f4c5a9a3439a1000aa0 Mon Sep 17 00:00:00 2001 From: David Meyer Date: Wed, 16 Mar 2022 09:04:46 -0400 Subject: [PATCH 2/3] Replace `distutils.sysconfig` with stdlib `sysconfig` in `modulewatcher`. --- labscript_utils/modulewatcher.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/labscript_utils/modulewatcher.py b/labscript_utils/modulewatcher.py index 7e33b6d..25df904 100644 --- a/labscript_utils/modulewatcher.py +++ b/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() From f2f0ac78922888a4440418517476dff6ab77f19b Mon Sep 17 00:00:00 2001 From: David Meyer Date: Wed, 16 Mar 2022 09:43:51 -0400 Subject: [PATCH 3/3] Replace `distutils.log` with basic `logging` in `setup.py`. --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index a12d0a0..eb36d8e 100644 --- a/setup.py +++ b/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)