From 089e68b1d47aec0ab7cc8a66a2d09456ef901611 Mon Sep 17 00:00:00 2001 From: John Rouillard Date: Thu, 25 May 2023 16:37:07 -0400 Subject: [PATCH 1/6] Remove raise ImportError used for testing. --- roundup/dist/command/build.py | 1 - 1 file changed, 1 deletion(-) diff --git a/roundup/dist/command/build.py b/roundup/dist/command/build.py index 6699ce20f..1f2c5f7db 100644 --- a/roundup/dist/command/build.py +++ b/roundup/dist/command/build.py @@ -7,7 +7,6 @@ from roundup import msgfmt try: from setuptool.command.install import install as base - raise ImportError except ImportError: from distutils.command.build import build as base import os From 077e50b3d5e3f940c1cf00d120513f86a82562c4 Mon Sep 17 00:00:00 2001 From: John Rouillard Date: Thu, 25 May 2023 16:38:25 -0400 Subject: [PATCH 2/6] Remove raise ImportError used for testing. --- roundup/dist/command/build_doc.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/roundup/dist/command/build_doc.py b/roundup/dist/command/build_doc.py index 9f0b23df8..b1df12f0d 100644 --- a/roundup/dist/command/build_doc.py +++ b/roundup/dist/command/build_doc.py @@ -6,11 +6,9 @@ import os, sys import os.path -import glob try: from setuptools.command.install import install as _build_py - raise ImportError except ImportError: from distutils.command.build import build as _build_py # try/except clause orig_build = _build_py From 43fd61e5ac060d81868457bb03e090520755db8f Mon Sep 17 00:00:00 2001 From: John Rouillard Date: Thu, 25 May 2023 17:04:07 -0400 Subject: [PATCH 3/6] Install setuptools [skip travis] Apparently setuptools is not installed by default. --- .github/workflows/ci-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index ddce82a7f..15386b3fc 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -190,6 +190,9 @@ jobs: - name: Install pytest and other packages needed for running tests run: pip install flake8 mock pytest pytest-cov requests + - name: Install build tools: setuptools + run: pip install setuptools + - name: Test build roundup and install locale so lang tests work. run: | sudo apt-get install gettext From 32ba4a18865ae332217814cc685aab58d1063859 Mon Sep 17 00:00:00 2001 From: John Rouillard Date: Thu, 25 May 2023 17:07:07 -0400 Subject: [PATCH 4/6] Fix syntax error? Try removing : in value --- .github/workflows/ci-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 15386b3fc..8f011f0b2 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -190,7 +190,7 @@ jobs: - name: Install pytest and other packages needed for running tests run: pip install flake8 mock pytest pytest-cov requests - - name: Install build tools: setuptools + - name: Install build tools - setuptools run: pip install setuptools - name: Test build roundup and install locale so lang tests work. From 500a6b9037f224d015b414b6853e4aadb69c9797 Mon Sep 17 00:00:00 2001 From: John Rouillard Date: Thu, 25 May 2023 17:16:46 -0400 Subject: [PATCH 5/6] Move setuptools install location and print version Install setuptools before priting version of key libraries and include setuptools. Packages that can use setuptools will find it missing, so install before any pip gets run. --- .github/workflows/ci-test.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 8f011f0b2..48dbe1b4e 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -100,11 +100,15 @@ jobs: allow-prereleases: true cache: 'pip' + - name: Install build tools - setuptools + run: pip install setuptools + # Display the Python version being used - name: Display Python and key module versions run: | python -c "import sys; print('python version: ', sys.version)" python -c "import sqlite3; print('sqlite version: ', sqlite3.sqlite_version)" + python -c "import setuptools; print('setuptools version: ', setuptools.__version__);" # Install the databases - name: Install mysql/mariadb @@ -190,9 +194,6 @@ jobs: - name: Install pytest and other packages needed for running tests run: pip install flake8 mock pytest pytest-cov requests - - name: Install build tools - setuptools - run: pip install setuptools - - name: Test build roundup and install locale so lang tests work. run: | sudo apt-get install gettext From e3652996bde56870d8b51a7c9ea1dff98c44560a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 May 2023 21:24:28 +0000 Subject: [PATCH 6/6] Bump python from `caafba8` to `3a619e3` in /scripts/Docker Bumps python from `caafba8` to `3a619e3`. --- updated-dependencies: - dependency-name: python dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- scripts/Docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Docker/Dockerfile b/scripts/Docker/Dockerfile index 653434ef9..e8ec1f3bb 100644 --- a/scripts/Docker/Dockerfile +++ b/scripts/Docker/Dockerfile @@ -24,7 +24,7 @@ ARG source=local ARG pythonversion=3.11 #FROM python:3-alpine -FROM python@sha256:caafba876f841774905f73df0fcaf7fe3f55aaf9cb48a9e369a41077f860d4a7 as build +FROM python@sha256:3a619e3c96fd4c5fc5e1998fd4dcb1f1403eb90c4c6409c70d7e80b9468df7df as build # Inherit global values https://github.com/moby/moby/issues/37345 ARG appdir @@ -133,7 +133,7 @@ RUN if [ -n "$pip_mod" ]; then pip install --no-cache-dir ${pip_mod}; fi # build a new smaller docker image for execution. Build image above # is 1G in size. # FROM python:3-alpine -FROM python@sha256:caafba876f841774905f73df0fcaf7fe3f55aaf9cb48a9e369a41077f860d4a7 +FROM python@sha256:3a619e3c96fd4c5fc5e1998fd4dcb1f1403eb90c4c6409c70d7e80b9468df7df # import from global ARG appdir