From b48fe8f67daca4262fe009d3a48acda95d61cb4f Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Thu, 13 May 2021 11:48:04 -0400 Subject: [PATCH 1/3] Updated focal builder image --- molecule/builder-focal/image_hash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/molecule/builder-focal/image_hash b/molecule/builder-focal/image_hash index 78d568533c..6b833405f8 100644 --- a/molecule/builder-focal/image_hash +++ b/molecule/builder-focal/image_hash @@ -1,2 +1,2 @@ -# sha256 digest quay.io/freedomofpress/sd-docker-builder-focal:2021_04_14 -46e06c9a83ec7f8f11d227aaaefb1da3b33d35c95f963d54087bcee965fae59e +# sha256 digest quay.io/freedomofpress/sd-docker-builder-focal:2021_05_13 +0bb7bfdad1336057b3d7a84528efba0f8ba14520b8de139f52df6f382c58e1a7 From 2de94f26198c9f5bffa5f6c87d3697fd96a79c41 Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Fri, 14 May 2021 11:09:50 -0400 Subject: [PATCH 2/3] updated dh_virtualenv to use pip 21.1.1, setuptools-scm 6.0.1 --- install_files/securedrop-app-code/debian/rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install_files/securedrop-app-code/debian/rules b/install_files/securedrop-app-code/debian/rules index 8079dd9d64..0beaf2b9bd 100755 --- a/install_files/securedrop-app-code/debian/rules +++ b/install_files/securedrop-app-code/debian/rules @@ -28,7 +28,8 @@ override_dh_virtualenv: dh_virtualenv \ --python=/usr/bin/python3 \ --builtin-venv \ - --preinstall setuptools-scm==5.0.2 \ + --upgrade-pip-to "21.1.1" \ + --preinstall setuptools-scm==6.0.1 \ --extra-pip-arg "--verbose" \ --extra-pip-arg "--no-deps" \ --extra-pip-arg "--no-binary=:all:" \ From fc78532d7c5176e058f23f1af80d447ada411986 Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Fri, 14 May 2021 18:09:58 -0400 Subject: [PATCH 3/3] Updated infra python package version check to work without pip, dropped '--upgrade-pip-to' arg from dh_virtualenv --- install_files/securedrop-app-code/debian/rules | 1 - molecule/testinfra/app/test_appenv.py | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/install_files/securedrop-app-code/debian/rules b/install_files/securedrop-app-code/debian/rules index 0beaf2b9bd..8688df8c4b 100755 --- a/install_files/securedrop-app-code/debian/rules +++ b/install_files/securedrop-app-code/debian/rules @@ -28,7 +28,6 @@ override_dh_virtualenv: dh_virtualenv \ --python=/usr/bin/python3 \ --builtin-venv \ - --upgrade-pip-to "21.1.1" \ --preinstall setuptools-scm==6.0.1 \ --extra-pip-arg "--verbose" \ --extra-pip-arg "--no-deps" \ diff --git a/molecule/testinfra/app/test_appenv.py b/molecule/testinfra/app/test_appenv.py index a11770cff1..3f1c44cd81 100644 --- a/molecule/testinfra/app/test_appenv.py +++ b/molecule/testinfra/app/test_appenv.py @@ -1,4 +1,3 @@ -import os.path import pytest import testutils @@ -9,9 +8,12 @@ @pytest.mark.parametrize('exp_pip_pkg', sdvars.pip_deps) def test_app_pip_deps(host, exp_pip_pkg): - """ Ensure pip dependencies are installed """ - pip = host.pip_package.get_packages(pip_path=os.path.join(sdvars.securedrop_venv_bin, "pip")) - assert pip[exp_pip_pkg['name']]['version'] == exp_pip_pkg['version'] + """ Ensure expected package versions are installed """ + cmd = "{}/bin/python3 -c \"from importlib.metadata import version; print(version('{}'))\"".format( # noqa + sdvars.securedrop_venv, exp_pip_pkg['name'] + ) + result = host.run(cmd) + assert result.stdout.strip() == exp_pip_pkg['version'] @pytest.mark.skip_in_prod