Skip to content

Commit 3cfeb77

Browse files
sophiayangDBsophiayangDB
authored
Merge branch 'master' into PYTHON-5867 
2 parents 5b92f74 + 3405791 commit 3cfeb77

29 files changed

Lines changed: 348 additions & 99 deletions

‎.evergreen/remove-unimplemented-tests.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash
22
PYMONGO=$(dirname "$(cd "$(dirname "$0")" || exit; pwd)")
33

4-
rm $PYMONGO/test/transactions/legacy/errors-client.json # PYTHON-1894
54
rm $PYMONGO/test/connection_monitoring/wait-queue-fairness.json # PYTHON-1873
65
rm $PYMONGO/test/discovery_and_monitoring/unified/pool-clear-application-error.json # PYTHON-4918
76
rm $PYMONGO/test/discovery_and_monitoring/unified/pool-clear-checkout-error.json # PYTHON-4918

‎.evergreen/scripts/resync-all-specs.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,13 @@ def apply_patches(errored):
4444
patches = [str(p) for p in spec_patch_dir.glob("*.patch")]
4545
patches += [str(p) for p in (spec_patch_dir / "permanent").glob("*.patch")]
4646
if patches:
47+
for patch in patches:
48+
print(f"Applying patch {patch}")
4749
subprocess.run(
4850
[ # noqa: S603, S607
4951
"git",
5052
"apply",
53+
"-R",
5154
"--allow-empty",
5255
"--whitespace=fix",
5356
*patches,

‎.evergreen/spec-patch/PYTHON-5799.patch‎

Lines changed: 232 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,232 @@
1+
diff --git a/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix-ci-di.json b/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix-ci-di.json
2+
index c43bf9390..3002c642b 100644
3+
--- a/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix-ci-di.json
4+
+++ b/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix-ci-di.json
5+
@@ -11,7 +11,7 @@
6+
"bsonType": "string",
7+
"queries": [
8+
{
9+
- "queryType": "prefixPreview",
10+
+ "queryType": "prefix",
11+
"strMinQueryLength": {
12+
"$numberInt": "2"
13+
},
14+
@@ -23,7 +23,7 @@
15+
"diacriticSensitive": false
16+
},
17+
{
18+
- "queryType": "suffixPreview",
19+
+ "queryType": "suffix",
20+
"strMinQueryLength": {
21+
"$numberInt": "2"
22+
},
23+
diff --git a/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix.json b/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix.json
24+
index ec4489fa0..141c372db 100644
25+
--- a/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix.json
26+
+++ b/test/client-side-encryption/etc/data/encryptedFields-prefix-suffix.json
27+
@@ -1,6 +1,6 @@
28+
{
29+
- "fields": [
30+
- {
31+
+ "fields": [
32+
+ {
33+
"keyId": {
34+
"$binary": {
35+
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
36+
@@ -11,7 +11,7 @@
37+
"bsonType": "string",
38+
"queries": [
39+
{
40+
- "queryType": "prefixPreview",
41+
+ "queryType": "prefix",
42+
"strMinQueryLength": {
43+
"$numberInt": "2"
44+
},
45+
@@ -22,7 +22,7 @@
46+
"diacriticSensitive": true
47+
},
48+
{
49+
- "queryType": "suffixPreview",
50+
+ "queryType": "suffix",
51+
"strMinQueryLength": {
52+
"$numberInt": "2"
53+
},
54+
@@ -34,5 +34,5 @@
55+
}
56+
]
57+
}
58+
- ]
59+
+ ]
60+
}
61+
diff --git a/test/client-side-encryption/spec/unified/QE-Text-cleanupStructuredEncryptionData.json b/test/client-side-encryption/spec/unified/QE-Text-cleanupStructuredEncryptionData.json
62+
index fd74573ea..dc979b501 100644
63+
--- a/test/client-side-encryption/spec/unified/QE-Text-cleanupStructuredEncryptionData.json
64+
+++ b/test/client-side-encryption/spec/unified/QE-Text-cleanupStructuredEncryptionData.json
65+
@@ -3,15 +3,14 @@
66+
"schemaVersion": "1.25",
67+
"runOnRequirements": [
68+
{
69+
- "minServerVersion": "8.2.0",
70+
- "maxServerVersion": "8.99.99",
71+
+ "minServerVersion": "9.0.0",
72+
"topologies": [
73+
"replicaset",
74+
"sharded",
75+
"load-balanced"
76+
],
77+
"csfle": {
78+
- "minLibmongocryptVersion": "1.15.0"
79+
+ "minLibmongocryptVersion": "1.19.0"
80+
}
81+
}
82+
],
83+
@@ -102,7 +101,7 @@
84+
"bsonType": "string",
85+
"queries": [
86+
{
87+
- "queryType": "suffixPreview",
88+
+ "queryType": "suffix",
89+
"contention": {
90+
"$numberLong": "0"
91+
},
92+
diff --git a/test/client-side-encryption/spec/unified/QE-Text-compactStructuredEncryptionData.json b/test/client-side-encryption/spec/unified/QE-Text-compactStructuredEncryptionData.json
93+
index a89ab96fc..1c3c6cc0d 100644
94+
--- a/test/client-side-encryption/spec/unified/QE-Text-compactStructuredEncryptionData.json
95+
+++ b/test/client-side-encryption/spec/unified/QE-Text-compactStructuredEncryptionData.json
96+
@@ -3,15 +3,14 @@
97+
"schemaVersion": "1.25",
98+
"runOnRequirements": [
99+
{
100+
- "minServerVersion": "8.2.0",
101+
- "maxServerVersion": "8.99.99",
102+
+ "minServerVersion": "9.0.0",
103+
"topologies": [
104+
"replicaset",
105+
"sharded",
106+
"load-balanced"
107+
],
108+
"csfle": {
109+
- "minLibmongocryptVersion": "1.15.0"
110+
+ "minLibmongocryptVersion": "1.19.0"
111+
}
112+
}
113+
],
114+
@@ -102,7 +101,7 @@
115+
"bsonType": "string",
116+
"queries": [
117+
{
118+
- "queryType": "suffixPreview",
119+
+ "queryType": "suffix",
120+
"contention": {
121+
"$numberLong": "0"
122+
},
123+
@@ -210,7 +209,7 @@
124+
"bsonType": "string",
125+
"queries": [
126+
{
127+
- "queryType": "suffixPreview",
128+
+ "queryType": "suffix",
129+
"contention": {
130+
"$numberLong": "0"
131+
},
132+
diff --git a/test/client-side-encryption/spec/unified/QE-Text-prefixPreview.json b/test/client-side-encryption/spec/unified/QE-Text-prefix.json
133+
similarity index 97%
134+
rename from test/client-side-encryption/spec/unified/QE-Text-prefixPreview.json
135+
rename to test/client-side-encryption/spec/unified/QE-Text-prefix.json
136+
index c193608e8..25475e2c3 100644
137+
--- a/test/client-side-encryption/spec/unified/QE-Text-prefixPreview.json
138+
+++ b/test/client-side-encryption/spec/unified/QE-Text-prefix.json
139+
@@ -1,17 +1,16 @@
140+
{
141+
- "description": "QE-Text-prefixPreview",
142+
+ "description": "QE-Text-prefix",
143+
"schemaVersion": "1.25",
144+
"runOnRequirements": [
145+
{
146+
- "minServerVersion": "8.2.0",
147+
- "maxServerVersion": "8.99.99",
148+
+ "minServerVersion": "9.0.0",
149+
"topologies": [
150+
"replicaset",
151+
"sharded",
152+
"load-balanced"
153+
],
154+
"csfle": {
155+
- "minLibmongocryptVersion": "1.15.0"
156+
+ "minLibmongocryptVersion": "1.19.0"
157+
}
158+
}
159+
],
160+
@@ -102,7 +101,7 @@
161+
"bsonType": "string",
162+
"queries": [
163+
{
164+
- "queryType": "prefixPreview",
165+
+ "queryType": "prefix",
166+
"contention": {
167+
"$numberLong": "0"
168+
},
169+
@@ -124,7 +123,7 @@
170+
],
171+
"tests": [
172+
{
173+
- "description": "Insert QE prefixPreview",
174+
+ "description": "Insert QE prefix",
175+
"operations": [
176+
{
177+
"name": "insertOne",
178+
diff --git a/test/client-side-encryption/spec/unified/QE-Text-suffixPreview.json b/test/client-side-encryption/spec/unified/QE-Text-suffix.json
179+
similarity index 96%
180+
rename from test/client-side-encryption/spec/unified/QE-Text-suffixPreview.json
181+
rename to test/client-side-encryption/spec/unified/QE-Text-suffix.json
182+
index 2de5cde4a..ad6cdc06c 100644
183+
--- a/test/client-side-encryption/spec/unified/QE-Text-suffixPreview.json
184+
+++ b/test/client-side-encryption/spec/unified/QE-Text-suffix.json
185+
@@ -1,17 +1,16 @@
186+
{
187+
- "description": "QE-Text-suffixPreview",
188+
+ "description": "QE-Text-suffix",
189+
"schemaVersion": "1.25",
190+
"runOnRequirements": [
191+
{
192+
- "minServerVersion": "8.2.0",
193+
- "maxServerVersion": "8.99.99",
194+
+ "minServerVersion": "9.0.0",
195+
"topologies": [
196+
"replicaset",
197+
"sharded",
198+
"load-balanced"
199+
],
200+
"csfle": {
201+
- "minLibmongocryptVersion": "1.15.0"
202+
+ "minLibmongocryptVersion": "1.19.0"
203+
}
204+
}
205+
],
206+
@@ -102,7 +101,7 @@
207+
"bsonType": "string",
208+
"queries": [
209+
{
210+
- "queryType": "suffixPreview",
211+
+ "queryType": "suffix",
212+
"contention": {
213+
"$numberLong": "0"
214+
},
215+
@@ -124,7 +123,7 @@
216+
],
217+
"tests": [
218+
{
219+
- "description": "Insert QE suffixPreview",
220+
+ "description": "Insert QE suffix",
221+
"operations": [
222+
{
223+
"name": "insertOne",
224+
@@ -207,7 +206,7 @@
225+
]
226+
},
227+
{
228+
- "description": "Query with matching $encStrStartsWith",
229+
+ "description": "Query with matching $encStrEndsWith",
230+
"operations": [
231+
{
232+
"name": "insertOne",

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ jobs:
3838
build-mode: none
3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v6.0.2
41+
uses: actions/checkout@v6.0.3
4242
with:
4343
ref: ${{ inputs.ref }}
4444
persist-credentials: false
4545
- uses: actions/setup-python@v6
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4
49+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
5050
with:
5151
languages: ${{ matrix.language }}
5252
build-mode: ${{ matrix.build-mode }}
@@ -63,6 +63,6 @@ jobs:
6363
pip install -e .
6464
6565
- name: Perform CodeQL Analysis
66-
uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4
66+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
6767
with:
6868
category: "/language:${{matrix.language}}"

‎.github/workflows/dist.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
steps:
4848
- name: Checkout pymongo
49-
uses: actions/checkout@v6.0.2
49+
uses: actions/checkout@v6.0.3
5050
with:
5151
fetch-depth: 0
5252
persist-credentials: false
@@ -78,6 +78,9 @@ jobs:
7878
- name: Build wheels
7979
env:
8080
CIBW_BUILD: ${{ matrix.buildplat[2] }}
81+
# Strip any in-place C extensions from previous builds
82+
# so they don't leak into the next wheel.
83+
CIBW_BEFORE_BUILD: python ./tools/clean.py
8184
run: python -m cibuildwheel --output-dir wheelhouse
8285

8386
- name: Assert all versions in wheelhouse
@@ -102,7 +105,7 @@ jobs:
102105
name: Make SDist
103106
runs-on: macos-latest
104107
steps:
105-
- uses: actions/checkout@v6.0.2
108+
- uses: actions/checkout@v6.0.3
106109
with:
107110
fetch-depth: 0
108111
persist-credentials: false

‎.github/workflows/sbom.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@v6.0.2
32+
uses: actions/checkout@v6.0.3
3333
with:
3434
persist-credentials: false
3535

0 commit comments

Comments
 (0)