Elgato_dark/python-tuf
1
0
Fork 0
mirror of https://github.com/theupdateframework/python-tuf synced 2026-05-24 10:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into develop

Browse source
This commit is contained in:
Vladimir Diaz 2017-10-27 08:26:03 -04:00 committed by GitHub
commit 26b4ffef0f
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.rst
View file

@ -203,6 +203,10 @@ Instructions for Contributors
Note: Development of TUF occurs on the "develop" branch of this repository.
Contributions can be made by submitting GitHub pull requests. Submitted code should
follow our `code style guidelines <https://github.com/secure-systems-lab/code-style-guidelines>`_,
which provide examples of what to do (or not to do) when writing Python code.
To facilitate development and installation of edited version of the code base,
developers are encouraged to install `Virtualenv <https://virtualenv.pypa.io/en/latest/index.html>`_,
which is a tool to create isolated Python environments. It includes
@ -285,9 +289,9 @@ License
This work is `dual-licensed <https://en.wikipedia.org/wiki/Multi-licensing>`_
and distributed under the (1) MIT License and (2) Apache License, Version 2.0.
Please see `LICENSE-MIT.txt
<https://github.com/theupdateframework/tuf/tree/develop/tuf/LICENSE-MIT.txt>`_
<https://github.com/theupdateframework/tuf/blob/develop/LICENSE-MIT.txt>`_
and `LICENSE-APACHE.txt
<https://github.com/theupdateframework/tuf/tree/develop/tuf/LICENSE-APACHE.txt>`_.
<https://github.com/theupdateframework/tuf/blob/develop/LICENSE-APACHE.txt>`_.
Acknowledgements

2
dev-requirements.txt
View file

@ -17,7 +17,7 @@
# packages: http://nvie.com/posts/pin-your-packages/
cffi==1.11.2
pynacl==1.1.2
cryptography==2.1.1
cryptography==2.1.2
securesystemslib==0.10.7
# Testing requirements. The rest of the testing dependencies available in