Post rebase and Django removal tuning (and prepare for PyMongo 3)
This commit is contained in:
parent
58c8cf1a3a
commit
c804c395ed
31
.travis.yml
31
.travis.yml
@ -8,30 +8,11 @@ python:
|
|||||||
- pypy
|
- pypy
|
||||||
- pypy3
|
- pypy3
|
||||||
env:
|
env:
|
||||||
- PYMONGO=2.7 DJANGO=dev
|
- PYMONGO=2.7
|
||||||
- PYMONGO=2.7 DJANGO=1.8
|
- PYMONGO=2.8
|
||||||
- PYMONGO=2.7 DJANGO=1.7
|
# - PYMONGO=3.0
|
||||||
- PYMONGO=2.7 DJANGO=1.6
|
# - PYMONGO=dev
|
||||||
- PYMONGO=2.7 DJANGO=1.5
|
|
||||||
- PYMONGO=2.8 DJANGO=dev
|
|
||||||
- PYMONGO=2.8 DJANGO=1.8
|
|
||||||
- PYMONGO=2.8 DJANGO=1.7
|
|
||||||
- PYMONGO=2.8 DJANGO=1.6
|
|
||||||
- PYMONGO=2.8 DJANGO=1.5
|
|
||||||
matrix:
|
matrix:
|
||||||
exclude:
|
|
||||||
- python: '2.6'
|
|
||||||
env: PYMONGO=2.7 DJANGO=dev
|
|
||||||
- python: '2.6'
|
|
||||||
env: PYMONGO=2.8
|
|
||||||
- python: '2.6'
|
|
||||||
env: PYMONGO=2.7 DJANGO=1.7
|
|
||||||
- python: '2.6'
|
|
||||||
env: PYMONGO=2.8 DJANGO=1.7
|
|
||||||
- python: '2.6'
|
|
||||||
env: PYMONGO=2.7 DJANGO=1.8
|
|
||||||
- python: '2.6'
|
|
||||||
env: PYMONGO=2.8 DJANGO=1.8
|
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
before_install:
|
before_install:
|
||||||
- travis_retry sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
|
- travis_retry sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
|
||||||
@ -44,9 +25,9 @@ install:
|
|||||||
libtiff4-dev libjpeg8-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev
|
libtiff4-dev libjpeg8-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev
|
||||||
python-tk
|
python-tk
|
||||||
- travis_retry pip install tox>=1.9 coveralls
|
- travis_retry pip install tox>=1.9 coveralls
|
||||||
- travis_retry tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO-dj$DJANGO | tr -d . | sed -e 's/pypypy/pypy/') -- -e test
|
- travis_retry tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -e test
|
||||||
script:
|
script:
|
||||||
- tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO-dj$DJANGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
|
- tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
|
||||||
after_script: coveralls --verbose
|
after_script: coveralls --verbose
|
||||||
notifications:
|
notifications:
|
||||||
irc: irc.freenode.org#mongoengine
|
irc: irc.freenode.org#mongoengine
|
||||||
|
@ -38,12 +38,11 @@ Dependencies
|
|||||||
|
|
||||||
Optional Dependencies
|
Optional Dependencies
|
||||||
---------------------
|
---------------------
|
||||||
- **Django Integration:** Django>=1.4.0 for Python 2.x or PyPy and Django>=1.5.0 for Python 3.x
|
|
||||||
- **Image Fields**: Pillow>=2.0.0
|
- **Image Fields**: Pillow>=2.0.0
|
||||||
- dateutil>=2.1.0
|
- dateutil>=2.1.0
|
||||||
|
|
||||||
.. note
|
.. note
|
||||||
MongoEngine always runs it's test suite against the latest patch version of each dependecy. e.g.: Django 1.6.5
|
MongoEngine always runs it's test suite against the latest patch version of each dependecy. e.g.: PyMongo 3.0.1
|
||||||
|
|
||||||
Examples
|
Examples
|
||||||
========
|
========
|
||||||
|
10
tox.ini
10
tox.ini
@ -1,7 +1,6 @@
|
|||||||
[tox]
|
[tox]
|
||||||
envlist =
|
envlist = {py26,py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28}
|
||||||
{py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28,mg30}-{dj15,dj16,dj17,dj18,djdev},
|
#envlist = {py26,py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28,mg30,mgdev}
|
||||||
py26-{mg27,mg28,mg30}-{dj15,dj16}
|
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
commands =
|
commands =
|
||||||
@ -11,8 +10,3 @@ deps =
|
|||||||
mg28: PyMongo>=2.8,<3.0
|
mg28: PyMongo>=2.8,<3.0
|
||||||
mg30: PyMongo>=3.0
|
mg30: PyMongo>=3.0
|
||||||
mgdev: https://github.com/mongodb/mongo-python-driver/tarball/master
|
mgdev: https://github.com/mongodb/mongo-python-driver/tarball/master
|
||||||
dj15: Django<1.6
|
|
||||||
dj16: Django>=1.6,<1.7
|
|
||||||
dj17: Django>=1.7,<1.8
|
|
||||||
dj18: Django>=1.8,<1.9
|
|
||||||
djdev: https://github.com/django/django/tarball/master
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user