Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move actinia_core imports #8

Merged
merged 2 commits into from
Jun 2, 2021
Merged

Move actinia_core imports #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee04b83
move actinia_core imports
mmacata Jun 2, 2021
8def725
update more module imports
mmacata Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion actinia_module_plugin/api/actinia_templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

from flask import jsonify, make_response, request
from flask_restful_swagger_2 import swagger
from actinia_core.resources.resource_base import ResourceBase
from actinia_core.rest.resource_base import ResourceBase

from actinia_module_plugin.apidocs import templates
from actinia_module_plugin.core.templates.user_templates import readAll
Expand Down
2 changes: 1 addition & 1 deletion actinia_module_plugin/api/modules/actinia.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
from flask import jsonify, make_response
from flask_restful_swagger_2 import swagger
from flask_restful import Resource
from actinia_core.resources.resource_base import ResourceBase
from actinia_core.rest.resource_base import ResourceBase

from actinia_module_plugin.apidocs import modules
from actinia_module_plugin.core.filter import filter
Expand Down
2 changes: 1 addition & 1 deletion actinia_module_plugin/api/modules/combined.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

from flask import jsonify, make_response, request
from flask_restful_swagger_2 import swagger
from actinia_core.resources.resource_base import ResourceBase
from actinia_core.rest.resource_base import ResourceBase

from actinia_module_plugin.apidocs import modules
from actinia_module_plugin.core.filter import filter
Expand Down
2 changes: 1 addition & 1 deletion actinia_module_plugin/api/modules/grass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

from flask import jsonify, make_response, request
from flask_restful_swagger_2 import swagger
from actinia_core.resources.resource_base import ResourceBase
from actinia_core.rest.resource_base import ResourceBase

from actinia_module_plugin.apidocs import modules
from actinia_module_plugin.core.filter import filter
Expand Down
10 changes: 5 additions & 5 deletions actinia_module_plugin/api/processing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,16 @@

from flask import jsonify, make_response
from flask_restful_swagger_2 import swagger
from actinia_core.resources.common.redis_interface import enqueue_job
from actinia_core.resources.common.response_models import \
from actinia_core.core.common.redis_interface import enqueue_job
from actinia_core.models.response_models import \
create_response_from_model
from actinia_core.resources.ephemeral_processing_with_export import \
from actinia_core.rest.ephemeral_processing_with_export import \
start_job as start_job_ephemeral_processing_with_export, \
SCHEMA_DOC as SCHEMA_DOC_EPHEMERAL_PROCESSING_WITH_EXPORT
from actinia_core.resources.persistent_processing import \
from actinia_core.rest.persistent_processing import \
start_job as start_job_persistent_processing, \
SCHEMA_DOC as SCHEMA_DOC_PERSISTENT_PROCESSING
from actinia_core.resources.resource_base import ResourceBase
from actinia_core.rest.resource_base import ResourceBase

from actinia_module_plugin.core.modules.actinia_global_templates import \
createProcessChainTemplateListFromFileSystem
Expand Down
2 changes: 1 addition & 1 deletion actinia_module_plugin/apidocs/templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import json

from flask_restful_swagger_2 import Schema
from actinia_core.resources.common.process_chain import GrassModule
from actinia_core.core.common.process_chain import GrassModule

from actinia_module_plugin.model.responseModels import \
SimpleStatusCodeResponseModel
Expand Down
2 changes: 1 addition & 1 deletion actinia_module_plugin/core/modules/grass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import json
import time

from actinia_core.resources.common.response_models import \
from actinia_core.models.response_models import \
create_response_from_model

from actinia_module_plugin.core.modules.processor import run_process_chain
Expand Down
6 changes: 3 additions & 3 deletions actinia_module_plugin/core/modules/processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
import pickle
import uuid

from actinia_core.resources.common.config import global_config
from actinia_core.resources.ephemeral_processing import EphemeralProcessing
from actinia_core.resources.common.response_models import \
from actinia_core.core.common.config import global_config
from actinia_core.rest.ephemeral_processing import EphemeralProcessing
from actinia_core.models.response_models import \
StringListProcessingResultResponseModel

from actinia_module_plugin.core.common import start_job
Expand Down
2 changes: 1 addition & 1 deletion actinia_module_plugin/core/templates/user_templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
__maintainer__ = "Carmen Tawalika"


from actinia_core.resources.common.config import Configuration
from actinia_core.core.common.config import Configuration

from actinia_module_plugin.core.templates.user_templates_redis_interface \
import redis_actinia_template_interface
Expand Down
2 changes: 1 addition & 1 deletion actinia_module_plugin/core/templates/user_templates_redis_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

import pickle

from actinia_core.resources.common.redis_base import RedisBaseInterface
from actinia_core.core.common.redis_base import RedisBaseInterface


class RedisActiniaTemplateInterface(RedisBaseInterface):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_modules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

from flask import Response

from actinia_core.resources.common.app import URL_PREFIX
from actinia_core.core.common.app import URL_PREFIX

from testsuite import ActiniaTestCase, compare_module_to_file

Expand Down
2 changes: 1 addition & 1 deletion tests/test_modules_actinia_global.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

from flask import Response

from actinia_core.resources.common.app import URL_PREFIX
from actinia_core.core.common.app import URL_PREFIX

from testsuite import ActiniaTestCase, compare_module_to_file

Expand Down
2 changes: 1 addition & 1 deletion tests/test_modules_actinia_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import json
from flask import Response

from actinia_core.resources.common.app import URL_PREFIX
from actinia_core.core.common.app import URL_PREFIX

from testsuite import ActiniaTestCase, import_user_template, \
delete_user_template
Expand Down
2 changes: 1 addition & 1 deletion tests/test_modules_grass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

from flask import Response

from actinia_core.resources.common.app import URL_PREFIX
from actinia_core.core.common.app import URL_PREFIX

from testsuite import ActiniaTestCase, compare_module_to_file

Expand Down
2 changes: 1 addition & 1 deletion tests/test_processing_global.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from flask import Response
import json

from actinia_core.resources.common.app import URL_PREFIX
from actinia_core.core.common.app import URL_PREFIX


from testsuite import ActiniaTestCase, check_started_process
Expand Down
2 changes: 1 addition & 1 deletion tests/test_processing_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from flask import Response
import json

from actinia_core.resources.common.app import URL_PREFIX
from actinia_core.core.common.app import URL_PREFIX

from testsuite import ActiniaTestCase, import_user_template, \
delete_user_template, check_started_process
Expand Down
2 changes: 1 addition & 1 deletion tests/test_templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import json
import uuid

from actinia_core.resources.common.app import URL_PREFIX
from actinia_core.core.common.app import URL_PREFIX

from testsuite import ActiniaTestCase

Expand Down
12 changes: 6 additions & 6 deletions tests/testsuite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
from werkzeug.datastructures import Headers

from actinia_core.endpoints import create_endpoints
from actinia_core.resources.common import redis_interface
from actinia_core.resources.common.app import flask_app, URL_PREFIX
from actinia_core.resources.common.config import global_config
from actinia_core.resources.common.user import ActiniaUser
from actinia_core.resources.common.response_models import \
from actinia_core.core.common import redis_interface
from actinia_core.core.common.app import flask_app, URL_PREFIX
from actinia_core.core.common.config import global_config
from actinia_core.core.common.user import ActiniaUser
from actinia_core.models.response_models import \
ProcessingResponseModel


Expand Down Expand Up @@ -110,7 +110,7 @@ def setUp(self):
process_time_limit=4, accessible_datasets=accessible_datasets)

# # create process queue
# from actinia_core.resources.common.process_queue import \
# from actinia_core.core.common.process_queue import \
# create_process_queue
# create_process_queue(config=global_config)

Expand Down