Add non-released tuf dependency (WIP)

Install python-tuf from non-released revision to get improved VerificationResult. Revert when released!! NOTE: * Updated pyproject.toml manually (for pip install -e .) * Updated Pipfile via: ``` pipenv install git+https://github.com/theupdateframework/python-tuf@be55b87 ``` This also updated Pipfile.lock including all sorts of unrelated updates. * Updated requirements* files with `make requirements` See related repository-service-tuf#507 Signed-off-by: Lukas Puehringer <[email protected]>
lukpueh · Mar 4, 2024 · 1a9ae5d · 1a9ae5d
1 parent 3e4b0aa
commit 1a9ae5d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 77 deletions.
diff --git a/Pipfile b/Pipfile
@@ -11,11 +11,11 @@ rich = "*"
 auto-click-auto = "*"
 PyNaCl = "==1.5.0"
 requests = "*"
-tuf = "==3.1.0"
 dynaconf = {extras = ["yaml"], version = "*"}
 isort = "*"
 sqlalchemy = "*"
 psycopg2 = "*"
+tuf = {ref = "be55b87", git = "git+https://github.com/theupdateframework/python-tuf"}
 
 [dev-packages]
 black = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -31,7 +31,7 @@ dependencies = [
   "rich",
   "rich-click",
   "securesystemslib[crypto]==0.31.0",
-  "tuf==3.1.0",
+  "tuf @ git+https://github.com/theupdateframework/python-tuf@be55b87"
 ]
 dynamic = ["version"]
 
@@ -45,6 +45,9 @@ ignore_missing_imports = true
 [tool.hatch.version]
 path = "repository_service_tuf/__version__.py"
 
+[tool.hatch.metadata]
+allow-direct-references = true
+
 [project.optional-dependencies]
 psycopg2 = ["psycopg2>=2.9.5"]  # required by import-artifacts sub-command
 sqlalchemy = ["sqlalchemy>=2.0.1"]  # required by import-artifacts sub-command

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -76,7 +76,6 @@ zipp==3.17.0; python_version >= '3.8'
 auto-click-auto==0.1.4; python_version >= '3.7' and python_version < '4.0'
 cffi==1.16.0; python_version >= '3.8'
 dynaconf[yaml]==3.2.4; python_version >= '3.8'
-greenlet==3.0.3; platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32')))))
 psycopg2==2.9.9; python_version >= '3.7'
 pycparser==2.21
 pynacl==1.5.0; python_version >= '3.6'
@@ -85,4 +84,4 @@ ruamel.yaml==0.18.6
 ruamel.yaml.clib==0.2.8; python_version < '3.13' and platform_python_implementation == 'CPython'
 securesystemslib[crypto]==0.31.0; python_version ~= '3.8'
 sqlalchemy==2.0.27; python_version >= '3.7'
-tuf==3.1.0; python_version >= '3.8'
+tuf@ git+https://github.com/theupdateframework/python-tuf@be55b871dade1c1cb7686312ca9388f2484f8c68
diff --git a/requirements.txt b/requirements.txt
@@ -5,7 +5,6 @@ cffi==1.16.0; python_version >= '3.8'
 charset-normalizer==3.3.2; python_full_version >= '3.7.0'
 click==8.1.7; python_version >= '3.7'
 dynaconf[yaml]==3.2.4; python_version >= '3.8'
-greenlet==3.0.3; platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32')))))
 idna==3.6; python_version >= '3.5'
 isort==5.13.2; python_full_version >= '3.8.0'
 markdown-it-py==3.0.0; python_version >= '3.8'
@@ -21,6 +20,6 @@ ruamel.yaml==0.18.6
 ruamel.yaml.clib==0.2.8; python_version < '3.13' and platform_python_implementation == 'CPython'
 securesystemslib[crypto]==0.31.0; python_version ~= '3.8'
 sqlalchemy==2.0.27; python_version >= '3.7'
-tuf==3.1.0; python_version >= '3.8'
+tuf@ git+https://github.com/theupdateframework/python-tuf@be55b871dade1c1cb7686312ca9388f2484f8c68
 typing-extensions==4.9.0; python_version >= '3.8'
 urllib3==2.2.1; python_version >= '3.8'