Merge pull request #207 from ral-facilities/feature/wsgi

Add WSGI script and fix errors with pip install
ral-facilities · Feb 26, 2021 · 04eafd5 · 04eafd5
2 parents 611c227 + 1572c0c
commit 04eafd5
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 57 deletions.
diff --git a/.flake8 b/.flake8
@@ -6,5 +6,5 @@ max-complexity = 17
 max-line-length = 80
 application-import-names = datagateway_api,test,util
 import-order-style = google
-per-file-ignores = test/*:S101,util/icat_db_generator.py:S311
+per-file-ignores = test/*:S101,util/icat_db_generator.py:S311,datagateway_api/wsgi.py:E402,F401
 enable-extensions=G
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -63,9 +63,9 @@ jobs:
       run: touch logs.log
     - name: Configure log file location
       run: echo "`jq -r --arg REPO_DIR "$GITHUB_WORKSPACE/logs.log" \
-        '.log_location=$REPO_DIR' config.json.example`" > config.json.example
+        '.log_location=$REPO_DIR' datagateway_api/config.json.example`" > datagateway_api/config.json.example
     - name: Create config.json
-      run: cp config.json.example config.json
+      run: cp datagateway_api/config.json.example datagateway_api/config.json
 
     # Install Nox, Poetry and API's dependencies
     - name: Install Nox

diff --git a/README.md b/README.md
@@ -427,8 +427,9 @@ illustrated below:
 ├── .pre-commit-config.yaml
 ├── LICENSE
 ├── README.md
-├── config.json.example
 ├── datagateway_api
+│   ├── config.json.example
+│   ├── wsgi.py
 │   ├── common
 │   │   ├── backend.py
 │   │   ├── backends.py

diff --git a/datagateway_api/common/config.py b/datagateway_api/common/config.py
@@ -10,7 +10,7 @@
 
 
 class Config(object):
-    def __init__(self, path=Path(__file__).parent.parent.parent / "config.json"):
+    def __init__(self, path=Path(__file__).parent.parent / "config.json"):
         self.path = path
         with open(self.path) as target:
             self.config = json.load(target)

diff --git a/config.json.example → datagateway_api/config.json.example b/config.json.example → datagateway_api/config.json.example
diff --git a/datagateway_api/wsgi.py b/datagateway_api/wsgi.py
@@ -0,0 +1,6 @@
+import logging
+import sys
+
+logging.basicConfig(stream=sys.stderr)
+
+from datagateway_api.src.main import app as application
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -20,6 +20,8 @@ PyYAML = "5.3.1"
 python-icat = "0.17.0"
 suds-community = "^0.8.4"
 Flask-SQLAlchemy = "^2.4.4"
+requests = "^2.25.1"
+python-dateutil = "^2.8.1"
 
 [tool.poetry.dev-dependencies]
 pip-tools = "5.3.1"