Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update securesystemslib extras #2750

Merged
merged 2 commits into from
Jan 6, 2025
Merged

Update securesystemslib extras #2750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d5c5cd
requirements: pynacl is no longer needed
jku Dec 11, 2024
83ec7be
requirements: Generate pinned list
jku Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions docs/INSTALLATION.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,13 @@ algorithms, and more performant backends. Opt-in is available via

.. note::

Please consult with underlying crypto backend installation docs --
`cryptography <https://cryptography.io/en/latest/installation/>`_ and
`pynacl <https://pynacl.readthedocs.io/en/latest/install/>`_ --
Please consult with underlying crypto backend installation docs. e.g.
`cryptography <https://cryptography.io/en/latest/installation/>`_
for possible system dependencies.

::

python3 -m pip securesystemslib[crypto,pynacl] tuf
python3 -m pip securesystemslib[crypto] tuf


Install for development
Expand Down
2 changes: 1 addition & 1 deletion requirements/main.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
# 'pinned.txt' is updated on GitHub with Dependabot, which
# triggers CI/CD builds to automatically test against updated dependencies.
#
securesystemslib[crypto, pynacl]
securesystemslib[crypto]
requests
32 changes: 23 additions & 9 deletions requirements/pinned.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
certifi==2024.12.14 # via requests
cffi==1.17.1 # via cryptography, pynacl
charset-normalizer==3.4.1 # via requests
cryptography==44.0.0 # via securesystemslib
idna==3.10 # via requests
pycparser==2.22 # via cffi
pynacl==1.5.0 # via securesystemslib
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --output-file=requirements/pinned.txt --strip-extras requirements/main.txt
#
certifi==2024.12.14
# via requests
cffi==1.17.1
# via cryptography
charset-normalizer==3.4.1
# via requests
cryptography==44.0.0
# via securesystemslib
idna==3.10
# via requests
pycparser==2.22
# via cffi
requests==2.32.3
securesystemslib[crypto,pynacl]==1.2.0
urllib3==2.3.0 # via requests
# via -r requirements/main.txt
securesystemslib==1.2.0
# via -r requirements/main.txt
urllib3==2.3.0
Comment on lines +21 to +22
Copy link
Member Author

@jku jku Dec 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the extras are no longer documented in this file since pip-compile is changing the default output to be compatible with "--constraints" (meaning no extras): this seems sensible.

I'm explicitly using pip-compile --strip-extras as the command so we won't get bitten by one version of pip-compile having a different default than another version at some point in future

# via requests
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ allowlist_externals = python3
# Must to be invoked explicitly with, e.g. `tox -e with-sslib-main`
[testenv:with-sslib-main]
commands_pre =
python3 -m pip install --force-reinstall git+https://github.com/secure-systems-lab/securesystemslib.git@main#egg=securesystemslib[crypto,pynacl]
python3 -m pip install --force-reinstall git+https://github.com/secure-systems-lab/securesystemslib.git@main#egg=securesystemslib[crypto]

commands =
python3 -m coverage run aggregate_tests.py
Expand Down
Loading