Merge branch 'master' into transactions-global-session-ver

Author: juannyG

.github/workflows/github-actions.yml

@@ -17,16 +17,24 @@ env:
   MONGODB_4_0: 4.0.28
   MONGODB_4_4: 4.4
   MONGODB_5_0: "5.0"
+  MONGODB_6_0: "6.0"
+  MONGODB_7_0: "7.0"
 
   PYMONGO_3_4: 3.4
   PYMONGO_3_6: 3.6
   PYMONGO_3_9: 3.9
   PYMONGO_3_11: 3.11
   PYMONGO_3_12: 3.12
   PYMONGO_4_0: 4.0
-  PYMONGO_4_3: 4.3.2
+  PYMONGO_4_3: 4.3.3
+  PYMONGO_4_4: 4.4.1
+  PYMONGO_4_6: 4.6.2
+  PYMONGO_4_7: 4.7.3
+  PYMONGO_4_8: 4.8.0
 
-  MAIN_PYTHON_VERSION: 3.7
+  MAIN_PYTHON_VERSION: 3.9
+
+  MONGOSH: 2.2.15 # Needed for MongoDB 6.0+
 
 jobs:
   linting:
@@ -49,7 +57,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.9]
+        python-version: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.9, pypy3.10]
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_11]
         include:
@@ -68,6 +76,18 @@ jobs:
           - python-version: "3.11"
             MONGODB: $MONGODB_5_0
             PYMONGO: $PYMONGO_4_3
+          - python-version: "3.11"
+            MONGODB: $MONGODB_6_0
+            PYMONGO: $PYMONGO_4_4
+          - python-version: "3.11"
+            MONGODB: $MONGODB_7_0
+            PYMONGO: $PYMONGO_4_6
+          - python-version: "3.11"
+            MONGODB: $MONGODB_7_0
+            PYMONGO: $PYMONGO_4_7
+          - python-version: "3.11"
+            MONGODB: $MONGODB_7_0
+            PYMONGO: $PYMONGO_4_8
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -78,12 +98,13 @@ jobs:
     - name: install mongo and ci dependencies
       run: |
         bash .github/workflows/install_mongo.sh ${{ matrix.MONGODB }}
+        bash .github/workflows/install_mongosh.sh ${{ matrix.MONGODB }} ${{ env.MONGOSH }}
         bash .github/workflows/install_ci_python_dep.sh
         bash .github/workflows/start_mongo.sh ${{ matrix.MONGODB }}
     - name: tox dry-run (to pre-install venv)
-      run: tox -e $(echo py${{ matrix.python-version }}-mg${{ matrix.PYMONGO }} | tr -d . | sed -e 's/pypypy/pypy/') -- -a "-k=test_ci_placeholder"
+      run: tox -e $(echo py${{ matrix.python-version }}-mg${{ matrix.PYMONGO }} | tr -d . | sed -e 's/pypypy/pypy/') -- "-k=test_ci_placeholder"
     - name: Run test suite
-      run: tox -e $(echo py${{ matrix.python-version }}-mg${{ matrix.PYMONGO }} | tr -d . | sed -e 's/pypypy/pypy/') -- -a "--cov=mongoengine"
+      run: tox -e $(echo py${{ matrix.python-version }}-mg${{ matrix.PYMONGO }} | tr -d . | sed -e 's/pypypy/pypy/') -- "--cov=mongoengine"
     - name: Send coverage to Coveralls
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -94,6 +115,8 @@ jobs:
   build_doc_dryrun:
     # ensures that readthedocs can be built continuously
     # to avoid that it breaks when new releases are being created
+    # The way RTD works is that it builds the doc on its side
+    # builds are visible at https://readthedocs.org/projects/mongoengine-odm/builds/
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3

.github/workflows/install_mongo.sh

@@ -11,6 +11,10 @@ elif [[ "$MONGODB" == *"4.4"* ]]; then
   mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
 elif [[ "$MONGODB" == *"5.0"* ]]; then
   mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
+elif [[ "$MONGODB" == *"6.0"* ]]; then
+  mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
+elif [[ "$MONGODB" == *"7.0"* ]]; then
+  mongo_build=mongodb-linux-x86_64-ubuntu2004-v${MONGODB}-latest
 fi
 
 wget http://fastdl.mongodb.org/linux/$mongo_build.tgz

.github/workflows/install_mongosh.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+MONGODB=$1
+MONGOSH=$2
+
+if (( $(echo "$MONGODB < 6.0" | bc -l) )); then
+  echo "mongosh is not needed for MongoDB versions less than 6.0"
+  exit 0
+fi
+
+wget https://downloads.mongodb.com/compass/mongosh-${MONGOSH}-linux-x64.tgz
+tar xzf mongosh-${MONGOSH}-linux-x64.tgz
+
+mongosh_dir=$(find ${PWD}/ -type d -name "mongosh-${MONGOSH}-linux-x64")
+$mongosh_dir/bin/mongosh --version

.github/workflows/start_mongo.sh

@@ -5,6 +5,12 @@ MONGODB=$1
 mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*")
 
 mkdir $mongodb_dir/data
+
 $mongodb_dir/bin/mongod --dbpath $mongodb_dir/data --logpath $mongodb_dir/mongodb.log --fork --replSet mongoengine
-mongo --eval 'db.version();'    # Make sure mongo is awake
-mongo --eval "rs.initiate()"
+if (( $(echo "$MONGODB < 6.0" | bc -l) )); then
+mongo --quiet --eval 'db.runCommand("ping").ok'    # Make sure mongo is awake
+mongo --quiet --eval "rs.initiate()"
+else
+mongosh --quiet --eval 'db.runCommand("ping").ok'  # Make sure mongo is awake
+mongosh --quiet --eval "rs.initiate()"
+fi

.pre-commit-config.yaml

@@ -1,28 +1,28 @@
 fail_fast: false
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: check-merge-conflict
       - id: debug-statements
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/ambv/black
-    rev: 23.9.1
+    rev: 24.2.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/flake8
-    rev: 6.1.0
+    rev: 7.0.0
     hooks:
       - id: flake8
         additional_dependencies:
           - importlib_metadata<5
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.14.0
+    rev: v3.15.1
     hooks:
       - id: pyupgrade
         args: [--py36-plus]
   - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort

.readthedocs.yml

@@ -11,10 +11,15 @@ sphinx:
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.7
   install:
     - requirements: docs/requirements.txt
     # docs/conf.py is importing mongoengine
     # so mongoengine needs to be installed as well
     - method: setuptools
       path: .
+
+# Specify the build environment
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.9"

AUTHORS

@@ -264,4 +264,5 @@ that much better:
  * oleksandr-l5 (https://github.com/oleksandr-l5)
  * Ido Shraga (https://github.com/idoshr)
  * Terence Honles (https://github.com/terencehonles)
+ * Sean Bermejo (https://github.com/seanbermejo)
  * Juan Gutierrez (https://github.com/juannyg)

CONTRIBUTING.rst

@@ -82,7 +82,7 @@ General Guidelines
   should adapt to the breaking change in docs/upgrade.rst.
 - Write inline documentation for new classes and methods.
 - Write tests and make sure they pass (make sure you have a mongod
-  running on the default port, then execute ``python setup.py test``
+  running on the default port, then execute ``pytest tests/``
   from the cmd line to run the test suite).
 - Ensure tests pass on all supported Python, PyMongo, and MongoDB versions.
   You can test various Python and PyMongo versions locally by executing

README.rst

@@ -4,7 +4,7 @@ MongoEngine
 :Info: MongoEngine is an ORM-like layer on top of PyMongo.
 :Repository: https://github.com/MongoEngine/mongoengine
 :Author: Harry Marr (http://github.com/hmarr)
-:Maintainer: Stefan Wójcik (http://github.com/wojcikstefan)
+:Maintainer: Bastien Gerard (http://github.com/bagerard)
 
 .. image:: https://travis-ci.org/MongoEngine/mongoengine.svg?branch=master
   :target: https://travis-ci.org/MongoEngine/mongoengine
@@ -21,6 +21,10 @@ MongoEngine
 .. image:: https://img.shields.io/pypi/v/mongoengine.svg
   :target: https://pypi.python.org/pypi/mongoengine
 
+
+.. image:: https://readthedocs.org/projects/mongoengine-odm/badge/?version=latest
+  :target: https://readthedocs.org/projects/mongoengine-odm/builds/
+
 About
 =====
 MongoEngine is a Python Object-Document Mapper for working with MongoDB.
@@ -31,7 +35,7 @@ an `API reference <https://mongoengine-odm.readthedocs.io/apireference.html>`_.
 
 Supported MongoDB Versions
 ==========================
-MongoEngine is currently tested against MongoDB v3.6, v4.0, v4.4 and v5.0. Future versions
+MongoEngine is currently tested against MongoDB v3.6, v4.0, v4.4, v5.0, v6.0 and v7.0. Future versions
 should be supported as well, but aren't actively tested at the moment. Make
 sure to open an issue or submit a pull request if you experience any problems
 with a more recent MongoDB versions.
@@ -125,8 +129,7 @@ Some simple examples of what MongoEngine code looks like:
 Tests
 =====
 To run the test suite, ensure you are running a local instance of MongoDB on
-the standard port and have ``pytest`` installed. Then, run ``python setup.py test``
-or simply ``pytest``.
+the standard port and have ``pytest`` installed. Then, run ``pytest tests/``.
 
 To run the test suite on every supported Python and PyMongo version, you can
 use ``tox``. You'll need to make sure you have each supported Python version
@@ -139,15 +142,6 @@ installed in your environment and then:
     # Run the test suites
     $ tox
 
-If you wish to run a subset of tests, use the pytest convention:
-
-.. code-block:: shell
-
-    # Run all the tests in a particular test file
-    $ pytest tests/fields/test_fields.py
-    # Run only particular test class in that file
-    $ pytest tests/fields/test_fields.py::TestField
-
 Community
 =========
 - `MongoEngine Users mailing list

benchmarks/test_basic_doc_ops.py

@@ -60,13 +60,9 @@ def save_book():
     print("Save to database: %.3fus" % (timeit(save_book, 100) * 10**6))
 
     son = b.to_mongo()
-    print(
-        "Load from SON: %.3fus" % (timeit(lambda: Book._from_son(son), 1000) * 10**6)
-    )
+    print("Load from SON: %.3fus" % (timeit(lambda: Book._from_son(son), 1000) * 10**6))
 
-    print(
-        "Load from database: %.3fus" % (timeit(lambda: Book.objects[0], 100) * 10**6)
-    )
+    print("Load from database: %.3fus" % (timeit(lambda: Book.objects[0], 100) * 10**6))
 
     def create_and_delete_book():
         b = init_book()
@@ -116,13 +112,11 @@ def save_company():
 
     son = company.to_mongo()
     print(
-        "Load from SON: %.3fms"
-        % (timeit(lambda: Company._from_son(son), 100) * 10**3)
+        "Load from SON: %.3fms" % (timeit(lambda: Company._from_son(son), 100) * 10**3)
     )
 
     print(
-        "Load from database: %.3fms"
-        % (timeit(lambda: Company.objects[0], 100) * 10**3)
+        "Load from database: %.3fms" % (timeit(lambda: Company.objects[0], 100) * 10**3)
     )
 
     def create_and_delete_company():