Skip to content

Commit e300e77

Browse files
authored
Merge pull request #281 from closeio/remove-metadata-module
Remove all the ugly and unnecessary metadata stuff
2 parents 4bfdd92 + f18249d commit e300e77

File tree

4 files changed

+8
-81
lines changed

4 files changed

+8
-81
lines changed

flask_mongoengine/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
from .connection import *
1313
from .json import override_json_encoder
14-
from .metadata import *
1514
from .pagination import *
1615
from .sessions import *
1716
from .wtf import WtfBaseField

flask_mongoengine/metadata.py

Lines changed: 0 additions & 17 deletions
This file was deleted.

setup.py

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,16 @@
1-
import imp
21
import os
3-
42
from setuptools import setup
53

64

7-
def load_module(module_name, script_file):
8-
"""
9-
XXX: Load modules dynamically without
10-
triggering flask_mongoengine.__init__
11-
12-
This way we do not encounter errors which
13-
requires dependencies to be pre-installed.
14-
"""
15-
module = None
16-
try:
17-
module = imp.load_source(module_name, script_file)
18-
except:
19-
pass
20-
return module
21-
22-
# Load MetaData
23-
metadata_script = os.path.join(os.path.dirname(__file__), "flask_mongoengine", "metadata.py")
24-
metadata = load_module("metadata", metadata_script)
5+
description = ('Flask-MongoEngine is a Flask extension '
6+
'that provides integration with MongoEngine and WTF model forms.')
257

26-
# Load documentation
8+
# Load index.rst as long_description
279
doc_path = os.path.join(os.path.dirname(__file__), "docs", "index.rst")
28-
DESCRIPTION = ('Flask-MongoEngine is a Flask extension '
29-
'that provides integration with MongoEngine and WTF model forms.')
10+
long_description = open(doc_path).read()
3011

31-
LONG_DESCRIPTION = None
12+
# Stops exit traceback on tests
3213
try:
33-
LONG_DESCRIPTION = open(doc_path).read()
34-
35-
# Stops exit traceback on tests
3614
import multiprocessing # noqa
3715
except:
3816
pass
@@ -41,7 +19,7 @@ def load_module(module_name, script_file):
4119

4220
setup(
4321
name='flask-mongoengine',
44-
version=metadata.__version__,
22+
version='0.8',
4523
url='https://github.com/mongoengine/flask-mongoengine',
4624
license='BSD',
4725
author='Ross Lawley',
@@ -59,8 +37,8 @@ def load_module(module_name, script_file):
5937
include_package_data=True,
6038
tests_require=test_requirements,
6139
setup_requires=test_requirements, # Allow proper nose usage with setuptools and tox
62-
description=DESCRIPTION,
63-
long_description=LONG_DESCRIPTION,
40+
description=description,
41+
long_description=long_description,
6442
classifiers=[
6543
'Development Status :: 4 - Beta',
6644
'Environment :: Web Environment',

tests/test_metadata.py

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)