Fix parsing of requirements.txt entries that aren't using '==' specifiers

Author: initialed85

THIRDPARTYLICENSES

@@ -1,4 +1,4 @@
-Start of 'THIRDPARTYLICENSES' generated by Python third_party_license_generator at 2025-06-18 04:59:56.875233
+Start of 'THIRDPARTYLICENSES' generated by Python third_party_license_generator at 2025-06-18 13:53:21.492828
 
 ----------------------------------------
 
@@ -60,36 +60,6 @@ one at http://mozilla.org/MPL/2.0/.
 
 ----------------------------------------
 
-Package: charset-normalizer
-License: MIT
-Requires: n/a
-Author: (unknown) <"Ahmed R. TAHRI" <tahri.ahmed@proton.me>>
-Home page: None
-
-MIT License
-
-Copyright (c) 2025 TAHRI Ahmed R.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-----------------------------------------
-
 Package: idna
 License: BSD-3-clause
 Requires: n/a
@@ -130,35 +100,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ----------------------------------------
 
-Package: pip
-License: MIT
-Requires: n/a
-Author: The pip developers <distutils-sig@python.org>
-Home page: https://pip.pypa.io/
-
-Copyright (c) 2008-present The pip developers (see AUTHORS.txt file)
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-----------------------------------------
-
 Package: requests
 License: Apache-2.0
 Requires: charset_normalizer, idna, urllib3, certifi
@@ -342,34 +283,6 @@ Apache License
 
 ----------------------------------------
 
-Package: setuptools
-License: MIT
-Requires: n/a
-Author: Python Packaging Authority <distutils-sig@python.org>
-Home page: https://github.com/pypa/setuptools
-
-Copyright Jason R. Coombs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
-----------------------------------------
-
 Package: urllib3
 License: MIT
 Requires: n/a
@@ -400,34 +313,4 @@ SOFTWARE.
 
 ----------------------------------------
 
-Package: wheel
-License: MIT
-Requires: n/a
-Author: (unknown) <Daniel Holth <dholth@fastmail.fm>>
-Home page: None
-
-MIT License
-
-Copyright (c) 2012 Daniel Holth <dholth@fastmail.fm> and contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-----------------------------------------
-
-End of 'THIRDPARTYLICENSES' generated by Python third_party_license_generator at 2025-06-18 04:59:56.875292
+End of 'THIRDPARTYLICENSES' generated by Python third_party_license_generator at 2025-06-18 13:53:21.493234

build-tag-and-push.sh

@@ -14,4 +14,9 @@ fi
 
 docker build --build-arg "VERSION=${python_version}" -f ./Dockerfile -t "${image}" .
 
-docker run --rm --name "${container}" -v "${HOME}/.pypirc:/root/.pypirc" --workdir "/srv/python-third-party-license-file-generator" --entrypoint bash "${image}" -c "python setup.py sdist && twine upload dist/*"
+command="python setup.py sdist && ls -al dist/* && twine upload dist/*"
+if [[ "${SKIP_PUSH}" == "1" ]]; then
+    command="python setup.py sdist && ls -al dist/*"
+fi
+
+docker run --rm --name "${container}" -e "VERSION_OVERRIDE=${VERSION}" -v "${HOME}/.pypirc:/root/.pypirc" --workdir "/srv/python-third-party-license-file-generator" --entrypoint bash "${image}" -c "${command}"

check_third_party_licenses.py

@@ -0,0 +1,11 @@
+with open("THIRDPARTYLICENSES", "r") as f:
+    data = f.read()
+
+parts = data.split("----------------------------------------\n")
+
+parts = parts[1:-1]
+
+data = "----------------------------------------\n".join(parts).strip()
+
+if not data:
+    raise AssertionError("THIRDPARTYLICENSES contains no actual licences! (only the header and footer)")

docker-entrypoint.sh

@@ -8,14 +8,10 @@ python -u -m third_party_license_file_generator \
     --do-not-skip-not-required-packages \
     --permit-gpl
 
-echo ""
-
 if ! test -e THIRDPARTYLICENSES; then
     echo "error: couldn't find THIRDPARTYLICENSES- something has gone badly wrong"
 
     exit 1
 fi
 
-cat THIRDPARTYLICENSES
-
-echo ""
+python3 /srv/python-third-party-license-file-generator/check_third_party_licenses.py

setup.py

@@ -8,7 +8,7 @@
 
 # To use a consistent encoding
 from codecs import open
-from os import path
+from os import path, getenv
 
 # Always prefer setuptools over distutils
 from setuptools import find_packages, setup
@@ -36,7 +36,8 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version="{}.{}.{}".format(
+    version=getenv("VERSION_OVERRIDE")
+    or "{}.{}.{}".format(
         now.year,
         now.month,
         now.day,

third_party_license_file_generator/site_packages.py

@@ -2,6 +2,7 @@
 
 import shutil
 import os
+import re
 import shlex
 import signal
 import subprocess
@@ -175,7 +176,14 @@ def _read_requirements(self, requirements_path):
             elif "--" in line:
                 continue
             else:
-                self._root_module_names.add(line.split("==")[0].strip())
+                matches = [x for x in re.finditer(r"(^[\w|-|_]+).*$", line)]
+
+                for match in matches:
+                    if not match:
+                        continue
+
+                    for group in match.groups():
+                        self._root_module_names.add(group)
 
     def _get_site_packages_folder(self):
         out, err, returncode = _run_subprocess("{0} -m site".format(self._python_path))