Fix repository-service-tuf#507 (WIP)

Signed-off-by: Lukas Puehringer <[email protected]>

.github/dependabot.yml

@@ -10,3 +10,6 @@ updates:
       prefix: "build"
       include: "scope"
     open-pull-requests-limit: 10
+
+
+  # TODO: update runtime and dev dependencies

.pre-commit-config.yaml

@@ -32,13 +32,6 @@ repos:
     exclude: tests
 - repo: local
   hooks:
-    - id: tox-requirements
-      name: run requirements check from tox
-      description: Checks if `make requirements` is up-to-date
-      entry: tox -e requirements
-      language: system
-      pass_filenames: false
-      verbose: true
     - id: tox-mypy
       name: run typing check from tox
       description: Checks typing with `mypy`

.readthedocs.yaml

@@ -23,4 +23,3 @@ sphinx:
 # Optionally declare the Python requirements required to build your docs
 python:
   install:
-    - requirements: docs/requirements.txt

CONTRIBUTING.rst

@@ -128,37 +128,18 @@ pre-commit tool.
 Now ``pre-commit`` will run automatically on ``git commit``.
 
 
-Running RSTUF CLI
-~~~~~~~~~~~~~~~~~
-
-.. code:: shell
-    $ pip install -e .
-
-.. code:: shell
-
-    $ pip install -e .
-
-    $ rstuf
-
-    Usage: rstuf [OPTIONS] COMMAND [ARGS]...
-
-    Repository Service for TUF Command Line Interface (CLI).
 
 How to add new requirements
 ---------------------------
 
-Install the requirements package.
-
-The flag -d will install the development requirements.
+- Add runtime requirements to pyproject.toml.
+- Add development requirements to Pipfile. You can use this command
 
 .. code:: shell
 
     $ pipenv install -d <package>
-    $ pipenv install <package>
-
 
-Update all project requirements
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- Update Pipfile.lock afterwards
 
 .. code:: shell
 

Makefile

@@ -9,8 +9,6 @@ tests:
 
 requirements:
 	pipenv lock
-	pipenv requirements > requirements.txt
-	pipenv requirements --dev > requirements-dev.txt
 
 precommit:
 	pre-commit install

Pipfile

@@ -3,20 +3,6 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 name = "pypi"
 
-[packages]
-rich-click = "*"
-securesystemslib = "*"
-click = "*"
-rich = "*"
-auto-click-auto = "*"
-PyNaCl = "==1.5.0"
-requests = "*"
-tuf = "==3.1.0"
-dynaconf = {extras = ["yaml"], version = "*"}
-isort = "*"
-sqlalchemy = "*"
-psycopg2 = "*"
-
 [dev-packages]
 black = "*"
 isort = "*"
@@ -43,6 +29,7 @@ build = "*"
 pre-commit = "*"
 bandit = "*"
 types-requests = "*"
+repository-service-tuf-cli = {editable = true, path = ".", extras=["psycopg2", "sqlalchemy"]}
 
 [requires]
 python_version = "3.9"

tox.ini

@@ -1,11 +1,9 @@
 [tox]
 isolated_build = true
-envlist = py39,py310,py311,lint,typing,requirements,precommit,test
+envlist = py39,py310,py311,lint,typing,precommit,test
 skipsdist = true
 
 [testenv]
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/requirements-dev.txt
 
 [testenv:lint]
 deps = pre-commit
@@ -33,16 +31,6 @@ allowlist_externals = coverage
 commands =
     python -m pytest --cov-report=xml --cov-report=term --cov-config=tox.ini --cov -n auto -vv tests/
 
-[testenv:requirements]
-description="Check if `make requirements` is up-to-date."
-deps = pipenv
-skipsdist=false
-allowlist_externals =
-    bash
-commands =
-    pipenv --version
-    bash -c 'diff -w requirements.txt <(pipenv requirements)'
-    bash -c 'diff -w requirements-dev.txt <(pipenv requirements --dev)'
 
 [testenv:precommit]
 description="Check if `pre-commit autoupdate` is up-to-date."
@@ -59,7 +47,6 @@ commands =
     bash -c 'rm tmp-tox-precommit.yaml'
 
 [testenv:docs]
-deps = -r{toxinidir}/docs/requirements.txt
 allowlist_externals =
     plantuml
 commands =
@@ -69,6 +56,6 @@ commands =
 
 [gh-actions]
 python =
-    3.9: py39,pep8,lint,typing,requirements,precommit,test,docs
-    3.10: py310,pep8,lint,typing,requirements,precommit,test,docs
-    3.11: py311,pep8,lint,typing,requirements,precommit,test,docs
+    3.9: py39,pep8,lint,typing,precommit,test,docs
+    3.10: py310,pep8,lint,typing,precommit,test,docs
+    3.11: py311,pep8,lint,typing,precommit,test,docs