Merge branch 'develop' into fix_ssl_build_failure

ci-requirements.txt

@@ -0,0 +1,7 @@
+cryptography
+pynacl
+securesystemslib
+six
+iso8601
+coverage
+coveralls

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'

requirements.txt

@@ -1,8 +1,5 @@
 cryptography
 pynacl
-pycrypto
 securesystemslib
 six
 iso8601
-coverage
-coveralls

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',

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}