Merge pull request #1 from ahmedsadman/development

Structure change and basic CI/CD test

.travis.yml

@@ -0,0 +1,8 @@
+language: python
+python:
+    - '3.7'
+install:
+    - pip install -r requirements.txt
+script:
+    - if [ "$TRAVIS_BRANCH" = "master" ]; then pytest tests/test_prod; fi
+    - if [ "$TRAVIS_BRANCH" = "development" ]; then pytest tests/test_dev; fi

application/__init__.py

@@ -2,7 +2,6 @@
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
 from flask_jwt_extended import JWTManager
-from config import Config
 from application.error_handlers import *
 
 # globally accessible variables
@@ -11,10 +10,10 @@
 jwt = JWTManager()
 
 
-def create_app():
+def create_app(config):
     """Create the core application, uses application factory pattern"""
     app = Flask(__name__)
-    app.config.from_object(Config)
+    app.config.from_object(config)
 
     db.init_app(app)
     migrate.init_app(app, db)

config.py

@@ -2,13 +2,12 @@
 
 
 class Config:
-    '''holds all the configuration for the flask application'''
+    """holds all the configuration for the flask application"""
 
     # general config
-    SECRET_KEY = os.environ.get('FLASK_SECRET_KEY', 'mysecretkeytest')
+    SECRET_KEY = os.environ.get("FLASK_SECRET_KEY")
     PROPAGATE_EXCEPTIONS = True
 
     # database
-    SQLALCHEMY_DATABASE_URI = os.environ.get(
-        'DATABASE_URL', 'sqlite:///data.db')
+    SQLALCHEMY_DATABASE_URI = os.environ.get("DATABASE_URL")
     SQLALCHEMY_TRACK_MODIFICATIONS = False

config_dev.py

@@ -0,0 +1,16 @@
+import os
+from dotenv import load_dotenv
+
+load_dotenv()
+
+
+class Config:
+    """holds all the configuration for the flask application"""
+
+    # general config
+    SECRET_KEY = os.environ.get("FLASK_SECRET_KEY")
+    PROPAGATE_EXCEPTIONS = True
+
+    # database for dev test
+    SQLALCHEMY_DATABASE_URI = os.environ.get("DATABASE_URL_DEV")
+    SQLALCHEMY_TRACK_MODIFICATIONS = False

requirements.txt

@@ -2,7 +2,9 @@ alembic==1.1.0
 aniso8601==7.0.0
 appdirs==1.4.3
 astroid==2.2.5
+atomicwrites==1.3.0
 attrs==19.1.0
+autopep8==1.4.4
 black==19.3b0
 certifi==2019.9.11
 cffi==1.13.1
@@ -18,6 +20,7 @@ gevent==1.4.0
 geventhttpclient-wheels==1.3.1.dev2
 greenlet==0.4.15
 idna==2.8
+importlib-metadata==0.23
 isort==4.3.21
 itsdangerous==1.1.0
 Jinja2==2.10.1
@@ -27,12 +30,18 @@ Mako==1.1.0
 MarkupSafe==1.1.1
 marshmallow==3.0.0
 mccabe==0.6.1
+more-itertools==7.2.0
 msgpack-python==0.5.6
+packaging==19.2
 pep8==1.7.1
+pluggy==0.13.1
 psycopg2==2.8.3
+py==1.8.0
 pycodestyle==2.5.0
 pycparser==2.19
 PyJWT==1.7.1
+pyparsing==2.4.5
+pytest==5.3.1
 python-dateutil==2.8.0
 python-dotenv==0.10.3
 python-editor==1.0.4
@@ -46,6 +55,8 @@ SQLAlchemy==1.3.6
 toml==0.10.0
 typed-ast==1.4.0
 urllib3==1.25.6
+wcwidth==0.1.7
 Werkzeug==0.15.5
 wrapt==1.11.2
+zipp==0.6.0
 uwsgi

start_dev.py

@@ -1,8 +1,8 @@
 from application import create_app
 from dotenv import load_dotenv
+from config_dev import Config
 
-load_dotenv()
-app = create_app()
+app = create_app(Config)
 
 if __name__ == "__main__":
     app.run(debug=True)

tests/test_dev/conftest.py

@@ -0,0 +1,15 @@
+import pytest
+from dotenv import load_dotenv
+from application import create_app
+from config_dev import Config
+
+# holds all the fixtures
+# fixtures are ran once during request, this client will be passed in
+# other test_*.py files
+
+
+@pytest.fixture(scope="module")
+def client(request):
+    flask_app = create_app(Config)
+    testing_client = flask_app.test_client()
+    return testing_client

tests/test_dev/test_read.py

@@ -0,0 +1,16 @@
+import pytest
+import json
+from application import create_app
+from dotenv import load_dotenv
+from config import Config
+
+
+def test_homepage(client):
+    r = client.get("/")
+    assert r.status_code == 200
+
+
+def test_events(client):
+    r = client.get("/events")
+    # res = json.loads(r.data)
+    assert r.status_code == 200

tests/test_prod/conftest.py

@@ -0,0 +1,15 @@
+import pytest
+from dotenv import load_dotenv
+from application import create_app
+from config import Config
+
+# holds all the fixtures
+# fixtures are ran once during request, this client will be passed in
+# other test_*.py files
+
+
+@pytest.fixture(scope="module")
+def client(request):
+    flask_app = create_app(Config)
+    testing_client = flask_app.test_client()
+    return testing_client

tests/test_prod/test_read.py

@@ -0,0 +1 @@
+from tests.test_dev.test_read import *

wsgi.py

@@ -1,3 +1,4 @@
 from application import create_app
+from config import Config
 
-app = create_app()
+app = create_app(Config)