diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 86cae5d09..0664ee39a 100755 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -162,6 +162,7 @@ functions: - command: subprocess.exec params: binary: bash + working_dir: "${DRIVERS_TOOLS}" env: TOPOLOGY: replica_set MONGODB_VERSION: "8.0" diff --git a/bindings/python/.evergreen/integ-test.sh b/bindings/python/.evergreen/integ-test.sh index 8bf1eb1e7..2efdc9a07 100755 --- a/bindings/python/.evergreen/integ-test.sh +++ b/bindings/python/.evergreen/integ-test.sh @@ -10,27 +10,21 @@ BASE_PYTHON=$(find_python3) # MONGOCRYPT_DIR is set by libmongocrypt/.evergreen/config.yml MONGOCRYPT_DIR="$MONGOCRYPT_DIR" +CRYPT_SHARED_DIR="$DRIVERS_TOOLS" MACHINE=$(uname -m) if [ $MACHINE == "aarch64" ]; then PYTHON="/opt/mongodbtoolchain/v4/bin/python3" - TARGET=rhel82 else - TARGET=rhel80 - PYTHON="/opt/python/3.8/bin/python3" + PYTHON="/opt/python/3.13/bin/python3" fi -CRYPT_SHARED_DIR="$(pwd)/crypt_shared" -/opt/mongodbtoolchain/v3/bin/python3 $DRIVERS_TOOLS/.evergreen/mongodl.py --component \ - crypt_shared --version latest --out $CRYPT_SHARED_DIR --target $TARGET - -if [ -e "${MONGOCRYPT_DIR}/lib64/" ]; then - export PYMONGOCRYPT_LIB=${MONGOCRYPT_DIR}/nocrypto/lib64/libmongocrypt.so - PYMONGOCRYPT_LIB_CRYPTO=${MONGOCRYPT_DIR}/lib64/libmongocrypt.so +if [ -d "${MONGOCRYPT_DIR}/nocrypto/lib64" ]; then + PYMONGOCRYPT_LIB="${MONGOCRYPT_DIR}/nocrypto/lib64/libmongocrypt.so" else - export PYMONGOCRYPT_LIB=${MONGOCRYPT_DIR}/nocrypto/lib/libmongocrypt.so - PYMONGOCRYPT_LIB_CRYPTO=${MONGOCRYPT_DIR}/lib/libmongocrypt.so + PYMONGOCRYPT_LIB="${MONGOCRYPT_DIR}/nocrypto/lib/libmongocrypt.so" fi +export PYMONGOCRYPT_LIB createvirtualenv $PYTHON .venv pip install -e . @@ -38,9 +32,9 @@ pushd $PYMONGO_DIR pip install -e ".[test,encryption]" source ${DRIVERS_TOOLS}/.evergreen/csfle/secrets-export.sh set -x -TEST_CRYPT_SHARED=1 DYLD_FALLBACK_LIBRARY_PATH=$CRYPT_SHARED_DIR/lib/:${DYLD_FALLBACK_LIBRARY_PATH:-} \ - LD_LIBRARY_PATH=$CRYPT_SHARED_DIR/lib:${LD_LIBRARY_PATH-} \ - PATH=$CRYPT_SHARED_DIR/bin:$PATH \ +TEST_CRYPT_SHARED=1 DYLD_FALLBACK_LIBRARY_PATH=$CRYPT_SHARED_DIR:${DYLD_FALLBACK_LIBRARY_PATH:-} \ + LD_LIBRARY_PATH=$CRYPT_SHARED_DIR:${LD_LIBRARY_PATH-} \ + PATH=$CRYPT_SHARED_DIR:$PATH \ AUTH=auth SSL=ssl \ .evergreen/run-tests.sh -m encryption diff --git a/bindings/python/.evergreen/test.sh b/bindings/python/.evergreen/test.sh index cc7e52f1c..288ff9af1 100755 --- a/bindings/python/.evergreen/test.sh +++ b/bindings/python/.evergreen/test.sh @@ -62,6 +62,7 @@ else "/opt/python/3.10/bin/python3" "/opt/python/3.11/bin/python3" "/opt/python/3.12/bin/python3" + "/opt/python/3.13/bin/python3" ) fi /opt/mongodbtoolchain/v3/bin/python3 drivers-evergreen-tools/.evergreen/mongodl.py --component \ diff --git a/bindings/python/CHANGELOG.rst b/bindings/python/CHANGELOG.rst index 05b93a3aa..07214240e 100644 --- a/bindings/python/CHANGELOG.rst +++ b/bindings/python/CHANGELOG.rst @@ -1,8 +1,15 @@ Changelog ========= +Changes in Version 1.11.0 +------------------------- + +- Bundle libmongocrypt 1.11.0 in release wheels. +- Add support for Python 3.13. +- Fix bug in Python async support for ``AsyncMongoCryptCallback.fetch_keys``. + Changes in Version 1.10.1 ------------------------- +------------------------- - Bundle libmongocrypt 1.10.1 in release wheels. diff --git a/bindings/python/pyproject.toml b/bindings/python/pyproject.toml index ec0c9dc71..f69cf3c57 100644 --- a/bindings/python/pyproject.toml +++ b/bindings/python/pyproject.toml @@ -36,6 +36,7 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: Database", ]