You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/10/04 20:07:57 UTC
[airavata-django-portal] 07/09: AIRAVATA-2868 Fixing up imports
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 6a7c9049f979992fcc0fa35fb23762b06090891b
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Sat Sep 29 11:42:07 2018 -0400
AIRAVATA-2868 Fixing up imports
---
django_airavata/apps/api/exceptions.py | 1 -
django_airavata/apps/api/urls.py | 4 ++--
django_airavata/apps/api/view_utils.py | 5 +++--
django_airavata/apps/auth/utils.py | 4 ++--
.../management/commands/load_cybergateway_data.py | 5 ++---
.../management/commands/load_default_gateway.py | 5 ++---
.../management/commands/load_hpcgateway_data.py | 5 ++---
.../commands/load_nanoconfinement_data.py | 5 ++---
.../base/management/commands/load_osu_data.py | 5 ++---
.../base/management/commands/load_phasta_data.py | 5 ++---
.../base/management/commands/load_seagrid_data.py | 5 ++---
.../management/commands/load_searching_sra_data.py | 5 ++---
.../base/management/commands/load_simccs_data.py | 5 ++---
.../management/commands/load_simvascular_data.py | 5 ++---
.../base/management/commands/load_siu_data.py | 5 ++---
.../management/commands/load_south_dakota_data.py | 5 ++---
django_airavata/wagtailapps/base/models.py | 8 ++++----
.../base/templatetags/navigation_tags.py | 22 +++++-----------------
django_airavata/wagtailapps/base/wagtail_hooks.py | 3 ++-
setup.py | 1 +
20 files changed, 43 insertions(+), 65 deletions(-)
diff --git a/django_airavata/apps/api/exceptions.py b/django_airavata/apps/api/exceptions.py
index a6435ae..e004c61 100644
--- a/django_airavata/apps/api/exceptions.py
+++ b/django_airavata/apps/api/exceptions.py
@@ -5,7 +5,6 @@ from rest_framework.response import Response
from rest_framework.views import exception_handler
from thrift.Thrift import TException
-
log = logging.getLogger(__name__)
diff --git a/django_airavata/apps/api/urls.py b/django_airavata/apps/api/urls.py
index 7073252..1227c62 100644
--- a/django_airavata/apps/api/urls.py
+++ b/django_airavata/apps/api/urls.py
@@ -1,9 +1,9 @@
-from . import views
+import logging
from django.conf.urls import include, url
from rest_framework import routers
-import logging
+from . import views
logger = logging.getLogger(__name__)
diff --git a/django_airavata/apps/api/view_utils.py b/django_airavata/apps/api/view_utils.py
index 08dd955..b1bdb70 100644
--- a/django_airavata/apps/api/view_utils.py
+++ b/django_airavata/apps/api/view_utils.py
@@ -5,7 +5,7 @@ from django.http import Http404
from rest_framework import mixins, pagination
from rest_framework.response import Response
from rest_framework.reverse import reverse
-from rest_framework.utils.urls import replace_query_param, remove_query_param
+from rest_framework.utils.urls import remove_query_param, replace_query_param
from rest_framework.viewsets import GenericViewSet
@@ -134,7 +134,8 @@ class APIResultPagination(pagination.LimitOffsetPagination):
def get_limit(self, request):
# If limit <= 0 then don't paginate
- if self.limit_query_param in request.query_params and int(request.query_params[self.limit_query_param]) <= 0:
+ if self.limit_query_param in request.query_params and int(
+ request.query_params[self.limit_query_param]) <= 0:
return None
return super().get_limit(request)
diff --git a/django_airavata/apps/auth/utils.py b/django_airavata/apps/auth/utils.py
index 77994bc..a4691d7 100644
--- a/django_airavata/apps/auth/utils.py
+++ b/django_airavata/apps/auth/utils.py
@@ -2,11 +2,11 @@
import time
-from airavata.model.security.ttypes import AuthzToken
-
from django.conf import settings
from django.contrib.auth import authenticate
+from airavata.model.security.ttypes import AuthzToken
+
def get_authz_token(request):
"""Construct AuthzToken instance from session; refresh token if needed."""
diff --git a/django_airavata/wagtailapps/base/management/commands/load_cybergateway_data.py b/django_airavata/wagtailapps/base/management/commands/load_cybergateway_data.py
index a6f92b3..bab1d3a 100644
--- a/django_airavata/wagtailapps/base/management/commands/load_cybergateway_data.py
+++ b/django_airavata/wagtailapps/base/management/commands/load_cybergateway_data.py
@@ -1,10 +1,9 @@
import os
from django.conf import settings
-from django.core.management.base import BaseCommand
from django.core.management import call_command
-
-from wagtail.core.models import Site, Page
+from django.core.management.base import BaseCommand
+from wagtail.core.models import Page, Site
class Command(BaseCommand):
diff --git a/django_airavata/wagtailapps/base/management/commands/load_default_gateway.py b/django_airavata/wagtailapps/base/management/commands/load_default_gateway.py
index 0e4afef..6640f3c 100644
--- a/django_airavata/wagtailapps/base/management/commands/load_default_gateway.py
+++ b/django_airavata/wagtailapps/base/management/commands/load_default_gateway.py
@@ -1,10 +1,9 @@
import os
from django.conf import settings
-from django.core.management.base import BaseCommand
from django.core.management import call_command
-
-from wagtail.core.models import Site, Page
+from django.core.management.base import BaseCommand
+from wagtail.core.models import Page, Site
class Command(BaseCommand):
diff --git a/django_airavata/wagtailapps/base/management/commands/load_hpcgateway_data.py b/django_airavata/wagtailapps/base/management/commands/load_hpcgateway_data.py
index 7ef07d0..d9c815f 100644
--- a/django_airavata/wagtailapps/base/management/commands/load_hpcgateway_data.py
+++ b/django_airavata/wagtailapps/base/management/commands/load_hpcgateway_data.py
@@ -1,10 +1,9 @@
import os
from django.conf import settings
-from django.core.management.base import BaseCommand
from django.core.management import call_command
-
-from wagtail.core.models import Site, Page
+from django.core.management.base import BaseCommand
+from wagtail.core.models import Page, Site
class Command(BaseCommand):
diff --git a/django_airavata/wagtailapps/base/management/commands/load_nanoconfinement_data.py b/django_airavata/wagtailapps/base/management/commands/load_nanoconfinement_data.py
index c1421e5..ee66794 100644
--- a/django_airavata/wagtailapps/base/management/commands/load_nanoconfinement_data.py
+++ b/django_airavata/wagtailapps/base/management/commands/load_nanoconfinement_data.py
@@ -1,10 +1,9 @@
import os
from django.conf import settings
-from django.core.management.base import BaseCommand
from django.core.management import call_command
-
-from wagtail.core.models import Site, Page
+from django.core.management.base import BaseCommand
+from wagtail.core.models import Page, Site
class Command(BaseCommand):
diff --git a/django_airavata/wagtailapps/base/management/commands/load_osu_data.py b/django_airavata/wagtailapps/base/management/commands/load_osu_data.py
index efe49c3..aaa1e08 100644
--- a/django_airavata/wagtailapps/base/management/commands/load_osu_data.py
+++ b/django_airavata/wagtailapps/base/management/commands/load_osu_data.py
@@ -1,10 +1,9 @@
import os
from django.conf import settings
-from django.core.management.base import BaseCommand
from django.core.management import call_command
-
-from wagtail.core.models import Site, Page
+from django.core.management.base import BaseCommand
+from wagtail.core.models import Page, Site
class Command(BaseCommand):
diff --git a/django_airavata/wagtailapps/base/management/commands/load_phasta_data.py b/django_airavata/wagtailapps/base/management/commands/load_phasta_data.py
index e026d70..814e628 100644
--- a/django_airavata/wagtailapps/base/management/commands/load_phasta_data.py
+++ b/django_airavata/wagtailapps/base/management/commands/load_phasta_data.py
@@ -1,10 +1,9 @@
import os
from django.conf import settings
-from django.core.management.base import BaseCommand
from django.core.management import call_command
-
-from wagtail.core.models import Site, Page
+from django.core.management.base import BaseCommand
+from wagtail.core.models import Page, Site
class Command(BaseCommand):
diff --git a/django_airavata/wagtailapps/base/management/commands/load_seagrid_data.py b/django_airavata/wagtailapps/base/management/commands/load_seagrid_data.py
index e8523a1..228b99d 100644
--- a/django_airavata/wagtailapps/base/management/commands/load_seagrid_data.py
+++ b/django_airavata/wagtailapps/base/management/commands/load_seagrid_data.py
@@ -1,10 +1,9 @@
import os
from django.conf import settings
-from django.core.management.base import BaseCommand
from django.core.management import call_command
-
-from wagtail.core.models import Site, Page
+from django.core.management.base import BaseCommand
+from wagtail.core.models import Page, Site
class Command(BaseCommand):
diff --git a/django_airavata/wagtailapps/base/management/commands/load_searching_sra_data.py b/django_airavata/wagtailapps/base/management/commands/load_searching_sra_data.py
index e007335..109dc4a 100644
--- a/django_airavata/wagtailapps/base/management/commands/load_searching_sra_data.py
+++ b/django_airavata/wagtailapps/base/management/commands/load_searching_sra_data.py
@@ -1,10 +1,9 @@
import os
from django.conf import settings
-from django.core.management.base import BaseCommand
from django.core.management import call_command
-
-from wagtail.core.models import Site, Page
+from django.core.management.base import BaseCommand
+from wagtail.core.models import Page, Site
class Command(BaseCommand):
diff --git a/django_airavata/wagtailapps/base/management/commands/load_simccs_data.py b/django_airavata/wagtailapps/base/management/commands/load_simccs_data.py
index c4b5324..3973e57 100644
--- a/django_airavata/wagtailapps/base/management/commands/load_simccs_data.py
+++ b/django_airavata/wagtailapps/base/management/commands/load_simccs_data.py
@@ -1,10 +1,9 @@
import os
from django.conf import settings
-from django.core.management.base import BaseCommand
from django.core.management import call_command
-
-from wagtail.core.models import Site, Page
+from django.core.management.base import BaseCommand
+from wagtail.core.models import Page, Site
class Command(BaseCommand):
diff --git a/django_airavata/wagtailapps/base/management/commands/load_simvascular_data.py b/django_airavata/wagtailapps/base/management/commands/load_simvascular_data.py
index 0e9d90d..3a8bd97 100644
--- a/django_airavata/wagtailapps/base/management/commands/load_simvascular_data.py
+++ b/django_airavata/wagtailapps/base/management/commands/load_simvascular_data.py
@@ -1,10 +1,9 @@
import os
from django.conf import settings
-from django.core.management.base import BaseCommand
from django.core.management import call_command
-
-from wagtail.core.models import Site, Page
+from django.core.management.base import BaseCommand
+from wagtail.core.models import Page, Site
class Command(BaseCommand):
diff --git a/django_airavata/wagtailapps/base/management/commands/load_siu_data.py b/django_airavata/wagtailapps/base/management/commands/load_siu_data.py
index 20f5af9..3a746a8 100644
--- a/django_airavata/wagtailapps/base/management/commands/load_siu_data.py
+++ b/django_airavata/wagtailapps/base/management/commands/load_siu_data.py
@@ -1,10 +1,9 @@
import os
from django.conf import settings
-from django.core.management.base import BaseCommand
from django.core.management import call_command
-
-from wagtail.core.models import Site, Page
+from django.core.management.base import BaseCommand
+from wagtail.core.models import Page, Site
class Command(BaseCommand):
diff --git a/django_airavata/wagtailapps/base/management/commands/load_south_dakota_data.py b/django_airavata/wagtailapps/base/management/commands/load_south_dakota_data.py
index c18c71b..2d4a760 100644
--- a/django_airavata/wagtailapps/base/management/commands/load_south_dakota_data.py
+++ b/django_airavata/wagtailapps/base/management/commands/load_south_dakota_data.py
@@ -1,10 +1,9 @@
import os
from django.conf import settings
-from django.core.management.base import BaseCommand
from django.core.management import call_command
-
-from wagtail.core.models import Site, Page
+from django.core.management.base import BaseCommand
+from wagtail.core.models import Page, Site
class Command(BaseCommand):
diff --git a/django_airavata/wagtailapps/base/models.py b/django_airavata/wagtailapps/base/models.py
index 74d932c..1af718b 100644
--- a/django_airavata/wagtailapps/base/models.py
+++ b/django_airavata/wagtailapps/base/models.py
@@ -2,10 +2,10 @@ from __future__ import unicode_literals
from django.db import models
from modelcluster.fields import ParentalKey
-from wagtail.admin.edit_handlers import (FieldPanel,
- InlinePanel, MultiFieldPanel,
- ObjectList, PageChooserPanel,
- StreamFieldPanel, TabbedInterface)
+from wagtail.admin.edit_handlers import (FieldPanel, InlinePanel,
+ MultiFieldPanel, ObjectList,
+ PageChooserPanel, StreamFieldPanel,
+ TabbedInterface)
from wagtail.core.fields import RichTextField, StreamField
from wagtail.core.models import Orderable, Page
from wagtail.images.edit_handlers import ImageChooserPanel
diff --git a/django_airavata/wagtailapps/base/templatetags/navigation_tags.py b/django_airavata/wagtailapps/base/templatetags/navigation_tags.py
index 00e06fc..9765194 100644
--- a/django_airavata/wagtailapps/base/templatetags/navigation_tags.py
+++ b/django_airavata/wagtailapps/base/templatetags/navigation_tags.py
@@ -1,23 +1,11 @@
from django import template
-
from wagtail.core.models import Page
-from django_airavata.wagtailapps.base.models import FooterText
-
-from django_airavata.wagtailapps.base.models import Navbar
-
-from django_airavata.wagtailapps.base.models import Announcements
-
-from django_airavata.wagtailapps.base.models import CustomHeaderLinks
-
-from django_airavata.wagtailapps.base.models import CustomCss
-
-from django_airavata.wagtailapps.base.models import NavExtra
-
-from django_airavata.wagtailapps.base.models import GatewayIcon
-
-from django_airavata.wagtailapps.base.models import GatewayTitle
-
+from django_airavata.wagtailapps.base.models import (Announcements, CustomCss,
+ CustomHeaderLinks,
+ FooterText, GatewayIcon,
+ GatewayTitle, Navbar,
+ NavExtra)
register = template.Library()
# https://docs.djangoproject.com/en/1.9/howto/custom-template-tags/
diff --git a/django_airavata/wagtailapps/base/wagtail_hooks.py b/django_airavata/wagtailapps/base/wagtail_hooks.py
index 5c195d5..d5da21c 100644
--- a/django_airavata/wagtailapps/base/wagtail_hooks.py
+++ b/django_airavata/wagtailapps/base/wagtail_hooks.py
@@ -1,5 +1,6 @@
import wagtail.admin.rich_text.editors.draftail.features as draftail_features
-from wagtail.admin.rich_text.converters.html_to_contentstate import InlineStyleElementHandler
+from wagtail.admin.rich_text.converters.html_to_contentstate import \
+ InlineStyleElementHandler
from wagtail.core import hooks
diff --git a/setup.py b/setup.py
index 6fc0d7e..68a4c63 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,5 @@
import os
+
from setuptools import find_packages, setup