Rename app directory

No functional change
CatalystCode · Aug 6, 2018 · 2e41c09 · 2e41c09
1 parent 06dec57
commit 2e41c09
Show file tree

Hide file tree

Showing 34 changed files with 14 additions and 14 deletions.
diff --git a/api/.pylintrc → app/.pylintrc b/api/.pylintrc → app/.pylintrc
diff --git a/api/Dockerfile → app/Dockerfile b/api/Dockerfile → app/Dockerfile
diff --git a/api/api/__init__.py → app/faceanalysis/__init__.py b/api/api/__init__.py → app/faceanalysis/__init__.py
diff --git a/api/api/api.py → app/faceanalysis/api.py b/api/api/api.py → app/faceanalysis/api.py
diff --git a/api/api/auth.py → app/faceanalysis/auth.py b/api/api/auth.py → app/faceanalysis/auth.py
diff --git a/api/api/log.py → app/faceanalysis/log.py b/api/api/log.py → app/faceanalysis/log.py
diff --git a/api/api/models/__init__.py → app/faceanalysis/models/__init__.py b/api/api/models/__init__.py → app/faceanalysis/models/__init__.py
diff --git a/api/api/models/database_manager.py → app/faceanalysis/models/database_manager.py b/api/api/models/database_manager.py → app/faceanalysis/models/database_manager.py
diff --git a/api/api/models/image_status_enum.py → app/faceanalysis/models/image_status_enum.py b/api/api/models/image_status_enum.py → app/faceanalysis/models/image_status_enum.py
diff --git a/api/api/models/models.py → app/faceanalysis/models/models.py b/api/api/models/models.py → app/faceanalysis/models/models.py
diff --git a/api/api/pipeline.py → app/faceanalysis/pipeline.py b/api/api/pipeline.py → app/faceanalysis/pipeline.py
diff --git a/api/api/queue_poll.py → app/faceanalysis/queue_poll.py b/api/api/queue_poll.py → app/faceanalysis/queue_poll.py
diff --git a/api/api/tests/__init__.py → app/faceanalysis/tests/__init__.py b/api/api/tests/__init__.py → app/faceanalysis/tests/__init__.py
diff --git a/api/api/tests/images/0.jpg → app/faceanalysis/tests/images/0.jpg b/api/api/tests/images/0.jpg → app/faceanalysis/tests/images/0.jpg
diff --git a/api/api/tests/images/0.txt → app/faceanalysis/tests/images/0.txt b/api/api/tests/images/0.txt → app/faceanalysis/tests/images/0.txt
diff --git a/api/api/tests/images/1.jpg → app/faceanalysis/tests/images/1.jpg b/api/api/tests/images/1.jpg → app/faceanalysis/tests/images/1.jpg
diff --git a/api/api/tests/images/11.jpg → app/faceanalysis/tests/images/11.jpg b/api/api/tests/images/11.jpg → app/faceanalysis/tests/images/11.jpg
diff --git a/api/api/tests/images/12.png → app/faceanalysis/tests/images/12.png b/api/api/tests/images/12.png → app/faceanalysis/tests/images/12.png
diff --git a/api/api/tests/images/2.jpg → app/faceanalysis/tests/images/2.jpg b/api/api/tests/images/2.jpg → app/faceanalysis/tests/images/2.jpg
diff --git a/api/api/tests/images/3.jpg → app/faceanalysis/tests/images/3.jpg b/api/api/tests/images/3.jpg → app/faceanalysis/tests/images/3.jpg
diff --git a/api/api/tests/images/4.jpg → app/faceanalysis/tests/images/4.jpg b/api/api/tests/images/4.jpg → app/faceanalysis/tests/images/4.jpg
diff --git a/api/api/tests/images/5.jpg → app/faceanalysis/tests/images/5.jpg b/api/api/tests/images/5.jpg → app/faceanalysis/tests/images/5.jpg
diff --git a/api/api/tests/images/6.jpg → app/faceanalysis/tests/images/6.jpg b/api/api/tests/images/6.jpg → app/faceanalysis/tests/images/6.jpg
diff --git a/api/api/tests/images/7.jpg → app/faceanalysis/tests/images/7.jpg b/api/api/tests/images/7.jpg → app/faceanalysis/tests/images/7.jpg
diff --git a/api/api/tests/images/8.jpg → app/faceanalysis/tests/images/8.jpg b/api/api/tests/images/8.jpg → app/faceanalysis/tests/images/8.jpg
diff --git a/api/api/tests/images/9.jpg → app/faceanalysis/tests/images/9.jpg b/api/api/tests/images/9.jpg → app/faceanalysis/tests/images/9.jpg
diff --git a/api/api/tests/test_api.py → app/faceanalysis/tests/test_api.py b/api/api/tests/test_api.py → 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 → app/requirements-dev.txt b/api/requirements-dev.txt → app/requirements-dev.txt
diff --git a/api/requirements.txt → app/requirements.txt b/api/requirements.txt → app/requirements.txt
diff --git a/api/wait-for-dependencies.sh → app/wait-for-dependencies.sh b/api/wait-for-dependencies.sh → app/wait-for-dependencies.sh
diff --git a/api/worker.py → app/worker.py b/api/worker.py → 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 → app/wsgi.py b/api/wsgi.py → 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
@@ -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
@@ -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}" \