diff --git a/fractalis/__init__.py b/fractalis/__init__.py index f3bf54b8bf2fb960596330533592ff2e98ed70de..36f2cfe14d537f405e5423ec060c02a6e75ac2f1 100644 --- a/fractalis/__init__.py +++ b/fractalis/__init__.py @@ -3,4 +3,3 @@ from fractalis.config import configure_app app = Flask(__name__) configure_app(app) - diff --git a/fractalis/config.py b/fractalis/config.py index dc14ebddc95be3b1f1f02e00999abdd384657c64..2d130535e1329da4846e8b4152d12dcd79416fba 100644 --- a/fractalis/config.py +++ b/fractalis/config.py @@ -1,13 +1,16 @@ import os + class BaseConfig(): DEBUG = False TESTING = False + class DevelopmentConfig(BaseConfig): DEBUG = True TESTING = False + class TestingConfig(BaseConfig): DEBUG = False TESTING = True @@ -18,10 +21,11 @@ config = { 'production': 'fractalis.config.BaseConfig' } + def configure_app(app): mode = os.getenv('FRACTALIS_MODE', default='production') try: app.config.from_object(config[mode]) except KeyError as e: raise KeyError("'{}' is no valid value for the FRACTALIS_MODE " - "environment variable.".format(mode)) from e + "environment variable.".format(mode)) from e diff --git a/setup.py b/setup.py index 83d64e38115f16f181e47b555833ea526d53c06b..e590d7d48da093c970a93d330694219d6c19053b 100644 --- a/setup.py +++ b/setup.py @@ -4,16 +4,16 @@ from distutils.core import setup from setuptools import find_packages setup( - name = 'fractalis', - packages = find_packages(), - install_requires = [ + name='fractalis', + packages=find_packages(), + install_requires=[ 'Flask', 'celery' ], - setup_requires = [ + setup_requires=[ 'pytest-runner', ], - tests_require = [ + tests_require=[ 'pytest==3.0.3', 'pytest-cov' ] diff --git a/tests/test_config.py b/tests/test_config.py index d349c52ce391808701d2320a4ba95ea0f3b48387..943158612ae21bd14b6846c11d607245ed2bea97 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -1,8 +1,11 @@ import os -import fractalis -import pytest from importlib import reload +import pytest + +import fractalis + + class TestConfig: def test_config_when_test_mode(self):