pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:MongoEngine/mongoengine into fix_count_documents_deprecation

Browse Source
This commit is contained in:
Bastien Gérard 2020-01-12 10:07:36 +01:00
commit 53cf26b9af
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -33,11 +33,12 @@ env:
global: global:
- MONGODB_3_4=3.4.17 - MONGODB_3_4=3.4.17
- MONGODB_3_6=3.6.12 - MONGODB_3_6=3.6.12
- PYMONGO_3_10=3.10
- PYMONGO_3_9=3.9 - PYMONGO_3_9=3.9
- PYMONGO_3_6=3.6 - PYMONGO_3_6=3.6
- PYMONGO_3_4=3.4 - PYMONGO_3_4=3.4
matrix: matrix:
- MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_9} - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_10}
matrix: matrix:
@ -51,6 +52,8 @@ matrix:
env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6} env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6}
- python: 3.7 - python: 3.7
env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_9} env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_9}
- python: 3.7
env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_10}
install: install:
# Install Mongo # Install Mongo
@ -110,5 +113,5 @@ deploy:
on: on:
tags: true tags: true
repo: MongoEngine/mongoengine repo: MongoEngine/mongoengine
condition: ($PYMONGO = ${PYMONGO_3_9}) && ($MONGODB = ${MONGODB_3_4}) condition: ($PYMONGO = ${PYMONGO_3_10}) && ($MONGODB = ${MONGODB_3_4})
python: 2.7 python: 2.7

2
setup.py
View File

@ -143,7 +143,7 @@ setup(
long_description=LONG_DESCRIPTION, long_description=LONG_DESCRIPTION,
platforms=["any"], platforms=["any"],
classifiers=CLASSIFIERS, classifiers=CLASSIFIERS,
install_requires=["pymongo>=3.4", "six>=1.10.0"], install_requires=["pymongo>=3.4, <4.0", "six>=1.10.0"],
cmdclass={"test": PyTest}, cmdclass={"test": PyTest},
**extra_opts **extra_opts
) )

3
tox.ini
View File

@ -7,6 +7,7 @@ commands =
deps = deps =
mg34: pymongo>=3.4,<3.5 mg34: pymongo>=3.4,<3.5
mg36: pymongo>=3.6,<3.7 mg36: pymongo>=3.6,<3.7
mg39: pymongo>=3.9,<4.0 mg39: pymongo>=3.9,<3.10
mg310: pymongo>=3.10,<3.11
setenv = setenv =
PYTHON_EGG_CACHE = {envdir}/python-eggs PYTHON_EGG_CACHE = {envdir}/python-eggs