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/12 13:55:16 UTC
[airavata-django-portal] branch master updated: Fixing formatting
of 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
The following commit(s) were added to refs/heads/master by this push:
new cacfb28 Fixing formatting of imports
cacfb28 is described below
commit cacfb281dfd8ffc0331b2b71bc1ddd10d63b1609
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Fri Oct 12 09:55:05 2018 -0400
Fixing formatting of imports
---
django_airavata/apps/api/datastore.py | 12 ++++----
django_airavata/apps/api/thrift_utils.py | 17 +++++++++---
django_airavata/apps/api/views.py | 32 +++++++++++++---------
django_airavata/apps/workspace/views.py | 20 ++++++++------
django_airavata/utils.py | 9 ++++--
django_airavata/wagtailapps/base/blocks.py | 16 ++++++++---
django_airavata/wagtailapps/base/models.py | 13 ++++++---
.../base/templatetags/navigation_tags.py | 15 ++++++----
django_airavata/wagtailapps/base/wagtail_hooks.py | 3 +-
9 files changed, 90 insertions(+), 47 deletions(-)
diff --git a/django_airavata/apps/api/datastore.py b/django_airavata/apps/api/datastore.py
index 1e596f8..aa4c17b 100644
--- a/django_airavata/apps/api/datastore.py
+++ b/django_airavata/apps/api/datastore.py
@@ -6,11 +6,13 @@ from django.conf import settings
from django.core.exceptions import ObjectDoesNotExist, SuspiciousFileOperation
from django.core.files.storage import FileSystemStorage
-from airavata.model.data.replica.ttypes import (DataProductModel,
- DataProductType,
- DataReplicaLocationModel,
- ReplicaLocationCategory,
- ReplicaPersistentType)
+from airavata.model.data.replica.ttypes import (
+ DataProductModel,
+ DataProductType,
+ DataReplicaLocationModel,
+ ReplicaLocationCategory,
+ ReplicaPersistentType
+)
experiment_data_storage = FileSystemStorage(
location=settings.GATEWAY_DATA_STORE_DIR)
diff --git a/django_airavata/apps/api/thrift_utils.py b/django_airavata/apps/api/thrift_utils.py
index 0dd3d26..258ee4b 100644
--- a/django_airavata/apps/api/thrift_utils.py
+++ b/django_airavata/apps/api/thrift_utils.py
@@ -5,10 +5,19 @@ import copy
import datetime
from django.utils import six
-from rest_framework.serializers import (BooleanField, CharField, DateTimeField,
- DecimalField, DictField, Field,
- IntegerField, ListField, Serializer,
- SerializerMetaclass, ValidationError)
+from rest_framework.serializers import (
+ BooleanField,
+ CharField,
+ DateTimeField,
+ DecimalField,
+ DictField,
+ Field,
+ IntegerField,
+ ListField,
+ Serializer,
+ SerializerMetaclass,
+ ValidationError
+)
from thrift.Thrift import TType
# used to map apache thrift data types to django serializer fields
diff --git a/django_airavata/apps/api/views.py b/django_airavata/apps/api/views.py
index 1aa00e6..4569d55 100644
--- a/django_airavata/apps/api/views.py
+++ b/django_airavata/apps/api/views.py
@@ -13,22 +13,28 @@ from rest_framework.response import Response
from rest_framework.views import APIView
from airavata.api.error.ttypes import ProjectNotFoundException
-from airavata.model.appcatalog.computeresource.ttypes import (CloudJobSubmission,
- GlobusJobSubmission,
- LOCALSubmission,
- SSHJobSubmission,
- UnicoreJobSubmission)
+from airavata.model.appcatalog.computeresource.ttypes import (
+ CloudJobSubmission,
+ GlobusJobSubmission,
+ LOCALSubmission,
+ SSHJobSubmission,
+ UnicoreJobSubmission
+)
from airavata.model.application.io.ttypes import DataType
from airavata.model.credential.store.ttypes import SummaryType
-from airavata.model.data.movement.ttypes import (GridFTPDataMovement,
- LOCALDataMovement,
- SCPDataMovement,
- UnicoreDataMovement)
+from airavata.model.data.movement.ttypes import (
+ GridFTPDataMovement,
+ LOCALDataMovement,
+ SCPDataMovement,
+ UnicoreDataMovement
+)
from airavata.model.group.ttypes import ResourcePermissionType
-from django_airavata.apps.api.view_utils import (APIBackedViewSet,
- APIResultIterator,
- APIResultPagination,
- GenericAPIBackedViewSet)
+from django_airavata.apps.api.view_utils import (
+ APIBackedViewSet,
+ APIResultIterator,
+ APIResultPagination,
+ GenericAPIBackedViewSet
+)
from . import datastore, serializers, thrift_utils
diff --git a/django_airavata/apps/workspace/views.py b/django_airavata/apps/workspace/views.py
index 6a217ff..06f5ac5 100644
--- a/django_airavata/apps/workspace/views.py
+++ b/django_airavata/apps/workspace/views.py
@@ -11,14 +11,18 @@ from django.http import JsonResponse
from django.shortcuts import render
from rest_framework.renderers import JSONRenderer
-from airavata.model.data.replica.ttypes import (DataProductModel,
- DataProductType,
- DataReplicaLocationModel,
- ReplicaLocationCategory,
- ReplicaPersistentType)
-from django_airavata.apps.api.views import (ExperimentSearchViewSet,
- FullExperimentViewSet,
- ProjectViewSet)
+from airavata.model.data.replica.ttypes import (
+ DataProductModel,
+ DataProductType,
+ DataReplicaLocationModel,
+ ReplicaLocationCategory,
+ ReplicaPersistentType
+)
+from django_airavata.apps.api.views import (
+ ExperimentSearchViewSet,
+ FullExperimentViewSet,
+ ProjectViewSet
+)
logger = logging.getLogger(__name__)
diff --git a/django_airavata/utils.py b/django_airavata/utils.py
index 0ff8382..78748c9 100644
--- a/django_airavata/utils.py
+++ b/django_airavata/utils.py
@@ -9,14 +9,17 @@ from thrift.transport import TSocket, TSSLSocket, TTransport
from airavata.api import Airavata
from airavata.api.sharing import SharingRegistryService
from airavata.service.profile.groupmanager.cpi import GroupManagerService
-from airavata.service.profile.groupmanager.cpi.constants import \
+from airavata.service.profile.groupmanager.cpi.constants import (
GROUP_MANAGER_CPI_NAME
+)
from airavata.service.profile.iam.admin.services.cpi import IamAdminServices
-from airavata.service.profile.iam.admin.services.cpi.constants import \
+from airavata.service.profile.iam.admin.services.cpi.constants import (
IAM_ADMIN_SERVICES_CPI_NAME
+)
from airavata.service.profile.tenant.cpi import TenantProfileService
-from airavata.service.profile.tenant.cpi.constants import \
+from airavata.service.profile.tenant.cpi.constants import (
TENANT_PROFILE_CPI_NAME
+)
from airavata.service.profile.user.cpi import UserProfileService
from airavata.service.profile.user.cpi.constants import USER_PROFILE_CPI_NAME
diff --git a/django_airavata/wagtailapps/base/blocks.py b/django_airavata/wagtailapps/base/blocks.py
index 5b83394..f4c4544 100644
--- a/django_airavata/wagtailapps/base/blocks.py
+++ b/django_airavata/wagtailapps/base/blocks.py
@@ -1,7 +1,15 @@
-from wagtail.core.blocks import (BooleanBlock, CharBlock, ChoiceBlock,
- IntegerBlock, ListBlock, RawHTMLBlock,
- RichTextBlock, StreamBlock, StructBlock,
- TextBlock)
+from wagtail.core.blocks import (
+ BooleanBlock,
+ CharBlock,
+ ChoiceBlock,
+ IntegerBlock,
+ ListBlock,
+ RawHTMLBlock,
+ RichTextBlock,
+ StreamBlock,
+ StructBlock,
+ TextBlock
+)
from wagtail.embeds.blocks import EmbedBlock
from wagtail.images.blocks import ImageChooserBlock
diff --git a/django_airavata/wagtailapps/base/models.py b/django_airavata/wagtailapps/base/models.py
index 5e4dd6d..3a88e8e 100644
--- a/django_airavata/wagtailapps/base/models.py
+++ b/django_airavata/wagtailapps/base/models.py
@@ -2,10 +2,15 @@ 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 3cce7df..8b0fc3d 100644
--- a/django_airavata/wagtailapps/base/templatetags/navigation_tags.py
+++ b/django_airavata/wagtailapps/base/templatetags/navigation_tags.py
@@ -1,11 +1,16 @@
from django import template
from wagtail.core.models import Page
-from django_airavata.wagtailapps.base.models import (Announcements, CustomCss,
- CustomHeaderLinks,
- FooterText, GatewayIcon,
- GatewayTitle, Navbar,
- NavExtra)
+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 d5da21c..996a79e 100644
--- a/django_airavata/wagtailapps/base/wagtail_hooks.py
+++ b/django_airavata/wagtailapps/base/wagtail_hooks.py
@@ -1,6 +1,7 @@
import wagtail.admin.rich_text.editors.draftail.features as draftail_features
-from wagtail.admin.rich_text.converters.html_to_contentstate import \
+from wagtail.admin.rich_text.converters.html_to_contentstate import (
InlineStyleElementHandler
+)
from wagtail.core import hooks