From da847de630fcbfd1414ffcdae796c02b561b69fd Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Tue, 23 Apr 2024 08:58:03 -0400 Subject: [PATCH 1/2] setup.py: Install CSS files. Fixes [setools 4.5.0] apol.css is missing from the Python package #124 Signed-off-by: Chris PeBenito --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a58114ef..f933b2f0 100644 --- a/setup.py +++ b/setup.py @@ -75,7 +75,7 @@ 'setoolsgui.widgets.models', 'setoolsgui.widgets.views'], scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta', 'sechecker'], data_files=installed_data, - package_data={'': ['*.html'], + package_data={'': ['*.css', '*.html'], 'setools': ['perm_map', 'policyrep.pyi', 'py.typed']}, ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'], annotate=cython_annotate, From 70a2fd93c252821363609ee7b375e3b1b0de073d Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Tue, 23 Apr 2024 10:26:22 -0400 Subject: [PATCH 2/2] tox.ini: Add file listing to install test. Allows review of what files are installed and where. Signed-off-by: Chris PeBenito --- tox.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index ff94e95c..8fa6954f 100644 --- a/tox.ini +++ b/tox.ini @@ -41,7 +41,9 @@ commands = mypy -p setools -p setoolsgui -p tests [testenv:install] deps = {[testenv]deps} -commands = {envpython} -m pip install --use-pep517 . +allowlist_externals = find +commands = {envpython} -m pip install --use-pep517 --root {envtmpdir}/setools . + find {envtmpdir}/setools [testenv] passenv = USERSPACE_SRC