From 992f7361c401b170607c1bce74d05a88d592ec52 Mon Sep 17 00:00:00 2001 From: Vladimir Diaz Date: Thu, 9 Nov 2017 11:12:02 -0500 Subject: [PATCH 1/5] Add pip ci-requirements file for continuous integration Signed-off-by: Vladimir Diaz --- ci-requirements.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 ci-requirements.txt diff --git a/ci-requirements.txt b/ci-requirements.txt new file mode 100644 index 00000000..76e4a72f --- /dev/null +++ b/ci-requirements.txt @@ -0,0 +1,7 @@ +cryptography +pynacl +securesystemslib +six +iso8601 +coverage +coveralls From 6c869f9c1f0407c5d356ab7e584586be3cae927f Mon Sep 17 00:00:00 2001 From: Vladimir Diaz Date: Thu, 9 Nov 2017 11:12:48 -0500 Subject: [PATCH 2/5] Drop support for Python 3.3 and use ci-requirements in tox.ini Signed-off-by: Vladimir Diaz --- tox.ini | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 55e9d108..c4afbadc 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py27, py33, py34, py35, py36 +envlist = py27, py34, py35, py36 [testenv] changedir = tests @@ -12,9 +12,8 @@ changedir = tests commands = coverage run --source tuf aggregate_tests.py coverage report -m --fail-under 97 - coverage html deps = - -r{toxinidir}/requirements.txt + -r{toxinidir}/ci-requirements.txt install_command = pip install --pre {opts} {packages} From 8d6bd4d1e49b11e73d027fd92ffbccf661e35110 Mon Sep 17 00:00:00 2001 From: Vladimir Diaz Date: Thu, 9 Nov 2017 11:14:08 -0500 Subject: [PATCH 3/5] Specify minimum versions of dependencies in setup.py Signed-off-by: Vladimir Diaz --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 03de396b..a8dc181f 100755 --- a/setup.py +++ b/setup.py @@ -97,7 +97,6 @@ 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', @@ -105,7 +104,7 @@ 'Topic :: Security', 'Topic :: Software Development' ], - install_requires = ['iso8601', 'six', 'securesystemslib>=0.10.7'], + install_requires = ['iso8601>=0.1.12', 'six>=1.11.0', 'securesystemslib>=0.10.8'], packages = find_packages(exclude=['tests']), scripts = [ 'tuf/scripts/basic_client.py', From f8e32f753f8af4447a2216b8a581a89086ca9a92 Mon Sep 17 00:00:00 2001 From: Vladimir Diaz Date: Thu, 9 Nov 2017 11:15:40 -0500 Subject: [PATCH 4/5] Remove obsolete & testing dependencies from requirements.txt Signed-off-by: Vladimir Diaz --- requirements.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 287deaf3..fb0b1f4b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,5 @@ cryptography pynacl -pycrypto securesystemslib six iso8601 -coverage -coveralls From 3310cb3d267f9a264af17e3c5bb44de3fd6e7eba Mon Sep 17 00:00:00 2001 From: Vladimir Diaz Date: Thu, 9 Nov 2017 11:18:25 -0500 Subject: [PATCH 5/5] Add missing dependencies and update securesystemslib in dev-requirements.txt Signed-off-by: Vladimir Diaz --- dev-requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index a5509f89..fbe53865 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -16,9 +16,11 @@ # signatures. The minimal install can only verify ed25519 signatures. Pinned # packages: http://nvie.com/posts/pin-your-packages/ cffi==1.11.2 +six=1.11.0 +iso8601=0.1.12 pynacl==1.2.0 cryptography==2.1.3 -securesystemslib==0.10.7 +securesystemslib==0.10.8 # Testing requirements. The rest of the testing dependencies available in # 'tox.ini'