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

fix mongo download link for 4.2 4.4 explicitly

Browse Source
This commit is contained in:
Bastien Gerard 2021-03-03 11:40:39 +01:00
parent 0620ac5641
commit f244207168
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/github-actions.yml vendored
View File

@ -13,8 +13,8 @@ on:
env: env:
MONGODB_3_6: 3.6.14 MONGODB_3_6: 3.6.14
MONGODB_4_0: 4.0.23 MONGODB_4_0: 4.0.23
MONGODB_4_2: 4.2.12 MONGODB_4_2: 4.2
MONGODB_4_4: 4.4.4 MONGODB_4_4: 4.4
PYMONGO_3_4: 3.4 PYMONGO_3_4: 3.4
PYMONGO_3_6: 3.6 PYMONGO_3_6: 3.6
@ -52,7 +52,7 @@ jobs:
MONGODB: $MONGODB_3_6 MONGODB: $MONGODB_3_6
PYMONGO: $PYMONGO_3_9 PYMONGO: $PYMONGO_3_9
- python-version: 3.7 - python-version: 3.7
MONGODB: MONGODB_4_2 MONGODB: $MONGODB_4_2
PYMONGO: $PYMONGO_3_6 PYMONGO: $PYMONGO_3_6
- python-version: 3.7 - python-version: 3.7
MONGODB: $MONGODB_4_4 MONGODB: $MONGODB_4_4

11
.github/workflows/install_mongo.sh vendored
View File

@ -5,11 +5,14 @@ MONGODB=$1
# Mongo > 4.0 follows different name convention for download links # Mongo > 4.0 follows different name convention for download links
mongo_build=mongodb-linux-x86_64-${MONGODB} mongo_build=mongodb-linux-x86_64-${MONGODB}
if [[ "$MONGODB" == *"4."* ]] && [[ ! "$MONGODB" == *"4.0"* ]]; then if [[ "$MONGODB" == *"4.2"* ]]; then
echo "It's there." mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
mongo_build=mongodb-linux-x86_64-ubuntu2004-v${MONGODB}-latest elif [[ "$MONGODB" == *"4.4"* ]]; then
mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
fi fi
wget http://fastdl.mongodb.org/linux/$mongo_build.tgz wget http://fastdl.mongodb.org/linux/$mongo_build.tgz
tar xzf $mongo_build.tgz tar xzf $mongo_build.tgz
${PWD}/$mongo_build/bin/mongod --version
mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*")
$mongodb_dir/bin/mongod --version

3
.github/workflows/start_mongo.sh vendored
View File

@ -2,7 +2,8 @@
MONGODB=$1 MONGODB=$1
mongodb_dir=${PWD}/mongodb-linux-x86_64-${MONGODB} mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*")
mkdir $mongodb_dir/data mkdir $mongodb_dir/data
$mongodb_dir/bin/mongod --dbpath $mongodb_dir/data --logpath $mongodb_dir/mongodb.log --fork $mongodb_dir/bin/mongod --dbpath $mongodb_dir/data --logpath $mongodb_dir/mongodb.log --fork
mongo --eval 'db.version();' # Make sure mongo is awake mongo --eval 'db.version();' # Make sure mongo is awake

1
mongoengine/mongodb_support.py
View File

@ -8,6 +8,7 @@ from mongoengine.connection import get_connection
# get_mongodb_version() # get_mongodb_version()
MONGODB_34 = (3, 4) MONGODB_34 = (3, 4)
MONGODB_36 = (3, 6) MONGODB_36 = (3, 6)
MONGODB_42 = (4, 2)
MONGODB_44 = (4, 4) MONGODB_44 = (4, 4)

4
tests/document/test_indexes.py
View File

@ -7,7 +7,7 @@ import pytest
from mongoengine import * from mongoengine import *
from mongoengine.connection import get_db from mongoengine.connection import get_db
from mongoengine.mongodb_support import MONGODB_44, get_mongodb_version from mongoengine.mongodb_support import MONGODB_42, get_mongodb_version
class TestIndexes(unittest.TestCase): class TestIndexes(unittest.TestCase):
@ -454,7 +454,7 @@ class TestIndexes(unittest.TestCase):
== "IXSCAN" == "IXSCAN"
) )
mongo_db = get_mongodb_version() mongo_db = get_mongodb_version()
PROJECTION_STR = "PROJECTION" if mongo_db < MONGODB_44 else "PROJECTION_COVERED" PROJECTION_STR = "PROJECTION" if mongo_db < MONGODB_42 else "PROJECTION_COVERED"
assert ( assert (
query_plan.get("queryPlanner").get("winningPlan").get("stage") query_plan.get("queryPlanner").get("winningPlan").get("stage")
== PROJECTION_STR == PROJECTION_STR