diff --git a/global-requirements.txt b/global-requirements.txt index 084dc2dea5..985f245fc2 100644 --- a/global-requirements.txt +++ b/global-requirements.txt @@ -198,7 +198,6 @@ psutil # BSD pyasn1!=0.2.3 # BSD pyasn1-modules # BSD pycadf!=2.0.0 # Apache-2.0 -pycrypto # Public Domain PyECLib # BSD pyghmi # Apache-2.0 pyinotify;sys_platform!='win32' and sys_platform!='darwin' and sys_platform!='sunos5' # MIT diff --git a/lower-constraints.txt b/lower-constraints.txt index bf4640eb62..2448169719 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -172,7 +172,6 @@ couchdb===0.8 backports.ssl-match-hostname===3.5.0.1 openstack-release-test===0.8.0 pylxd===2.2.5 -pycryptodomex===3.4.7 anyjson===0.3.3 requests-mock===1.2.0 os-apply-config===5.0.0 @@ -256,7 +255,6 @@ uritemplate===3.0.0 django-babel===0.6.2 docutils===0.11 notifier===1.0.3 -pycrypto===2.6 ujson===1.35 selenium===2.50.1 python-glareclient===0.3.0 diff --git a/openstack_requirements/tests/files/gr-base.txt b/openstack_requirements/tests/files/gr-base.txt index 3b55a279ea..081a06fc6f 100644 --- a/openstack_requirements/tests/files/gr-base.txt +++ b/openstack_requirements/tests/files/gr-base.txt @@ -42,7 +42,6 @@ pip>=1.0 PrettyTable>=0.6,<0.8 psutil<1.0 pyasn1 -pycrypto>=2.6 pymongo>=2.4 pyOpenSSL pyparsing>=1.5.7,<2.0 diff --git a/openstack_requirements/tests/files/project-with-bad-requirement.txt b/openstack_requirements/tests/files/project-with-bad-requirement.txt index 72fed7c407..10abb09b19 100644 --- a/openstack_requirements/tests/files/project-with-bad-requirement.txt +++ b/openstack_requirements/tests/files/project-with-bad-requirement.txt @@ -16,7 +16,6 @@ boto sqlalchemy-migrate>=0.7 httplib2 kombu>2.4.7 -pycrypto>=2.1.0alpha1 iso8601>=0.1.4 oslo.config>=1.1.0 diff --git a/openstack_requirements/tests/files/project.txt b/openstack_requirements/tests/files/project.txt index 5a2cb6efca..b02c481362 100644 --- a/openstack_requirements/tests/files/project.txt +++ b/openstack_requirements/tests/files/project.txt @@ -16,7 +16,6 @@ boto sqlalchemy-migrate>=0.7 httplib2 kombu>2.4.7 -pycrypto>=2.1.0alpha1 iso8601>=0.1.4 oslo.config>=1.1.0 diff --git a/openstack_requirements/tests/files/upper-constraints.txt b/openstack_requirements/tests/files/upper-constraints.txt index 1ec51877cd..11838e82ef 100644 --- a/openstack_requirements/tests/files/upper-constraints.txt +++ b/openstack_requirements/tests/files/upper-constraints.txt @@ -234,7 +234,6 @@ uritemplate===3.0.0 django-babel===0.5.1 docutils===0.13.1 notifier===1.0.3 -pycrypto===2.6.1 ujson===1.35 selenium===3.3.0 mypy===0.501;python_version=='3.4' @@ -374,7 +373,6 @@ yaql===1.1.3 requestsexceptions===1.2.0 testresources===2.0.1 falcon===1.1.0 -pycryptodome===3.4.5 pyldap===2.4.28 Flask-RESTful===0.3.5 GitPython===2.1.3 diff --git a/openstack_requirements/tests/test_update.py b/openstack_requirements/tests/test_update.py index 7bfc838156..dc45f41a5e 100644 --- a/openstack_requirements/tests/test_update.py +++ b/openstack_requirements/tests/test_update.py @@ -49,7 +49,7 @@ class SmokeTest(testtools.TestCase): self.assertIn("jsonschema!=1.4.0,<2,>=1.0.0", reqs) self.assertIn("python-keystoneclient>=0.4.1", reqs) self.assertIn("SQLAlchemy<=0.7.99,>=0.7", reqs) - expected = ('Version change for: greenlet, SQLAlchemy, eventlet, PasteDeploy, routes, WebOb, wsgiref, boto, kombu, pycrypto, python-swiftclient, lxml, jsonschema, python-keystoneclient\n' # noqa + expected = ('Version change for: greenlet, SQLAlchemy, eventlet, PasteDeploy, routes, WebOb, wsgiref, boto, kombu, python-swiftclient, lxml, jsonschema, python-keystoneclient\n' # noqa """Updated %(project)s/requirements.txt: greenlet>=0.3.1 -> greenlet>=0.3.2 SQLAlchemy>=0.7.8,<=1.0.17 -> SQLAlchemy<=0.7.99,>=0.7 @@ -60,7 +60,6 @@ class SmokeTest(testtools.TestCase): wsgiref -> wsgiref>=0.1.2 boto -> boto>=2.4.0 kombu>2.4.7 -> kombu>=2.4.8 - pycrypto>=2.1.0alpha1 -> pycrypto>=2.6 python-swiftclient>=1.2,<4 -> python-swiftclient>=1.2 lxml -> lxml>=2.3 jsonschema -> jsonschema!=1.4.0,<2,>=1.0.0 @@ -161,7 +160,7 @@ class UpdateTest(testtools.TestCase): capture = six.StringIO() project.write( common.project_project, actions, capture, False, True) - expected = ('Version change for: greenlet, SQLAlchemy, eventlet, PasteDeploy, routes, WebOb, wsgiref, boto, kombu, pycrypto, python-swiftclient, lxml, jsonschema, python-keystoneclient\n' # noqa + expected = ('Version change for: greenlet, SQLAlchemy, eventlet, PasteDeploy, routes, WebOb, wsgiref, boto, kombu, python-swiftclient, lxml, jsonschema, python-keystoneclient\n' # noqa """Updated %(project)s/requirements.txt: greenlet>=0.3.1 -> greenlet>=0.3.2 SQLAlchemy>=0.7.8,<=1.0.17 -> SQLAlchemy<=0.7.99,>=0.7 @@ -172,7 +171,6 @@ class UpdateTest(testtools.TestCase): wsgiref -> wsgiref>=0.1.2 boto -> boto>=2.4.0 kombu>2.4.7 -> kombu>=2.4.8 - pycrypto>=2.1.0alpha1 -> pycrypto>=2.6 python-swiftclient>=1.2,<4 -> python-swiftclient>=1.2 lxml -> lxml>=2.3 jsonschema -> jsonschema!=1.4.0,<2,>=1.0.0 @@ -194,7 +192,7 @@ Updated %(project)s/test-requirements.txt: project.write( common.project_project, actions, capture, True, True) expected = ("""Syncing %(project)s/requirements.txt -Version change for: greenlet, SQLAlchemy, eventlet, PasteDeploy, routes, WebOb, wsgiref, boto, kombu, pycrypto, python-swiftclient, lxml, jsonschema, python-keystoneclient\n""" # noqa +Version change for: greenlet, SQLAlchemy, eventlet, PasteDeploy, routes, WebOb, wsgiref, boto, kombu, python-swiftclient, lxml, jsonschema, python-keystoneclient\n""" # noqa """Updated %(project)s/requirements.txt: greenlet>=0.3.1 -> greenlet>=0.3.2 SQLAlchemy>=0.7.8,<=1.0.17 -> SQLAlchemy<=0.7.99,>=0.7 @@ -205,7 +203,6 @@ Version change for: greenlet, SQLAlchemy, eventlet, PasteDeploy, routes, WebOb, wsgiref -> wsgiref>=0.1.2 boto -> boto>=2.4.0 kombu>2.4.7 -> kombu>=2.4.8 - pycrypto>=2.1.0alpha1 -> pycrypto>=2.6 python-swiftclient>=1.2,<4 -> python-swiftclient>=1.2 lxml -> lxml>=2.3 jsonschema -> jsonschema!=1.4.0,<2,>=1.0.0 diff --git a/upper-constraints.txt b/upper-constraints.txt index 4e68bb7151..d5b2148e56 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -164,7 +164,6 @@ cryptography===2.2.2 backports.ssl-match-hostname===3.5.0.1;python_version=='2.7' openstack-release-test===1.1.0 pylxd===2.2.7 -pycryptodomex===3.6.3 anyjson===0.3.3 requests-mock===1.5.0 os-apply-config===9.0.0 @@ -253,7 +252,6 @@ uritemplate===3.0.0 django-babel===0.6.2 docutils===0.14 notifier===1.0.3 -pycrypto===2.6.1 ujson===1.35 selenium===3.13.0 python-glareclient===0.5.3