From 2e41c098e1d202dfc69e66526c69b1ba5039d938 Mon Sep 17 00:00:00 2001 From: Clemens Wolff Date: Mon, 6 Aug 2018 15:52:41 -0400 Subject: [PATCH] Rename app directory No functional change --- {api => app}/.pylintrc | 0 {api => app}/Dockerfile | 0 {api/api => app/faceanalysis}/__init__.py | 0 {api/api => app/faceanalysis}/api.py | 0 {api/api => app/faceanalysis}/auth.py | 0 {api/api => app/faceanalysis}/log.py | 0 {api/api => app/faceanalysis}/models/__init__.py | 0 .../faceanalysis}/models/database_manager.py | 0 .../faceanalysis}/models/image_status_enum.py | 0 {api/api => app/faceanalysis}/models/models.py | 0 {api/api => app/faceanalysis}/pipeline.py | 0 {api/api => app/faceanalysis}/queue_poll.py | 0 {api/api => app/faceanalysis}/tests/__init__.py | 0 {api/api => app/faceanalysis}/tests/images/0.jpg | Bin {api/api => app/faceanalysis}/tests/images/0.txt | 0 {api/api => app/faceanalysis}/tests/images/1.jpg | Bin {api/api => app/faceanalysis}/tests/images/11.jpg | Bin {api/api => app/faceanalysis}/tests/images/12.png | Bin {api/api => app/faceanalysis}/tests/images/2.jpg | Bin {api/api => app/faceanalysis}/tests/images/3.jpg | Bin {api/api => app/faceanalysis}/tests/images/4.jpg | Bin {api/api => app/faceanalysis}/tests/images/5.jpg | Bin {api/api => app/faceanalysis}/tests/images/6.jpg | Bin {api/api => app/faceanalysis}/tests/images/7.jpg | Bin {api/api => app/faceanalysis}/tests/images/8.jpg | Bin {api/api => app/faceanalysis}/tests/images/9.jpg | Bin {api/api => app/faceanalysis}/tests/test_api.py | 8 ++++---- {api => app}/requirements-dev.txt | 0 {api => app}/requirements.txt | 0 {api => app}/wait-for-dependencies.sh | 0 {api => app}/worker.py | 6 +++--- {api => app}/wsgi.py | 2 +- docker-compose.yml | 8 ++++---- run-test.sh | 4 ++-- 34 files changed, 14 insertions(+), 14 deletions(-) rename {api => app}/.pylintrc (100%) rename {api => app}/Dockerfile (100%) mode change 100755 => 100644 rename {api/api => app/faceanalysis}/__init__.py (100%) rename {api/api => app/faceanalysis}/api.py (100%) rename {api/api => app/faceanalysis}/auth.py (100%) rename {api/api => app/faceanalysis}/log.py (100%) rename {api/api => app/faceanalysis}/models/__init__.py (100%) rename {api/api => app/faceanalysis}/models/database_manager.py (100%) rename {api/api => app/faceanalysis}/models/image_status_enum.py (100%) rename {api/api => app/faceanalysis}/models/models.py (100%) rename {api/api => app/faceanalysis}/pipeline.py (100%) rename {api/api => app/faceanalysis}/queue_poll.py (100%) rename {api/api => app/faceanalysis}/tests/__init__.py (100%) rename {api/api => app/faceanalysis}/tests/images/0.jpg (100%) rename {api/api => app/faceanalysis}/tests/images/0.txt (100%) rename {api/api => app/faceanalysis}/tests/images/1.jpg (100%) rename {api/api => app/faceanalysis}/tests/images/11.jpg (100%) rename {api/api => app/faceanalysis}/tests/images/12.png (100%) rename {api/api => app/faceanalysis}/tests/images/2.jpg (100%) rename {api/api => app/faceanalysis}/tests/images/3.jpg (100%) rename {api/api => app/faceanalysis}/tests/images/4.jpg (100%) rename {api/api => app/faceanalysis}/tests/images/5.jpg (100%) rename {api/api => app/faceanalysis}/tests/images/6.jpg (100%) rename {api/api => app/faceanalysis}/tests/images/7.jpg (100%) rename {api/api => app/faceanalysis}/tests/images/8.jpg (100%) rename {api/api => app/faceanalysis}/tests/images/9.jpg (100%) rename {api/api => app/faceanalysis}/tests/test_api.py (97%) rename {api => app}/requirements-dev.txt (100%) rename {api => app}/requirements.txt (100%) rename {api => app}/wait-for-dependencies.sh (100%) mode change 100755 => 100644 rename {api => app}/worker.py (50%) rename {api => app}/wsgi.py (51%) diff --git a/api/.pylintrc b/app/.pylintrc similarity index 100% rename from api/.pylintrc rename to app/.pylintrc diff --git a/api/Dockerfile b/app/Dockerfile old mode 100755 new mode 100644 similarity index 100% rename from api/Dockerfile rename to app/Dockerfile diff --git a/api/api/__init__.py b/app/faceanalysis/__init__.py similarity index 100% rename from api/api/__init__.py rename to app/faceanalysis/__init__.py diff --git a/api/api/api.py b/app/faceanalysis/api.py similarity index 100% rename from api/api/api.py rename to app/faceanalysis/api.py diff --git a/api/api/auth.py b/app/faceanalysis/auth.py similarity index 100% rename from api/api/auth.py rename to app/faceanalysis/auth.py diff --git a/api/api/log.py b/app/faceanalysis/log.py similarity index 100% rename from api/api/log.py rename to app/faceanalysis/log.py diff --git a/api/api/models/__init__.py b/app/faceanalysis/models/__init__.py similarity index 100% rename from api/api/models/__init__.py rename to app/faceanalysis/models/__init__.py diff --git a/api/api/models/database_manager.py b/app/faceanalysis/models/database_manager.py similarity index 100% rename from api/api/models/database_manager.py rename to app/faceanalysis/models/database_manager.py diff --git a/api/api/models/image_status_enum.py b/app/faceanalysis/models/image_status_enum.py similarity index 100% rename from api/api/models/image_status_enum.py rename to app/faceanalysis/models/image_status_enum.py diff --git a/api/api/models/models.py b/app/faceanalysis/models/models.py similarity index 100% rename from api/api/models/models.py rename to app/faceanalysis/models/models.py diff --git a/api/api/pipeline.py b/app/faceanalysis/pipeline.py similarity index 100% rename from api/api/pipeline.py rename to app/faceanalysis/pipeline.py diff --git a/api/api/queue_poll.py b/app/faceanalysis/queue_poll.py similarity index 100% rename from api/api/queue_poll.py rename to app/faceanalysis/queue_poll.py diff --git a/api/api/tests/__init__.py b/app/faceanalysis/tests/__init__.py similarity index 100% rename from api/api/tests/__init__.py rename to app/faceanalysis/tests/__init__.py diff --git a/api/api/tests/images/0.jpg b/app/faceanalysis/tests/images/0.jpg similarity index 100% rename from api/api/tests/images/0.jpg rename to app/faceanalysis/tests/images/0.jpg diff --git a/api/api/tests/images/0.txt b/app/faceanalysis/tests/images/0.txt similarity index 100% rename from api/api/tests/images/0.txt rename to app/faceanalysis/tests/images/0.txt diff --git a/api/api/tests/images/1.jpg b/app/faceanalysis/tests/images/1.jpg similarity index 100% rename from api/api/tests/images/1.jpg rename to app/faceanalysis/tests/images/1.jpg diff --git a/api/api/tests/images/11.jpg b/app/faceanalysis/tests/images/11.jpg similarity index 100% rename from api/api/tests/images/11.jpg rename to app/faceanalysis/tests/images/11.jpg diff --git a/api/api/tests/images/12.png b/app/faceanalysis/tests/images/12.png similarity index 100% rename from api/api/tests/images/12.png rename to app/faceanalysis/tests/images/12.png diff --git a/api/api/tests/images/2.jpg b/app/faceanalysis/tests/images/2.jpg similarity index 100% rename from api/api/tests/images/2.jpg rename to app/faceanalysis/tests/images/2.jpg diff --git a/api/api/tests/images/3.jpg b/app/faceanalysis/tests/images/3.jpg similarity index 100% rename from api/api/tests/images/3.jpg rename to app/faceanalysis/tests/images/3.jpg diff --git a/api/api/tests/images/4.jpg b/app/faceanalysis/tests/images/4.jpg similarity index 100% rename from api/api/tests/images/4.jpg rename to app/faceanalysis/tests/images/4.jpg diff --git a/api/api/tests/images/5.jpg b/app/faceanalysis/tests/images/5.jpg similarity index 100% rename from api/api/tests/images/5.jpg rename to app/faceanalysis/tests/images/5.jpg diff --git a/api/api/tests/images/6.jpg b/app/faceanalysis/tests/images/6.jpg similarity index 100% rename from api/api/tests/images/6.jpg rename to app/faceanalysis/tests/images/6.jpg diff --git a/api/api/tests/images/7.jpg b/app/faceanalysis/tests/images/7.jpg similarity index 100% rename from api/api/tests/images/7.jpg rename to app/faceanalysis/tests/images/7.jpg diff --git a/api/api/tests/images/8.jpg b/app/faceanalysis/tests/images/8.jpg similarity index 100% rename from api/api/tests/images/8.jpg rename to app/faceanalysis/tests/images/8.jpg diff --git a/api/api/tests/images/9.jpg b/app/faceanalysis/tests/images/9.jpg similarity index 100% rename from api/api/tests/images/9.jpg rename to app/faceanalysis/tests/images/9.jpg diff --git a/api/api/tests/test_api.py b/app/faceanalysis/tests/test_api.py similarity index 97% rename from api/api/tests/test_api.py rename to app/faceanalysis/tests/test_api.py index a0023b8..7bf3fab 100644 --- a/api/api/tests/test_api.py +++ b/app/faceanalysis/tests/test_api.py @@ -5,10 +5,10 @@ from io import BytesIO from time import sleep from http import HTTPStatus -from api.api import app -from api.models.database_manager import DatabaseManager -from api.models.image_status_enum import ImageStatusEnum -from api.models.models import init_models, delete_models +from faceanalysis.api import app +from faceanalysis.models.database_manager import DatabaseManager +from faceanalysis.models.image_status_enum import ImageStatusEnum +from faceanalysis.models.models import init_models, delete_models class ApiTestCase(unittest.TestCase): diff --git a/api/requirements-dev.txt b/app/requirements-dev.txt similarity index 100% rename from api/requirements-dev.txt rename to app/requirements-dev.txt diff --git a/api/requirements.txt b/app/requirements.txt similarity index 100% rename from api/requirements.txt rename to app/requirements.txt diff --git a/api/wait-for-dependencies.sh b/app/wait-for-dependencies.sh old mode 100755 new mode 100644 similarity index 100% rename from api/wait-for-dependencies.sh rename to app/wait-for-dependencies.sh diff --git a/api/worker.py b/app/worker.py similarity index 50% rename from api/worker.py rename to app/worker.py index 1e1283c..022fd8c 100644 --- a/api/worker.py +++ b/app/worker.py @@ -1,6 +1,6 @@ -from api.models.database_manager import DatabaseManager -from api.models.models import init_models -from api.pipeline import Pipeline +from faceanalysis.models.database_manager import DatabaseManager +from faceanalysis.models.models import init_models +from faceanalysis.pipeline import Pipeline if __name__ == "__main__": db = DatabaseManager() diff --git a/api/wsgi.py b/app/wsgi.py similarity index 51% rename from api/wsgi.py rename to app/wsgi.py index 618ee43..a8fec44 100644 --- a/api/wsgi.py +++ b/app/wsgi.py @@ -1,4 +1,4 @@ -from api.api import app as application +from faceanalysis.api import app as application if __name__ == '__main__': application.run() diff --git a/docker-compose.yml b/docker-compose.yml index ad1f92b..a03761b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: worker: restart: always image: faceanalysis_app:${BUILD_TAG} - build: ./api + build: ./app command: ["python3", "worker.py"] depends_on: - mysql @@ -27,14 +27,14 @@ services: max-size: "50m" max-file: "5" volumes: - - "${DATA_DIR}:/app/api/images" + - "${DATA_DIR}:/app/faceanalysis/images" env_file: - ./environment_variables.env api: restart: always image: faceanalysis_app:${BUILD_TAG} - build: ./api + build: ./app depends_on: - worker - mysql @@ -44,7 +44,7 @@ services: max-size: "50m" max-file: "5" volumes: - - "${DATA_DIR}:/app/api/images" + - "${DATA_DIR}:/app/faceanalysis/images" env_file: - ./environment_variables.env diff --git a/run-test.sh b/run-test.sh index 7cb56de..2890f5a 100755 --- a/run-test.sh +++ b/run-test.sh @@ -12,8 +12,8 @@ trap cleanup EXIT docker-compose down docker-compose build --build-arg DEVTOOLS=true -docker-compose run --rm --no-deps --entrypoint=python3 api -m pylint /app/api -docker-compose run --rm --no-deps --entrypoint=python3 api -m flake8 /app/api +docker-compose run --rm --no-deps --entrypoint=python3 api -m pylint /app/faceanalysis +docker-compose run --rm --no-deps --entrypoint=python3 api -m flake8 /app/faceanalysis APP_PORT="${app_port}" \ DATA_DIR="${data_dir}" \