Skip to content

Commit

Permalink
dep: remove obsolete optional pynacl dependency
Browse files Browse the repository at this point in the history
Signed-off-by: Lukas Puehringer <[email protected]>
  • Loading branch information
lukpueh committed Apr 30, 2024
1 parent 71ea38b commit d56dba2
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 17 deletions.
11 changes: 0 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,6 @@ dependencies = [
]
dynamic = ["version"]

[project.optional-dependencies]
# Install pynacl as optional dependency to use with securesystemslib, as a
# workaround for `"ssl-pynacl": ["securesystemslib[pynacl]>=0.11.3"]`,
# which currently is not supported in "extra_require" (see pypa/pip#4957).
# TODO: Keep track of changes (version, additional requirements) under the
# "pynacl" key in securesystemslib's setup.py.
# https://github.com/secure-systems-lab/securesystemslib/blob/master/setup.py#L101
pynacl = [
"pynacl>1.2.0",
]

[project.scripts]
in-toto-mock = "in_toto.in_toto_mock:main"
in-toto-record = "in_toto.in_toto_record:main"
Expand Down
5 changes: 1 addition & 4 deletions requirements-pinned.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ attrs==23.2.0
cffi==1.16.0
# via
# cryptography
# pynacl
cryptography==42.0.5
# via securesystemslib
iso8601==2.1.0
Expand All @@ -18,11 +17,9 @@ pathspec==0.12.1
# via -r requirements.txt
pycparser==2.22
# via cffi
pynacl==1.5.0
# via securesystemslib
python-dateutil==2.9.0.post0
# via -r requirements.txt
securesystemslib[crypto,pynacl]==0.31.0
securesystemslib[crypto]==0.31.0
# via -r requirements.txt
six==1.16.0
# via python-dateutil
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# 'requirements-pinned.txt' is updated on GitHub with Dependabot, which
# triggers CI/CD builds to automatically test against updated dependencies.
securesystemslib[crypto,pynacl]>=0.28.0
securesystemslib[crypto]>=0.28.0
attrs
python-dateutil
iso8601
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ commands =
# Must to be invoked explicitly with, e.g. `tox -e with-sslib-main`
[testenv:with-sslib-main]
commands_pre =
pip install --force-reinstall git+https://github.com/secure-systems-lab/securesystemslib.git@main#egg=securesystemslib[crypto,pynacl]
pip install --force-reinstall git+https://github.com/secure-systems-lab/securesystemslib.git@main#egg=securesystemslib[crypto]

commands =
coverage run tests/runtests.py
Expand Down

0 comments on commit d56dba2

Please sign in to comment.