Merge remote-tracking branch 'remotes/upstream/master'
Conflicts: AUTHORS docs/changelog.rst
This commit is contained in:
commit
8e7c5af16c
1
AUTHORS
1
AUTHORS
@ -229,3 +229,4 @@ that much better:
|
|||||||
* Emile Caron (https://github.com/emilecaron)
|
* Emile Caron (https://github.com/emilecaron)
|
||||||
* Amit Lichtenberg (https://github.com/amitlicht)
|
* Amit Lichtenberg (https://github.com/amitlicht)
|
||||||
* Gang Li (https://github.com/iici-gli)
|
* Gang Li (https://github.com/iici-gli)
|
||||||
|
* Lars Butler (https://github.com/larsbutler)
|
||||||
|
@ -12,6 +12,7 @@ Changes in 0.10.1 - DEV
|
|||||||
- StrictDict & SemiStrictDict are shadowed at init time. #1105
|
- StrictDict & SemiStrictDict are shadowed at init time. #1105
|
||||||
- Fix ListField minus index assignment does not work. #1119
|
- Fix ListField minus index assignment does not work. #1119
|
||||||
- Remove code that marks field as changed when the field has default but not existed in database #1126
|
- Remove code that marks field as changed when the field has default but not existed in database #1126
|
||||||
|
- Remove test dependencies (nose and rednose) from install dependencies list. #1079
|
||||||
|
|
||||||
Changes in 0.10.0
|
Changes in 0.10.0
|
||||||
=================
|
=================
|
||||||
|
5
setup.py
5
setup.py
@ -52,13 +52,13 @@ CLASSIFIERS = [
|
|||||||
extra_opts = {"packages": find_packages(exclude=["tests", "tests.*"])}
|
extra_opts = {"packages": find_packages(exclude=["tests", "tests.*"])}
|
||||||
if sys.version_info[0] == 3:
|
if sys.version_info[0] == 3:
|
||||||
extra_opts['use_2to3'] = True
|
extra_opts['use_2to3'] = True
|
||||||
extra_opts['tests_require'] = ['nose', 'coverage==3.7.1', 'blinker', 'Pillow>=2.0.0']
|
extra_opts['tests_require'] = ['nose', 'rednose', 'coverage==3.7.1', 'blinker', 'Pillow>=2.0.0']
|
||||||
if "test" in sys.argv or "nosetests" in sys.argv:
|
if "test" in sys.argv or "nosetests" in sys.argv:
|
||||||
extra_opts['packages'] = find_packages()
|
extra_opts['packages'] = find_packages()
|
||||||
extra_opts['package_data'] = {"tests": ["fields/mongoengine.png", "fields/mongodb_leaf.png"]}
|
extra_opts['package_data'] = {"tests": ["fields/mongoengine.png", "fields/mongodb_leaf.png"]}
|
||||||
else:
|
else:
|
||||||
# coverage 4 does not support Python 3.2 anymore
|
# coverage 4 does not support Python 3.2 anymore
|
||||||
extra_opts['tests_require'] = ['nose', 'coverage==3.7.1', 'blinker', 'Pillow>=2.0.0', 'python-dateutil']
|
extra_opts['tests_require'] = ['nose', 'rednose', 'coverage==3.7.1', 'blinker', 'Pillow>=2.0.0', 'python-dateutil']
|
||||||
|
|
||||||
if sys.version_info[0] == 2 and sys.version_info[1] == 6:
|
if sys.version_info[0] == 2 and sys.version_info[1] == 6:
|
||||||
extra_opts['tests_require'].append('unittest2')
|
extra_opts['tests_require'].append('unittest2')
|
||||||
@ -79,6 +79,5 @@ setup(name='mongoengine',
|
|||||||
classifiers=CLASSIFIERS,
|
classifiers=CLASSIFIERS,
|
||||||
install_requires=['pymongo>=2.7.1'],
|
install_requires=['pymongo>=2.7.1'],
|
||||||
test_suite='nose.collector',
|
test_suite='nose.collector',
|
||||||
setup_requires=['nose', 'rednose'], # Allow proper nose usage with setuptols and tox
|
|
||||||
**extra_opts
|
**extra_opts
|
||||||
)
|
)
|
||||||
|
2
tox.ini
2
tox.ini
@ -6,6 +6,8 @@ envlist = {py26,py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28}
|
|||||||
commands =
|
commands =
|
||||||
python setup.py nosetests {posargs}
|
python setup.py nosetests {posargs}
|
||||||
deps =
|
deps =
|
||||||
|
nose
|
||||||
|
rednose
|
||||||
mg27: PyMongo<2.8
|
mg27: PyMongo<2.8
|
||||||
mg28: PyMongo>=2.8,<3.0
|
mg28: PyMongo>=2.8,<3.0
|
||||||
mg30: PyMongo>=3.0
|
mg30: PyMongo>=3.0
|
||||||
|
Loading…
x
Reference in New Issue
Block a user