warehouse: Delete tuf.models, use tuf.repository config for CLI

pypi · Apr 6, 2020 · f8e7d67 · f8e7d67
1 parent 26ca58a
commit f8e7d67
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 80 deletions.
diff --git a/warehouse/cli/tuf.py b/warehouse/cli/tuf.py
@@ -17,7 +17,7 @@
 from warehouse.cli import warehouse
 from warehouse.tuf import BIN_N_ROLE, BINS_ROLE, TOPLEVEL_ROLES, utils
 
-TUF_REPO = "warehouse/tuf/dist"
+# TUF_REPO = "warehouse/tuf/dist"
 
 
 def _make_backsigned_fileinfo_from_file(file):
@@ -59,7 +59,9 @@ def new_repo(config):
     Initialize the TUF repository from scratch, including a brand new root.
     """
 
-    repository = repository_tool.create_new_repository(TUF_REPO)
+    repository = repository_tool.create_new_repository(
+        config.registry.settings["tuf.repository"]
+    )
 
     for role in TOPLEVEL_ROLES:
         key_service = _key_service_for_role(config, role)
@@ -94,7 +96,9 @@ def build_targets(config):
     targets role (bins) and its hashed bin delegations (each bin-n).
     """
 
-    repository = repository_tool.load_repository(TUF_REPO)
+    repository = repository_tool.load_repository(
+        config.registry.settings["tuf.repository"]
+    )
 
     # Load signing keys. We do this upfront for the top-level roles.
     for role in ["snapshot", "targets", "timestamp"]:

diff --git a/warehouse/tuf/models.py b/warehouse/tuf/models.py