Updated from global requiements and updated .gitreview

- Update for dependencies from global-requirements
- Updated .gitreview for using openstack/ namespace instead of stackforge
- Add ignore H104,E111,E113,H236,H238,E265,H405 haking rules
- Fixed PEP8 errors

Change-Id: Iea3420e93374972d8672537c65dfcf9f7a763478
Closes-Bug: #1469172
Depends-On: I7624cba86c7d5612ac32c14e36fb2d020b599e1c

.gitreview

@@ -1,5 +1,5 @@
 [gerrit]
 host=review.openstack.org
 port=29418
-project=stackforge/murano-dashboard.git
+project=openstack/murano-dashboard.git
 defaultbranch=stable/juno

muranodashboard/api/__init__.py

@@ -20,10 +20,9 @@ from django.contrib.messages import api as msg_api
 from django.utils.encoding import force_unicode
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
-from openstack_dashboard.api import base
-
 import muranoclient.client as client
 from muranoclient.common import exceptions as exc
+from openstack_dashboard.api import base
 
 
 LOG = logging.getLogger(__name__)
@@ -68,7 +67,7 @@ def handled_exceptions(request):
 
 
 def _get_endpoint(request):
-    #prefer location specified in settings for dev purposes
+    # prefer location specified in settings for dev purposes
     endpoint = getattr(settings, 'MURANO_API_URL', None)
 
     if not endpoint:

muranodashboard/catalog/tabs.py

@@ -12,13 +12,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from horizon import tabs
 import logging
 
 from django.utils.translation import ugettext_lazy as _
+from horizon import tabs
 
 from muranodashboard.dynamic_ui import services
 
+
 LOG = logging.getLogger(__name__)
 
 

muranodashboard/catalog/views.py

@@ -35,8 +35,8 @@ from horizon import exceptions
 from horizon.forms import views
 from horizon import messages
 from horizon import tabs
-
 from muranoclient.common import exceptions as exc
+
 from muranodashboard import api
 from muranodashboard.api import packages as pkg_api
 from muranodashboard.catalog import tabs as catalog_tabs

muranodashboard/dynamic_ui/fields.py

@@ -15,7 +15,6 @@
 import copy
 import json
 import logging
-import netaddr
 import re
 
 from django.core.urlresolvers import reverse
@@ -30,11 +29,12 @@ from horizon import exceptions
 from horizon import forms as hz_forms
 from horizon import messages
 from horizon import tables
+from muranoclient.common import exceptions as muranoclient_exc
+import netaddr
 from openstack_dashboard.api import glance
 from openstack_dashboard.api import nova
 import yaql
 
-from muranoclient.common import exceptions as muranoclient_exc
 from muranodashboard.api import packages as pkg_api
 from muranodashboard.environments import api as env_api
 from muranodashboard.openstack.common import versionutils

muranodashboard/dynamic_ui/services.py

@@ -15,6 +15,7 @@
 import logging
 import os
 import re
+
 import yaql
 
 from muranodashboard import api

requirements.txt

@@ -1,10 +1,16 @@
 pbr>=0.6,!=0.7,<1.0
-anyjson>=0.3.3
-iso8601>=0.1.9
-six>=1.7.0
-PyYAML>=3.1.0
-django-floppyforms>=1.1
+anyjson>=0.3.3,<=0.3.3
+iso8601>=0.1.9,<=0.1.10
+six>=1.7.0,<=1.9.0
+PyYAML>=3.1.0,<=3.10
 yaql>=0.2.3,<0.3
 python-muranoclient>=0.5.5,<0.5.6
-django-pyscss>=1.0.3,!=2.0.0  # BSD License (2 clause)
-Django>=1.4,<1.7
+django-pyscss>=1.0.3,<=1.0.6 # BSD License (2 clause)
+Django>=1.4.2,<1.7
+
+# Horizon requirements
+django_compressor>=1.4,<=1.4
+django_openstack_auth>=1.1.7,!=1.1.8,<=1.1.9
+
+# Not listed in global requirements
+django-floppyforms>=1.1

test-requirements.txt

@@ -1,19 +1,17 @@
-hacking>=0.8.0,<0.9
+hacking>=0.9.2,<0.10
 
-coverage>=3.6
+coverage>=3.6,<=3.7.1
 django-nose
-nose
+nose<=1.3.1
 openstack.nose_plugin>=0.7
 nosehtmloutput>=0.0.3
 
-testtools>=0.9.34
-mock>=1.0
-mox>=0.5.3
+testtools>=0.9.34,!=1.4.0,<=1.5.0
+mock>=1.0,<=1.0.1
+mox>=0.5.3,<=0.5.3
 
 # Docs Requirements
-sphinx>=1.1.2,<1.2
-docutils==0.9.1
+sphinx>=1.1.2,!=1.2.0,<1.3
 
-# Horizon requirements
-django_compressor>=1.3
-django_openstack_auth>=1.1.4
+# Not listed in global requirements
+docutils==0.9.1

tox.ini

@@ -37,8 +37,16 @@ commands = flake8
 downloadcache = ~/cache/pip
 
 [flake8]
+# H104  File contains nothing but comments
+# E111 indentation is not a multiple of four
+# E113 unexpected indentation
+# H236  Python 3.x incompatible __metaclass__, use six.add_metaclass()
+# H238  old style class declaration, use new style (inherit from `object`)
+# E265 block comment should start with '# '
+# H405 multi line docstring summary not separated with an empty line
 # H701 Empty localization string
-ignore = H701,H302
+# H904  Wrap long lines in parentheses instead of a backslash
+ignore = H104,E111,E113,H236,H238,E265,H302,H305,H307,H405,H701,H904
 show-source = true
 builtins = _
 exclude=.build,.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools,horizon,settings.py,*/local/*