Skip to content

Commit 91093e0

Browse files
authored
Merge branch 'master' into PYTHON-4965
2 parents c136fbc + 0e8d704 commit 91093e0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1723
-1962
lines changed

.evergreen/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ functions:
289289
"run tests":
290290
- command: subprocess.exec
291291
params:
292-
include_expansions_in_env: ["TEST_DATA_LAKE", "AUTH", "SSL", "TEST_INDEX_MANAGEMENT", "CRYPT_SHARED_LIB_PATH", "test_encryption", "test_encryption_pyopenssl", "test_crypt_shared", "test_pyopenssl", "test_loadbalancer", "test_serverless", "ORCHESTRATION_FILE"]
292+
include_expansions_in_env: ["TEST_DATA_LAKE", "PYTHON_BINARY", "AUTH", "SSL", "TEST_INDEX_MANAGEMENT", "CRYPT_SHARED_LIB_PATH", "test_encryption", "test_encryption_pyopenssl", "test_crypt_shared", "test_pyopenssl", "test_loadbalancer", "test_serverless", "ORCHESTRATION_FILE"]
293293
binary: bash
294294
working_dir: "src"
295295
args:

.evergreen/run-tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export PIP_PREFER_BINARY=1 # Prefer binary dists by default
3838

3939
set +x
4040
python -c "import sys; sys.exit(sys.prefix == sys.base_prefix)" || (echo "Not inside a virtual env!"; exit 1)
41+
PYTHON_IMPL=$(python -c "import platform; print(platform.python_implementation())")
4142

4243
# Try to source local Drivers Secrets
4344
if [ -f ./secrets-export.sh ]; then
@@ -48,7 +49,7 @@ else
4849
fi
4950

5051
# Ensure C extensions have compiled.
51-
if [ -z "${NO_EXT:-}" ]; then
52+
if [ -z "${NO_EXT:-}" ] && [ "$PYTHON_IMPL" = "CPython" ]; then
5253
python tools/fail_if_no_c.py
5354
fi
5455

@@ -245,7 +246,6 @@ python -c 'import sys; print(sys.version)'
245246

246247
# Run the tests with coverage if requested and coverage is installed.
247248
# Only cover CPython. PyPy reports suspiciously low coverage.
248-
PYTHON_IMPL=$(python -c "import platform; print(platform.python_implementation())")
249249
if [ -n "$COVERAGE" ] && [ "$PYTHON_IMPL" = "CPython" ]; then
250250
# Keep in sync with combine-coverage.sh.
251251
# coverage >=5 is needed for relative_files=true.

.evergreen/utils.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ testinstall () {
7878
PYTHON=$1
7979
RELEASE=$2
8080
NO_VIRTUALENV=$3
81+
PYTHON_IMPL=$(python -c "import platform; print(platform.python_implementation())")
8182

8283
if [ -z "$NO_VIRTUALENV" ]; then
8384
createvirtualenv $PYTHON venvtestinstall
@@ -86,7 +87,11 @@ testinstall () {
8687

8788
$PYTHON -m pip install --upgrade $RELEASE
8889
cd tools
89-
$PYTHON fail_if_no_c.py
90+
91+
if [ "$PYTHON_IMPL" = "CPython" ]; then
92+
$PYTHON fail_if_no_c.py
93+
fi
94+
9095
$PYTHON -m pip uninstall -y pymongo
9196
cd ..
9297

THIRD-PARTY-NOTICES

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,61 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
3838
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
3939
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
4040
THE SOFTWARE.
41+
42+
2) License Notice for _asyncio_lock.py
43+
-----------------------------------------
44+
45+
1. This LICENSE AGREEMENT is between the Python Software Foundation
46+
("PSF"), and the Individual or Organization ("Licensee") accessing and
47+
otherwise using this software ("Python") in source or binary form and
48+
its associated documentation.
49+
50+
2. Subject to the terms and conditions of this License Agreement, PSF hereby
51+
grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
52+
analyze, test, perform and/or display publicly, prepare derivative works,
53+
distribute, and otherwise use Python alone or in any derivative version,
54+
provided, however, that PSF's License Agreement and PSF's notice of copyright,
55+
i.e., "Copyright (c) 2001-2024 Python Software Foundation; All Rights Reserved"
56+
are retained in Python alone or in any derivative version prepared by Licensee.
57+
58+
3. In the event Licensee prepares a derivative work that is based on
59+
or incorporates Python or any part thereof, and wants to make
60+
the derivative work available to others as provided herein, then
61+
Licensee hereby agrees to include in any such work a brief summary of
62+
the changes made to Python.
63+
64+
4. PSF is making Python available to Licensee on an "AS IS"
65+
basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
66+
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
67+
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
68+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
69+
INFRINGE ANY THIRD PARTY RIGHTS.
70+
71+
5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
72+
FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
73+
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
74+
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
75+
76+
6. This License Agreement will automatically terminate upon a material
77+
breach of its terms and conditions.
78+
79+
7. Nothing in this License Agreement shall be deemed to create any
80+
relationship of agency, partnership, or joint venture between PSF and
81+
Licensee. This License Agreement does not grant permission to use PSF
82+
trademarks or trade name in a trademark sense to endorse or promote
83+
products or services of Licensee, or any third party.
84+
85+
8. By copying, installing or otherwise using Python, Licensee
86+
agrees to be bound by the terms and conditions of this License
87+
Agreement.
88+
89+
Permission to use, copy, modify, and/or distribute this software for any
90+
purpose with or without fee is hereby granted.
91+
92+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
93+
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
94+
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
95+
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
96+
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
97+
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
98+
PERFORMANCE OF THIS SOFTWARE.

0 commit comments

Comments
 (0)