From 7e7d91625d2c19f95501848cc567e7f07f53ce87 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Sat, 12 Nov 2022 21:42:04 +0200 Subject: [PATCH] Import setup from setuptools setuptools 60 uses its own bundled version of distutils, by default. It injects this into sys.modules, at import time. So we need to make sure that it is imported, before anything else imports distutils, to ensure everything is using the same distutils version. This change in setuptools is to prepare for Python 3.12, which will drop distutils. In this case, the best way to deal with the problem is to just use setuptools' setup(). Fixes: https://bugs.debian.org/1022482 and https://bugs.debian.org/1022538 --- packages/mbed-greentea/setup.py | 3 +-- packages/mbed-host-tests/setup.py | 3 +-- packages/mbed-ls/setup.py | 3 +-- setup.py | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/mbed-greentea/setup.py b/packages/mbed-greentea/setup.py index a7248a6785..7835608eb6 100644 --- a/packages/mbed-greentea/setup.py +++ b/packages/mbed-greentea/setup.py @@ -24,8 +24,7 @@ import os from io import open -from distutils.core import setup -from setuptools import find_packages +from setuptools import find_packages, setup DESCRIPTION = "mbed 3.0 onwards test suite, codename Greentea. The test suite is a collection of tools that enable automated testing on mbed-enabled platforms" OWNER_NAMES = 'Anna Bridge, Qinghao Shi' diff --git a/packages/mbed-host-tests/setup.py b/packages/mbed-host-tests/setup.py index 8b0723d429..bbc059fbc5 100644 --- a/packages/mbed-host-tests/setup.py +++ b/packages/mbed-host-tests/setup.py @@ -23,9 +23,8 @@ """ import os -from distutils.core import setup from io import open -from setuptools import find_packages +from setuptools import find_packages, setup DESCRIPTION = "mbed tools used to flash, reset and supervise test execution for mbed-enabled devices" OWNER_NAMES = 'Qinghao Shi' diff --git a/packages/mbed-ls/setup.py b/packages/mbed-ls/setup.py index daa1bd1a2a..76b13d13a3 100644 --- a/packages/mbed-ls/setup.py +++ b/packages/mbed-ls/setup.py @@ -20,9 +20,8 @@ """ import os -from distutils.core import setup from io import open -from setuptools import find_packages +from setuptools import find_packages, setup DESCRIPTION = "mbed-ls is a Python module that detects and lists mbed-enabled devices connected to the host computer" OWNER_NAMES = 'Graham Hammond, Mark Edgeworth' diff --git a/setup.py b/setup.py index bd3d968422..ea6d1cb2a2 100644 --- a/setup.py +++ b/setup.py @@ -15,8 +15,7 @@ import os import sys -from distutils.core import setup -from setuptools import find_packages +from setuptools import find_packages, setup DESCRIPTION = "The tools to build, test, and work with Mbed OS" OWNER_NAMES = "Jimmy Brisson, Brian Daniels"