reorganize the licenses module a bit

pypa · Sep 15, 2024 · a361294 · a361294
1 parent 8906b16
commit a361294
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -60,7 +60,7 @@ ignore_missing_imports = true
 [tool.ruff]
 src = ["src"]
 extend-exclude = [
-    "src/packaging/licenses/spdx.py"
+    "src/packaging/licenses/_spdx.py"
 ]
 
 [tool.ruff.lint]

diff --git a/src/packaging/licenses/__init__.py b/src/packaging/licenses/__init__.py
@@ -34,7 +34,13 @@
 import re
 from typing import NewType
 
-from packaging.licenses.spdx import EXCEPTIONS, LICENSES
+from packaging.licenses._spdx import EXCEPTIONS, LICENSES
+
+__all__ = [
+    "NormalizedLicenseExpression",
+    "InvalidLicenseExpression",
+    "canonicalize_license_expression",
+]
 
 license_ref_allowed = re.compile("^[A-Za-z0-9.-]*$")
 

diff --git a/src/packaging/licenses/spdx.py → src/packaging/licenses/_spdx.py b/src/packaging/licenses/spdx.py → src/packaging/licenses/_spdx.py
diff --git a/tasks/licenses.py b/tasks/licenses.py
@@ -53,7 +53,7 @@ def main():
         }
 
     project_root = pathlib.Path(__file__).resolve().parent.parent
-    data_file = project_root / "src" / "packaging" / "licenses" / "spdx.py"
+    data_file = project_root / "src" / "packaging" / "licenses" / "_spdx.py"
 
     with closing(StringIO()) as file_contents:
         file_contents.write(