Merge branch 'master' of github.com:MongoEngine/flask-mongoengine into cleaner-resolve-settings

Author: wojcikstefan

.travis.yml

@@ -28,13 +28,17 @@ install:
 - travis_retry pip install --upgrade pip
 - travis_retry pip install --upgrade nose
 - travis_retry pip install --upgrade setuptools
+- travis_retry pip install coveralls
 - travis_retry pip install flake8
 - travis_retry pip install tox>=1.9
 - travis_retry tox -e $(echo py$TRAVIS_PYTHON_VERSION-me$MONGOENGINE | tr -d . | sed -e 's/pypypy/pypy/') -- -e test
 
 before_script:
 - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then tox -e flake8; fi
 
+after_script:
+- coveralls --verbose
+
 script:
 - tox -e $(echo py$TRAVIS_PYTHON_VERSION-me$MONGOENGINE | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
 

README.rst

@@ -7,6 +7,9 @@ Flask-MongoEngine
 .. image:: https://travis-ci.org/MongoEngine/flask-mongoengine.svg?branch=master
   :target: https://travis-ci.org/MongoEngine/flask-mongoengine
 
+.. image:: https://coveralls.io/repos/github/MongoEngine/flask-mongoengine/badge.svg?branch=master
+  :target: https://coveralls.io/github/MongoEngine/flask-mongoengine?branch=master
+
 About
 =====
 Flask-MongoEngine is a Flask extension that provides integration with MongoEngine. It handles connection management for your app.

flask_mongoengine/__init__.py

@@ -11,7 +11,6 @@
 
 from .connection import *
 from .json import override_json_encoder
-from .metadata import *
 from .pagination import *
 from .sessions import *
 from .wtf import WtfBaseField

flask_mongoengine/metadata.py

@@ -1,38 +1,16 @@
-import imp
 import os
-
 from setuptools import setup
 
 
-def load_module(module_name, script_file):
-    """
-    XXX: Load modules dynamically without
-    triggering flask_mongoengine.__init__
-
-    This way we do not encounter errors which
-    requires dependencies to be pre-installed.
-    """
-    module = None
-    try:
-        module = imp.load_source(module_name, script_file)
-    except:
-        pass
-    return module
-
-# Load MetaData
-metadata_script = os.path.join(os.path.dirname(__file__), "flask_mongoengine", "metadata.py")
-metadata = load_module("metadata", metadata_script)
+description = ('Flask-MongoEngine is a Flask extension '
+               'that provides integration with MongoEngine and WTF model forms.')
 
-# Load documentation
+# Load index.rst as long_description
 doc_path = os.path.join(os.path.dirname(__file__), "docs", "index.rst")
-DESCRIPTION = ('Flask-MongoEngine is a Flask extension '
-               'that provides integration with MongoEngine and WTF model forms.')
+long_description = open(doc_path).read()
 
-LONG_DESCRIPTION = None
+# Stops exit traceback on tests
 try:
-    LONG_DESCRIPTION = open(doc_path).read()
-
-    # Stops exit traceback on tests
     import multiprocessing # noqa
 except:
     pass
@@ -41,7 +19,7 @@ def load_module(module_name, script_file):
 
 setup(
     name='flask-mongoengine',
-    version=metadata.__version__,
+    version='0.8',
     url='https://github.com/mongoengine/flask-mongoengine',
     license='BSD',
     author='Ross Lawley',
@@ -59,8 +37,8 @@ def load_module(module_name, script_file):
     include_package_data=True,
     tests_require=test_requirements,
     setup_requires=test_requirements,  # Allow proper nose usage with setuptools and tox
-    description=DESCRIPTION,
-    long_description=LONG_DESCRIPTION,
+    description=description,
+    long_description=long_description,
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',