From f036e9898a69f5041f9cde02e3652c29e2de1643 Mon Sep 17 00:00:00 2001 From: Ross Brattain Date: Mon, 5 Dec 2016 16:11:54 -0500 Subject: Add support for Python 3 Porting to Python3 using Openstack guidelines: https://wiki.openstack.org/wiki/Python3 This passes unittests on Python 3.5 and passes opnfv_smoke suite Updates: use six for urlparse and urlopen fix exception.message attribute removal run unittests on python3 use unitest.mock on python 3 fix open mock for vsperf fix float division by using delta/eplison comparison use unicode in StringIO use plugin/sample_config.yaml relative path from test case fixed apexlake unittests upgraded to mock 2.0.0 to match python3 unittest.mock features fixed flake8 issues implement safe JSON decode with oslo_serialization.jsonutils.dump_as_bytes() implement safe unicode encode/decode with oslo_utils.encodeutils heat: convert pub key file from bytes to unicode pkg_resources returns raw bytes, in python3 we have to decode this to utf-8 unicode so JSON can encode it for heat template JIRA: YARDSTICK-452 Change-Id: Ib80dd1d0c0eb0592acd832b82f6a7f8f7c20bfda Signed-off-by: Ross Brattain --- requirements.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'requirements.txt') diff --git a/requirements.txt b/requirements.txt index 9c037ed79..7041a96e7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,7 +19,7 @@ extras==0.0.3 fixtures==1.4.0 flake8==2.5.4 funcsigs==0.4 -functools32==3.2.3.post2 +functools32==3.2.3.post2; python_version <= '2.7' futures==3.0.5 iso8601==0.1.11 Jinja2==2.8 @@ -31,7 +31,8 @@ linecache2==1.0.0 lxml==3.5.0 MarkupSafe==0.23 mccabe==0.4.0 -mock==1.3.0 +# upgrade to version 2.0.0 to match python3 unittest.mock features +mock==2.0.0 monotonic==1.0 msgpack-python==0.4.7 netaddr==0.7.18 -- cgit 1.2.3-korg