From cb7f14fe9acf98b9adc053a68a90506d8d881011 Mon Sep 17 00:00:00 2001 From: David Brown Date: Mon, 21 Jul 2025 12:48:42 +0100 Subject: [PATCH 1/3] update pyyaml and markupsafe license paths --- app/license_notice.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/license_notice.py b/app/license_notice.py index 2bb41d9b3..740fd6c58 100644 --- a/app/license_notice.py +++ b/app/license_notice.py @@ -95,7 +95,7 @@ class LicenseMetadata: name='pyyaml', homepage_url='https://pyyaml.org', license_glob_pattern= - './venv/lib/python3.*/site-packages/PyYAML-*.dist-info/LICENSE*', + './venv/lib/python3.*/site-packages/pyyaml-*.dist-info/licenses/LICENSE*', ), LicenseMetadata( name='bidict', @@ -155,7 +155,7 @@ class LicenseMetadata: name='MarkupSafe', homepage_url='https://palletsprojects.com/p/markupsafe/', license_glob_pattern= - './venv/lib/python3.*/site-packages/MarkupSafe-*.dist-info/LICENSE*', + './venv/lib/python3.*/site-packages/markupsafe-*.dist-info/licenses/LICENSE*', ), LicenseMetadata( name='python-dotenv', From bae9090e41e75717874751aacab26a919dc369ba Mon Sep 17 00:00:00 2001 From: Jason Wallace Date: Mon, 21 Jul 2025 16:41:21 +0200 Subject: [PATCH 2/3] Use license URL. --- app/license_notice.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/license_notice.py b/app/license_notice.py index 740fd6c58..191c7f0ee 100644 --- a/app/license_notice.py +++ b/app/license_notice.py @@ -94,8 +94,10 @@ class LicenseMetadata: LicenseMetadata( name='pyyaml', homepage_url='https://pyyaml.org', - license_glob_pattern= - './venv/lib/python3.*/site-packages/pyyaml-*.dist-info/licenses/LICENSE*', + # We're unable to consistently link to the local license file because of + # inconsistent Python package structure. + # https://github.com/tiny-pilot/tinypilot/issues/1899 + license_url='https://raw.githubusercontent.com/yaml/pyyaml/6.0.2/LICENSE', ), LicenseMetadata( name='bidict', @@ -154,8 +156,10 @@ class LicenseMetadata: LicenseMetadata( name='MarkupSafe', homepage_url='https://palletsprojects.com/p/markupsafe/', - license_glob_pattern= - './venv/lib/python3.*/site-packages/markupsafe-*.dist-info/licenses/LICENSE*', + # We're unable to consistently link to the local license file because of + # inconsistent Python package structure. + # https://github.com/tiny-pilot/tinypilot/issues/1899 + license_url='https://raw.githubusercontent.com/pallets/markupsafe/3.0.2/LICENSE.txt', ), LicenseMetadata( name='python-dotenv', From efb73e93fa367d002a13f3de2d18b11887c9b7a7 Mon Sep 17 00:00:00 2001 From: Jason Wallace Date: Mon, 21 Jul 2025 16:43:41 +0200 Subject: [PATCH 3/3] Fix style. --- app/license_notice.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/license_notice.py b/app/license_notice.py index 191c7f0ee..b49536748 100644 --- a/app/license_notice.py +++ b/app/license_notice.py @@ -97,7 +97,8 @@ class LicenseMetadata: # We're unable to consistently link to the local license file because of # inconsistent Python package structure. # https://github.com/tiny-pilot/tinypilot/issues/1899 - license_url='https://raw.githubusercontent.com/yaml/pyyaml/6.0.2/LICENSE', + license_url= + 'https://raw.githubusercontent.com/yaml/pyyaml/6.0.2/LICENSE', ), LicenseMetadata( name='bidict', @@ -159,7 +160,8 @@ class LicenseMetadata: # We're unable to consistently link to the local license file because of # inconsistent Python package structure. # https://github.com/tiny-pilot/tinypilot/issues/1899 - license_url='https://raw.githubusercontent.com/pallets/markupsafe/3.0.2/LICENSE.txt', + license_url= + 'https://raw.githubusercontent.com/pallets/markupsafe/3.0.2/LICENSE.txt', ), LicenseMetadata( name='python-dotenv',