Skip to content

PYTHON-4321 Add support for Python 3.13 and update changelog for 1.11.0 release #885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
Sep 6, 2024
Merged

PYTHON-4321 Add support for Python 3.13 and update changelog for 1.11.0 release #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
578dfc6
PYTHON-4321 Add support for Python 3.13 and update changelog for 1.11…
blink1073 Sep 4, 2024
3faebee
try with fixed download
blink1073 Sep 4, 2024
d49b8e2
try with python 3.13
blink1073 Sep 4, 2024
f429ce1
test with py313
blink1073 Sep 4, 2024
0c70936
try setting test_encryption
blink1073 Sep 4, 2024
802aba0
try again
blink1073 Sep 4, 2024
1178395
try without crypt_shared
blink1073 Sep 4, 2024
675c128
fixup
blink1073 Sep 4, 2024
14db450
cleanup
blink1073 Sep 5, 2024
0c29320
debug
blink1073 Sep 5, 2024
5268dcc
fixup
blink1073 Sep 5, 2024
dc507a4
try with same mongocrypt_dir
blink1073 Sep 5, 2024
a9e0814
use same pymongocrypt_lib
blink1073 Sep 5, 2024
ae3655d
try with same crypt_shared dir
blink1073 Sep 5, 2024
d8a79ff
run orchestration
blink1073 Sep 5, 2024
95d36da
try again
blink1073 Sep 5, 2024
79a1aec
debug
blink1073 Sep 5, 2024
b542091
debug
blink1073 Sep 5, 2024
337d9e6
fixup
blink1073 Sep 5, 2024
783c000
try again
blink1073 Sep 5, 2024
bbf8be2
cleanup
blink1073 Sep 5, 2024
26a9f14
fix
blink1073 Sep 5, 2024
b7677d2
cleanup
blink1073 Sep 5, 2024
8dcd59f
address review
blink1073 Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .evergreen/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ functions:
- command: subprocess.exec
params:
binary: bash
working_dir: "${DRIVERS_TOOLS}"
env:
TOPOLOGY: replica_set
MONGODB_VERSION: "8.0"
Expand Down
24 changes: 9 additions & 15 deletions bindings/python/.evergreen/integ-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,31 @@ 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 .
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

Expand Down
1 change: 1 addition & 0 deletions bindings/python/.evergreen/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
9 changes: 8 additions & 1 deletion bindings/python/CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
1 change: 1 addition & 0 deletions bindings/python/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this really the only change we need to make to support 3.13? Wow!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We had been testing in GitHub Actions, but now in EVG as well. 😄

"Topic :: Database",
]

Expand Down
Loading