From a02784b6b9e100117ecba9dd3b5e428c04a4e4f2 Mon Sep 17 00:00:00 2001 From: "M. Anthony Aiello" Date: Thu, 30 May 2024 13:42:04 -0400 Subject: [PATCH] Changes to support Ubuntu 24.04 Remove python3-binutils and replace with python3-setuptools. Update the localcoords setup script for the change. Also update the CI configs to use Ubuntu 24.04/pythony 3.12 Note: the localcoords script is trying to do a systemwide install of a C++ module for use in python. This is probably not what's best for OpenUxAS users. --- .github/workflows/amase.yaml | 4 ++-- .github/workflows/infrastructure-install.yaml | 4 ++-- .github/workflows/run-example.yaml | 4 ++-- .github/workflows/run-lmcpgen.yaml | 4 ++-- .github/workflows/uxas-ada.yaml | 4 ++-- .github/workflows/uxas-cpp.yaml | 4 ++-- .github/workflows/uxas-module.yaml | 4 ++-- infrastructure/install-libexec/install-anod-venv.py | 2 +- src/cpp/Utilities/localcoords/setup.py | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/amase.yaml b/.github/workflows/amase.yaml index d31fd5069..d03bccc8a 100644 --- a/.github/workflows/amase.yaml +++ b/.github/workflows/amase.yaml @@ -24,8 +24,8 @@ jobs: fail-fast: false matrix: env: [ - {os: ubuntu-20.04, python: '3.8'}, - {os: ubuntu-22.04, python: '3.10'} + {os: ubuntu-22.04, python: '3.10'}, + {os: ubuntu-24.04, python: '3.12'} ] component: [amase] qualifier: [scenario=release] diff --git a/.github/workflows/infrastructure-install.yaml b/.github/workflows/infrastructure-install.yaml index 9ca5ad405..6e36e53de 100644 --- a/.github/workflows/infrastructure-install.yaml +++ b/.github/workflows/infrastructure-install.yaml @@ -16,8 +16,8 @@ jobs: fail-fast: false matrix: env: [ - {os: ubuntu-20.04, python: '3.8'}, - {os: ubuntu-22.04, python: '3.10'} + {os: ubuntu-22.04, python: '3.10'}, + {os: ubuntu-24.04, python: '3.12'} ] runs-on: ${{ matrix.env.os }} steps: diff --git a/.github/workflows/run-example.yaml b/.github/workflows/run-example.yaml index 01aa3e354..7a36fa830 100644 --- a/.github/workflows/run-example.yaml +++ b/.github/workflows/run-example.yaml @@ -30,8 +30,8 @@ jobs: fail-fast: false matrix: env: [ - {os: ubuntu-20.04, python: '3.8'}, - {os: ubuntu-22.04, python: '3.10'} + {os: ubuntu-22.04, python: '3.10'}, + {os: ubuntu-24.04, python: '3.12'} ] runs-on: ${{ matrix.env.os }} steps: diff --git a/.github/workflows/run-lmcpgen.yaml b/.github/workflows/run-lmcpgen.yaml index 7c1aa76c0..8150b0e44 100644 --- a/.github/workflows/run-lmcpgen.yaml +++ b/.github/workflows/run-lmcpgen.yaml @@ -26,8 +26,8 @@ jobs: fail-fast: false matrix: env: [ - {os: ubuntu-20.04, python: '3.8'}, - {os: ubuntu-22.04, python: '3.10'} + {os: ubuntu-22.04, python: '3.10'}, + {os: ubuntu-24.04, python: '3.12'} ] runs-on: ${{ matrix.env.os }} steps: diff --git a/.github/workflows/uxas-ada.yaml b/.github/workflows/uxas-ada.yaml index 54edcc6d5..a986b396c 100644 --- a/.github/workflows/uxas-ada.yaml +++ b/.github/workflows/uxas-ada.yaml @@ -28,8 +28,8 @@ jobs: fail-fast: false matrix: env: [ - {os: ubuntu-20.04, python: '3.8'}, - {os: ubuntu-22.04, python: '3.10'} + {os: ubuntu-22.04, python: '3.10'}, + {os: ubuntu-24.04, python: '3.12'} ] component: [uxas-ada] qualifier: [scenario=release] diff --git a/.github/workflows/uxas-cpp.yaml b/.github/workflows/uxas-cpp.yaml index fec84ccff..56a1381d1 100644 --- a/.github/workflows/uxas-cpp.yaml +++ b/.github/workflows/uxas-cpp.yaml @@ -28,8 +28,8 @@ jobs: fail-fast: false matrix: env: [ - {os: ubuntu-20.04, python: '3.8'}, - {os: ubuntu-22.04, python: '3.10'} + {os: ubuntu-22.04, python: '3.10'}, + {os: ubuntu-24.04, python: '3.12'} ] component: [uxas] qualifier: [scenario=release, scenario=gcov] diff --git a/.github/workflows/uxas-module.yaml b/.github/workflows/uxas-module.yaml index d4e63277e..2fe636bb1 100644 --- a/.github/workflows/uxas-module.yaml +++ b/.github/workflows/uxas-module.yaml @@ -16,8 +16,8 @@ jobs: fail-fast: false matrix: env: [ - {os: ubuntu-20.04, python: '3.8'}, - {os: ubuntu-22.04, python: '3.10'} + {os: ubuntu-22.04, python: '3.10'}, + {os: ubuntu-24.04, python: '3.12'} ] runs-on: ${{ matrix.env.os }} steps: diff --git a/infrastructure/install-libexec/install-anod-venv.py b/infrastructure/install-libexec/install-anod-venv.py index 4912942a1..ed78deb21 100755 --- a/infrastructure/install-libexec/install-anod-venv.py +++ b/infrastructure/install-libexec/install-anod-venv.py @@ -53,7 +53,7 @@ "uuid-dev", "libyaml-dev", "python3-dev", - "python3-distutils", + "python3-setuptools", "python3-venv", "python3-pip", # For a system-wide boost, we need these packages. Commented out until diff --git a/src/cpp/Utilities/localcoords/setup.py b/src/cpp/Utilities/localcoords/setup.py index af5549bb5..6cc2578fb 100644 --- a/src/cpp/Utilities/localcoords/setup.py +++ b/src/cpp/Utilities/localcoords/setup.py @@ -1,4 +1,4 @@ -from distutils.core import setup, Extension +from setuptools import setup, Extension module1 = Extension('LocalCoords',sources=['LocalCoordsModule.cpp', '../UnitConversions.cpp'],