From 61020ad815889a4c7be0b8e3844ab2896848ab07 Mon Sep 17 00:00:00 2001 From: David Elizalde Date: Tue, 21 Nov 2023 20:16:30 -0600 Subject: [PATCH 1/3] 5428: Replace distutils with setuptools --- .github/workflows/linux-package.yml | 2 +- py/setup.py.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-package.yml b/.github/workflows/linux-package.yml index fef298874d5..148d32413fd 100644 --- a/.github/workflows/linux-package.yml +++ b/.github/workflows/linux-package.yml @@ -67,7 +67,7 @@ jobs: - name: Install dependencies run: | apt-get -qq update - apt-get install -y make build-essential m4 pkg-config autoconf libtool git python3 python3-distutils curl zip unzip tar bison p7zip-full libx11-dev libxft-dev libxext-dev libdbus-1-dev libxi-dev libxtst-dev libxrandr-dev libnotify-dev + apt-get install -y make build-essential m4 pkg-config autoconf libtool git python3 python3-setuptools curl zip unzip tar bison p7zip-full libx11-dev libxft-dev libxext-dev libdbus-1-dev libxi-dev libxtst-dev libxrandr-dev libnotify-dev - name: Install aws cli tool run: | diff --git a/py/setup.py.in b/py/setup.py.in index 22fd6e45f17..0a3183b69ee 100644 --- a/py/setup.py.in +++ b/py/setup.py.in @@ -1,6 +1,6 @@ #! /usr/bin/env python -from distutils.core import setup +from setuptools import setup setup(name = 'Boinc', version = '@PACKAGE_VERSION@', From 9ac154da9a362874ebb9c057da4c76e6cc62ad0c Mon Sep 17 00:00:00 2001 From: David Elizalde Date: Tue, 21 Nov 2023 20:36:03 -0600 Subject: [PATCH 2/3] Add distutils back as it is a dependency pf setuptools https://packages.ubuntu.com/focal/python3-setuptools --- .github/workflows/linux-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux-package.yml b/.github/workflows/linux-package.yml index 148d32413fd..082ce7de962 100644 --- a/.github/workflows/linux-package.yml +++ b/.github/workflows/linux-package.yml @@ -67,7 +67,7 @@ jobs: - name: Install dependencies run: | apt-get -qq update - apt-get install -y make build-essential m4 pkg-config autoconf libtool git python3 python3-setuptools curl zip unzip tar bison p7zip-full libx11-dev libxft-dev libxext-dev libdbus-1-dev libxi-dev libxtst-dev libxrandr-dev libnotify-dev + apt-get install -y make build-essential m4 pkg-config autoconf libtool git python3 python3-distutils python3-setuptools curl zip unzip tar bison p7zip-full libx11-dev libxft-dev libxext-dev libdbus-1-dev libxi-dev libxtst-dev libxrandr-dev libnotify-dev - name: Install aws cli tool run: | From 5349a737ad3f041fc148bf93b58a47138bbc2217 Mon Sep 17 00:00:00 2001 From: David Elizalde Date: Wed, 22 Nov 2023 10:57:17 -0600 Subject: [PATCH 3/3] Use setuptools in place of distutils --- samples/vm_wrapper/setupPyBOINC.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/vm_wrapper/setupPyBOINC.py b/samples/vm_wrapper/setupPyBOINC.py index 9b2552fc069..1895a9a2541 100644 --- a/samples/vm_wrapper/setupPyBOINC.py +++ b/samples/vm_wrapper/setupPyBOINC.py @@ -1,4 +1,4 @@ -from distutils.core import setup, Extension +from setuptools import setup, Extension # May need to adjust these to suit your system, but a standard installation of the BOINC client from source will put things in these places pyboinc = Extension('boinc', runtime_library_dirs=['/usr/local/lib', '../../lib', '../../api'],