From b70482622c04246e01692435ffaba87a445b6b49 Mon Sep 17 00:00:00 2001 From: sslypushenko Date: Tue, 22 Jul 2014 09:37:21 +0000 Subject: [PATCH] py33 tests fixed Some requirements were updated to py33 compiliant versions. Also imports were modified according to py33 compatibility. https://storyboard.openstack.org/#!/story/117 Change-Id: I4422f1bcfb02fd27b0c275ef58b19fdfb386cd17 --- .testr.conf | 2 +- tests/__init__.py => __init__.py | 0 refstack/admin.py | 6 +++--- refstack/api.py | 2 +- refstack/app.py | 12 ++++++------ refstack/models.py | 2 +- refstack/tests/__init__.py | 0 {tests => refstack/tests}/unit/__init__.py | 0 {tests => refstack/tests}/unit/tests.py | 0 refstack/utils.py | 4 ++-- requirements.txt | 10 +++++----- tox.ini | 5 ++++- 12 files changed, 23 insertions(+), 20 deletions(-) rename tests/__init__.py => __init__.py (100%) create mode 100644 refstack/tests/__init__.py rename {tests => refstack/tests}/unit/__init__.py (100%) rename {tests => refstack/tests}/unit/tests.py (100%) diff --git a/.testr.conf b/.testr.conf index 2109af6c..bd99ad88 100644 --- a/.testr.conf +++ b/.testr.conf @@ -1,4 +1,4 @@ [DEFAULT] -test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION +test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./refstack -s ./refstack/tests $LISTOPT $IDOPTION test_id_option=--load-list $IDFILE test_list_option=--list diff --git a/tests/__init__.py b/__init__.py similarity index 100% rename from tests/__init__.py rename to __init__.py diff --git a/refstack/admin.py b/refstack/admin.py index 39074dbf..c576ff73 100644 --- a/refstack/admin.py +++ b/refstack/admin.py @@ -2,11 +2,11 @@ import flask from flask.ext.admin.contrib import sqla -from refstack import models +import models # Global admin object -from .extensions import admin -from .extensions import db +from refstack.extensions import admin +from refstack.extensions import db class SecureView(sqla.ModelView): diff --git a/refstack/api.py b/refstack/api.py index 102667fc..047528f6 100755 --- a/refstack/api.py +++ b/refstack/api.py @@ -23,7 +23,7 @@ Flask-Restful later on. import flask from flask.ext import restless -from refstack import models +import models from refstack.extensions import api diff --git a/refstack/app.py b/refstack/app.py index 5f12898d..f063ab5a 100755 --- a/refstack/app.py +++ b/refstack/app.py @@ -15,11 +15,11 @@ # import os from flask import Flask, render_template -from .config import DefaultConfig -from refstack import admin -from refstack import api -from .extensions import db -from .extensions import oid +from refstack.config import DefaultConfig +import admin +import api +from refstack.extensions import db +from refstack.extensions import oid from refstack import utils @@ -66,7 +66,7 @@ def create_app(config=None, app_name=None, blueprints=None): configure_error_handlers(app) if app.debug: - print utils.dump_config(app) + print(utils.dump_config(app)) return app diff --git a/refstack/models.py b/refstack/models.py index becf7eb9..02f15625 100755 --- a/refstack/models.py +++ b/refstack/models.py @@ -16,7 +16,7 @@ from datetime import datetime -from .extensions import db +from refstack.extensions import db class User(db.Model): diff --git a/refstack/tests/__init__.py b/refstack/tests/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/unit/__init__.py b/refstack/tests/unit/__init__.py similarity index 100% rename from tests/unit/__init__.py rename to refstack/tests/unit/__init__.py diff --git a/tests/unit/tests.py b/refstack/tests/unit/tests.py similarity index 100% rename from tests/unit/tests.py rename to refstack/tests/unit/tests.py diff --git a/refstack/utils.py b/refstack/utils.py index 24413736..c94b7eb0 100755 --- a/refstack/utils.py +++ b/refstack/utils.py @@ -115,7 +115,7 @@ def make_dir(dir_path): try: if not os.path.exists(dir_path): os.mkdir(dir_path) - except Exception, e: + except Exception as e: raise e @@ -124,4 +124,4 @@ def make_dir(dir_path): def dump_config(app): """Useful to dump app config for debug purposes.""" - return pprint.pformat(dict(app.config.iteritems())) + return pprint.pformat(dict(app.config.items())) diff --git a/requirements.txt b/requirements.txt index 88746e71..ce49e3cf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,16 @@ Flask==0.10.1 Flask-Admin==1.0.7 -Flask-Login==0.1.3 -Flask-Mail==0.8.2 -Flask-OpenID==1.1.1 +Flask-Login==0.2.11 +Flask-Mail==0.9.0 +Flask-OpenID==1.2.1 Flask-Principal==0.3.5 Flask-SQLAlchemy==1.0 Flask-Security==1.6.3 Flask-WTF==0.8.3 -Flask-Restless==0.12.0 +Flask-Restless==0.13.1 SQLAlchemy==0.8.3 WTForms==1.0.4 -Werkzeug==0.8.3 +Werkzeug==0.9.6 alembic==0.5.0 gunicorn==0.17.4 pyOpenSSL==0.13 diff --git a/tox.ini b/tox.ini index 0d88f2e8..27fc2a0a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,8 @@ [tox] -envlist = py27,py33,pep8 +# py33 tests should be runned before py27 +# it is a workaround for testr bug +# https://bugs.launchpad.net/testrepository/+bug/1229445 +envlist = py33,py27,pep8 minversion = 1.6 skipsdist = True