refactor

BBVA · Sep 27, 2017 · aaf790b · aaf790b
1 parent c6f6068
commit aaf790b
Show file tree

Hide file tree

Showing 33 changed files with 28 additions and 451 deletions.
diff --git a/.env.required b/.env.required
@@ -1,5 +1,3 @@
 BROKER_URI
 DATABASE_URI
 SCAN_PATH
-SERVER_ADDRESS
-GUNICORN_WORKERS
diff --git a/Dockerfile b/Dockerfile
@@ -23,7 +23,7 @@ RUN rm -rf /tmp/install
 RUN mkdir /opt/deeptracy
 WORKDIR /opt/deeptracy
 ADD wait-for-it.sh /opt/deeptracy
-ADD run_celery.sh /opt/deeptracy
-RUN chmod +x /opt/deeptracy/run_celery.sh
+ADD run.sh /opt/deeptracy
+RUN chmod +x /opt/deeptracy/run.sh
 
-CMD ["/opt/deeptracy/run_celery.sh"]
+CMD ["/opt/deeptracy/run.sh"]
diff --git a/Makefile b/Makefile
@@ -60,7 +60,7 @@ lint: ## check style with flake8
 
 .PHONY: coverage
 coverage: install ## check code coverage
-	coverage run --source=deeptracy -m unittest  discover -s tests/unit
+	coverage run --source=deeptracy -m unittest discover -s tests/unit
 	coverage report -m --fail-under 80
 	coverage xml -o coverage-reports/report.xml
 

diff --git a/deeptracy/api/__init__.py b/deeptracy/api/__init__.py
diff --git a/deeptracy/api/celery.py b/deeptracy/api/celery.py
diff --git a/deeptracy/api/flask.py b/deeptracy/api/flask.py
diff --git a/deeptracy/api/project_blueprint.py b/deeptracy/api/project_blueprint.py
diff --git a/deeptracy/celery.py b/deeptracy/celery.py
@@ -4,9 +4,9 @@
 """
 from celery import Celery
 from deeptracy.config import BROKER_URI
-from deeptracy.dal.database import db
+from deeptracy_core.dal.database import db
 from deeptracy.plugins.store import plugin_store
-from deeptracy.dal.project import Project
+from deeptracy_core.dal.project import Project
 
 db.init_engine()  # Init database engine
 plugin_store.load_plugins()    # Load analyzer plugins

diff --git a/deeptracy/dal/database.py b/deeptracy/dal/database.py
diff --git a/deeptracy/dal/models.py b/deeptracy/dal/models.py
diff --git a/deeptracy/dal/plugin_manager.py b/deeptracy/dal/plugin_manager.py
diff --git a/deeptracy/dal/project/__init__.py b/deeptracy/dal/project/__init__.py
diff --git a/deeptracy/dal/project/manager.py b/deeptracy/dal/project/manager.py
diff --git a/deeptracy/dal/project/model.py b/deeptracy/dal/project/model.py
diff --git a/deeptracy/dal/scan/__init__.py b/deeptracy/dal/scan/__init__.py
diff --git a/deeptracy/dal/scan/manager.py b/deeptracy/dal/scan/manager.py
diff --git a/deeptracy/dal/scan/model.py b/deeptracy/dal/scan/model.py