From fbcd595a76f83b2542964e3dae8b95394fe888a6 Mon Sep 17 00:00:00 2001 From: Munir Abdinur Date: Thu, 19 Sep 2024 10:19:36 -0400 Subject: [PATCH 1/7] chore(pymongo): test 4.9.1 --- .riot/requirements/13fc59d.txt | 2 +- .riot/requirements/14fb6c4.txt | 2 +- .riot/requirements/172570f.txt | 2 +- .riot/requirements/178ae92.txt | 2 +- .riot/requirements/182cbd0.txt | 2 +- .riot/requirements/1dad05b.txt | 2 +- .riot/requirements/541b4d9.txt | 2 +- .riot/requirements/63c9090.txt | 2 +- .riot/requirements/9627328.txt | 2 +- .riot/requirements/f97f8c0.txt | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.riot/requirements/13fc59d.txt b/.riot/requirements/13fc59d.txt index 30ecfd08a15..1e8e19ac180 100644 --- a/.riot/requirements/13fc59d.txt +++ b/.riot/requirements/13fc59d.txt @@ -15,7 +15,7 @@ mongoengine==0.28.2 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.8.0 +pymongo==4.9.1 pytest==8.3.2 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/14fb6c4.txt b/.riot/requirements/14fb6c4.txt index 7a8c4a1a4e1..60a9f3c94a3 100644 --- a/.riot/requirements/14fb6c4.txt +++ b/.riot/requirements/14fb6c4.txt @@ -16,7 +16,7 @@ mongoengine==0.28.2 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.8.0 +pymongo==4.9.1 pytest==8.3.2 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/172570f.txt b/.riot/requirements/172570f.txt index 929d1339b8f..75c8db9f6ac 100644 --- a/.riot/requirements/172570f.txt +++ b/.riot/requirements/172570f.txt @@ -14,7 +14,7 @@ mongoengine==0.28.2 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.8.0 +pymongo==4.9.1 pytest==8.3.2 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/178ae92.txt b/.riot/requirements/178ae92.txt index 7963ea0e1db..4f7d3765a7a 100644 --- a/.riot/requirements/178ae92.txt +++ b/.riot/requirements/178ae92.txt @@ -16,7 +16,7 @@ mongoengine==0.28.2 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.8.0 +pymongo==4.9.1 pytest==8.3.2 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/182cbd0.txt b/.riot/requirements/182cbd0.txt index b7b023b5946..5e14f535959 100644 --- a/.riot/requirements/182cbd0.txt +++ b/.riot/requirements/182cbd0.txt @@ -14,7 +14,7 @@ mongoengine==0.28.2 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.8.0 +pymongo==4.9.1 pytest==8.3.2 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/1dad05b.txt b/.riot/requirements/1dad05b.txt index 1c0fe4ed4c1..1a42b996482 100644 --- a/.riot/requirements/1dad05b.txt +++ b/.riot/requirements/1dad05b.txt @@ -16,7 +16,7 @@ mongoengine==0.28.2 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.8.0 +pymongo==4.9.1 pytest==8.3.2 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/541b4d9.txt b/.riot/requirements/541b4d9.txt index 23c5ae20a2a..c18c76e672a 100644 --- a/.riot/requirements/541b4d9.txt +++ b/.riot/requirements/541b4d9.txt @@ -16,7 +16,7 @@ mongoengine==0.28.2 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.8.0 +pymongo==4.9.1 pytest==8.3.2 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/63c9090.txt b/.riot/requirements/63c9090.txt index 2d287e7aa2f..0aca2c244d1 100644 --- a/.riot/requirements/63c9090.txt +++ b/.riot/requirements/63c9090.txt @@ -14,7 +14,7 @@ mongoengine==0.28.2 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.8.0 +pymongo==4.9.1 pytest==8.3.2 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/9627328.txt b/.riot/requirements/9627328.txt index 68796df6809..fa9d0db466f 100644 --- a/.riot/requirements/9627328.txt +++ b/.riot/requirements/9627328.txt @@ -14,7 +14,7 @@ mongoengine==0.28.2 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.8.0 +pymongo==4.9.1 pytest==8.3.2 pytest-cov==5.0.0 pytest-mock==3.14.0 diff --git a/.riot/requirements/f97f8c0.txt b/.riot/requirements/f97f8c0.txt index 771c4dbb4be..215dae917a9 100644 --- a/.riot/requirements/f97f8c0.txt +++ b/.riot/requirements/f97f8c0.txt @@ -15,7 +15,7 @@ mongoengine==0.28.2 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.8.0 +pymongo==4.9.1 pytest==8.3.2 pytest-cov==5.0.0 pytest-mock==3.14.0 From e347b6df3aa3ae84c1ee1aaddd4a5988dd1bdf9e Mon Sep 17 00:00:00 2001 From: Munir Abdinur Date: Thu, 19 Sep 2024 11:15:09 -0400 Subject: [PATCH 2/7] fix pymongo imports --- ddtrace/contrib/internal/pymongo/patch.py | 25 ++++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/ddtrace/contrib/internal/pymongo/patch.py b/ddtrace/contrib/internal/pymongo/patch.py index e40fba1b2c5..2da4bc72584 100644 --- a/ddtrace/contrib/internal/pymongo/patch.py +++ b/ddtrace/contrib/internal/pymongo/patch.py @@ -1,6 +1,7 @@ import contextlib import pymongo +import pymongo.pool from ddtrace import Pin from ddtrace import config @@ -60,41 +61,41 @@ def unpatch(): def patch_pymongo_module(): _w(pymongo.MongoClient.__init__, _trace_mongo_client_init) - _w(pymongo.topology.Topology.select_server, _trace_topology_select_server) + _w(pymongo.synchronous.topology.Topology.select_server, _trace_topology_select_server) if _VERSION >= (3, 12): - _w(pymongo.server.Server.run_operation, _trace_server_run_operation_and_with_response) + _w(pymongo.synchronous.server.Server.run_operation, _trace_server_run_operation_and_with_response) elif _VERSION >= (3, 9): - _w(pymongo.server.Server.run_operation_with_response, _trace_server_run_operation_and_with_response) + _w(pymongo.synchronous.server.Server.run_operation_with_response, _trace_server_run_operation_and_with_response) else: - _w(pymongo.server.Server.send_message_with_response, _trace_server_send_message_with_response) + _w(pymongo.synchronous.server.Server.send_message_with_response, _trace_server_send_message_with_response) if _VERSION >= (4, 5): - _w(pymongo.server.Server.checkout, traced_get_socket) + _w(pymongo.synchronous.server.Server.checkout, traced_get_socket) _w(pymongo.pool.Connection.command, _trace_socket_command) _w(pymongo.pool.Connection.write_command, _trace_socket_write_command) else: - _w(pymongo.server.Server.get_socket, traced_get_socket) + _w(pymongo.synchronous.server.Server.get_socket, traced_get_socket) _w(pymongo.pool.SocketInfo.command, _trace_socket_command) _w(pymongo.pool.SocketInfo.write_command, _trace_socket_write_command) def unpatch_pymongo_module(): _u(pymongo.MongoClient.__init__, _trace_mongo_client_init) - _u(pymongo.topology.Topology.select_server, _trace_topology_select_server) + _u(pymongo.synchronous.topology.Topology.select_server, _trace_topology_select_server) if _VERSION >= (3, 12): - _u(pymongo.server.Server.run_operation, _trace_server_run_operation_and_with_response) + _u(pymongo.synchronous.server.Server.run_operation, _trace_server_run_operation_and_with_response) elif _VERSION >= (3, 9): - _u(pymongo.server.Server.run_operation_with_response, _trace_server_run_operation_and_with_response) + _u(pymongo.synchronous.server.Server.run_operation_with_response, _trace_server_run_operation_and_with_response) else: - _u(pymongo.server.Server.send_message_with_response, _trace_server_send_message_with_response) + _u(pymongo.synchronous.server.Server.send_message_with_response, _trace_server_send_message_with_response) if _VERSION >= (4, 5): - _u(pymongo.server.Server.checkout, traced_get_socket) + _u(pymongo.synchronous.server.Server.checkout, traced_get_socket) _u(pymongo.pool.Connection.command, _trace_socket_command) _u(pymongo.pool.Connection.write_command, _trace_socket_write_command) else: - _u(pymongo.server.Server.get_socket, traced_get_socket) + _u(pymongo.synchronous.server.Server.get_socket, traced_get_socket) _u(pymongo.pool.SocketInfo.command, _trace_socket_command) _u(pymongo.pool.SocketInfo.write_command, _trace_socket_write_command) From 4b40801d744b8d43598ee972d5daa5d1eb266554 Mon Sep 17 00:00:00 2001 From: Munir Abdinur Date: Thu, 19 Sep 2024 11:16:55 -0400 Subject: [PATCH 3/7] rn --- releasenotes/notes/pymong-4-9-support-83f7c613e5e009e6.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 releasenotes/notes/pymong-4-9-support-83f7c613e5e009e6.yaml diff --git a/releasenotes/notes/pymong-4-9-support-83f7c613e5e009e6.yaml b/releasenotes/notes/pymong-4-9-support-83f7c613e5e009e6.yaml new file mode 100644 index 00000000000..85e5091fe3e --- /dev/null +++ b/releasenotes/notes/pymong-4-9-support-83f7c613e5e009e6.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + pymongo: Adds support for pymongo>=4.9.0 \ No newline at end of file From d0a2565412c56686ac81de34c2b0a97dfce38676 Mon Sep 17 00:00:00 2001 From: Munir Abdinur Date: Thu, 19 Sep 2024 11:28:35 -0400 Subject: [PATCH 4/7] fix imports to use synchronous --- ddtrace/contrib/internal/pymongo/patch.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/ddtrace/contrib/internal/pymongo/patch.py b/ddtrace/contrib/internal/pymongo/patch.py index 2da4bc72584..59a7ad423d6 100644 --- a/ddtrace/contrib/internal/pymongo/patch.py +++ b/ddtrace/contrib/internal/pymongo/patch.py @@ -1,7 +1,6 @@ import contextlib import pymongo -import pymongo.pool from ddtrace import Pin from ddtrace import config @@ -71,12 +70,12 @@ def patch_pymongo_module(): if _VERSION >= (4, 5): _w(pymongo.synchronous.server.Server.checkout, traced_get_socket) - _w(pymongo.pool.Connection.command, _trace_socket_command) - _w(pymongo.pool.Connection.write_command, _trace_socket_write_command) + _w(pymongo.synchronous.pool.Connection.command, _trace_socket_command) + _w(pymongo.synchronous.pool.Connection.write_command, _trace_socket_write_command) else: _w(pymongo.synchronous.server.Server.get_socket, traced_get_socket) - _w(pymongo.pool.SocketInfo.command, _trace_socket_command) - _w(pymongo.pool.SocketInfo.write_command, _trace_socket_write_command) + _w(pymongo.synchronous.pool.SocketInfo.command, _trace_socket_command) + _w(pymongo.synchronous.pool.SocketInfo.write_command, _trace_socket_write_command) def unpatch_pymongo_module(): @@ -92,12 +91,12 @@ def unpatch_pymongo_module(): if _VERSION >= (4, 5): _u(pymongo.synchronous.server.Server.checkout, traced_get_socket) - _u(pymongo.pool.Connection.command, _trace_socket_command) - _u(pymongo.pool.Connection.write_command, _trace_socket_write_command) + _u(pymongo.synchronous.pool.Connection.command, _trace_socket_command) + _u(pymongo.synchronous.pool.Connection.write_command, _trace_socket_write_command) else: _u(pymongo.synchronous.server.Server.get_socket, traced_get_socket) - _u(pymongo.pool.SocketInfo.command, _trace_socket_command) - _u(pymongo.pool.SocketInfo.write_command, _trace_socket_write_command) + _u(pymongo.synchronous.pool.SocketInfo.command, _trace_socket_command) + _u(pymongo.synchronous.pool.SocketInfo.write_command, _trace_socket_write_command) @contextlib.contextmanager From baab551b7ae34b99a762fb57ea70a4a950e37da8 Mon Sep 17 00:00:00 2001 From: Munir Abdinur Date: Thu, 19 Sep 2024 12:07:56 -0400 Subject: [PATCH 5/7] fix imports for pymongo<4.9 --- ddtrace/contrib/internal/pymongo/patch.py | 55 +++++++++++++---------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/ddtrace/contrib/internal/pymongo/patch.py b/ddtrace/contrib/internal/pymongo/patch.py index 59a7ad423d6..5032ce3b48a 100644 --- a/ddtrace/contrib/internal/pymongo/patch.py +++ b/ddtrace/contrib/internal/pymongo/patch.py @@ -27,6 +27,22 @@ from .client import set_address_tags +_VERSION = pymongo.version_tuple + +if _VERSION >= (4, 9): + from pymongo.synchronous.pool import Connection + from pymongo.synchronous.server import Server + from pymongo.synchronous.topology import Topology +elif _VERSION >= (4, 5): + from pymongo.pool import Connection + from pymongo.server import Server + from pymongo.topology import Topology +else: + from pymongo.pool import SocketInfo as Connection + from pymongo.server import Server + from pymongo.topology import Topology + + _CHECKOUT_FN_NAME = "get_socket" if pymongo.version_tuple < (4, 5) else "checkout" @@ -41,9 +57,6 @@ def get_version(): return getattr(pymongo, "__version__", "") -_VERSION = pymongo.version_tuple - - def patch(): if getattr(pymongo, "_datadog_patch", False): return @@ -60,43 +73,39 @@ def unpatch(): def patch_pymongo_module(): _w(pymongo.MongoClient.__init__, _trace_mongo_client_init) - _w(pymongo.synchronous.topology.Topology.select_server, _trace_topology_select_server) + _w(Topology.select_server, _trace_topology_select_server) if _VERSION >= (3, 12): - _w(pymongo.synchronous.server.Server.run_operation, _trace_server_run_operation_and_with_response) + _w(Server.run_operation, _trace_server_run_operation_and_with_response) elif _VERSION >= (3, 9): - _w(pymongo.synchronous.server.Server.run_operation_with_response, _trace_server_run_operation_and_with_response) + _w(Server.run_operation_with_response, _trace_server_run_operation_and_with_response) else: - _w(pymongo.synchronous.server.Server.send_message_with_response, _trace_server_send_message_with_response) + _w(Server.send_message_with_response, _trace_server_send_message_with_response) if _VERSION >= (4, 5): - _w(pymongo.synchronous.server.Server.checkout, traced_get_socket) - _w(pymongo.synchronous.pool.Connection.command, _trace_socket_command) - _w(pymongo.synchronous.pool.Connection.write_command, _trace_socket_write_command) + _w(Server.checkout, traced_get_socket) else: - _w(pymongo.synchronous.server.Server.get_socket, traced_get_socket) - _w(pymongo.synchronous.pool.SocketInfo.command, _trace_socket_command) - _w(pymongo.synchronous.pool.SocketInfo.write_command, _trace_socket_write_command) + _w(Server.get_socket, traced_get_socket) + _w(Connection.command, _trace_socket_command) + _w(Connection.write_command, _trace_socket_write_command) def unpatch_pymongo_module(): _u(pymongo.MongoClient.__init__, _trace_mongo_client_init) - _u(pymongo.synchronous.topology.Topology.select_server, _trace_topology_select_server) + _u(Topology.select_server, _trace_topology_select_server) if _VERSION >= (3, 12): - _u(pymongo.synchronous.server.Server.run_operation, _trace_server_run_operation_and_with_response) + _u(Server.run_operation, _trace_server_run_operation_and_with_response) elif _VERSION >= (3, 9): - _u(pymongo.synchronous.server.Server.run_operation_with_response, _trace_server_run_operation_and_with_response) + _u(Server.run_operation_with_response, _trace_server_run_operation_and_with_response) else: - _u(pymongo.synchronous.server.Server.send_message_with_response, _trace_server_send_message_with_response) + _u(Server.send_message_with_response, _trace_server_send_message_with_response) if _VERSION >= (4, 5): - _u(pymongo.synchronous.server.Server.checkout, traced_get_socket) - _u(pymongo.synchronous.pool.Connection.command, _trace_socket_command) - _u(pymongo.synchronous.pool.Connection.write_command, _trace_socket_write_command) + _u(Server.checkout, traced_get_socket) else: - _u(pymongo.synchronous.server.Server.get_socket, traced_get_socket) - _u(pymongo.synchronous.pool.SocketInfo.command, _trace_socket_command) - _u(pymongo.synchronous.pool.SocketInfo.write_command, _trace_socket_write_command) + _u(Server.get_socket, traced_get_socket) + _u(Connection.command, _trace_socket_command) + _u(Connection.write_command, _trace_socket_write_command) @contextlib.contextmanager From 1ec0b3923890692006d77035783fb9ac9a9c19f3 Mon Sep 17 00:00:00 2001 From: Munir Abdinur Date: Thu, 19 Sep 2024 13:05:57 -0400 Subject: [PATCH 6/7] pin pytest version used in mongoengine --- .riot/requirements/{13fc59d.txt => 10a00e7.txt} | 8 ++++---- .riot/requirements/{63c9090.txt => 1424e42.txt} | 8 ++++---- .riot/requirements/{9627328.txt => 14e85f3.txt} | 8 ++++---- .riot/requirements/{c998f1e.txt => 16cae33.txt} | 4 ++-- .riot/requirements/{14fb6c4.txt => 1ce9a99.txt} | 12 ++++++------ .riot/requirements/{16d0967.txt => 1ed6ce0.txt} | 4 ++-- .riot/requirements/{f97f8c0.txt => 328b28c.txt} | 8 ++++---- .riot/requirements/{182cbd0.txt => ad40916.txt} | 8 ++++---- .riot/requirements/{541b4d9.txt => b089663.txt} | 12 ++++++------ .riot/requirements/{172570f.txt => b344fed.txt} | 8 ++++---- .riot/requirements/{1dad05b.txt => de53117.txt} | 12 ++++++------ .riot/requirements/{178ae92.txt => f9d0e8e.txt} | 12 ++++++------ riotfile.py | 3 ++- 13 files changed, 54 insertions(+), 53 deletions(-) rename .riot/requirements/{13fc59d.txt => 10a00e7.txt} (73%) rename .riot/requirements/{63c9090.txt => 1424e42.txt} (72%) rename .riot/requirements/{9627328.txt => 14e85f3.txt} (71%) rename .riot/requirements/{c998f1e.txt => 16cae33.txt} (76%) rename .riot/requirements/{14fb6c4.txt => 1ce9a99.txt} (68%) rename .riot/requirements/{16d0967.txt => 1ed6ce0.txt} (76%) rename .riot/requirements/{f97f8c0.txt => 328b28c.txt} (73%) rename .riot/requirements/{182cbd0.txt => ad40916.txt} (71%) rename .riot/requirements/{541b4d9.txt => b089663.txt} (67%) rename .riot/requirements/{172570f.txt => b344fed.txt} (72%) rename .riot/requirements/{1dad05b.txt => de53117.txt} (67%) rename .riot/requirements/{178ae92.txt => f9d0e8e.txt} (68%) diff --git a/.riot/requirements/13fc59d.txt b/.riot/requirements/10a00e7.txt similarity index 73% rename from .riot/requirements/13fc59d.txt rename to .riot/requirements/10a00e7.txt index 1e8e19ac180..ed2fd846015 100644 --- a/.riot/requirements/13fc59d.txt +++ b/.riot/requirements/10a00e7.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/13fc59d.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/10a00e7.in # attrs==24.2.0 coverage[toml]==7.6.1 @@ -11,12 +11,12 @@ exceptiongroup==1.2.2 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 -mongoengine==0.28.2 +mongoengine==0.29.1 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.9.1 -pytest==8.3.2 +pymongo==4.8.0 +pytest==8.3.3 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.15.0 diff --git a/.riot/requirements/63c9090.txt b/.riot/requirements/1424e42.txt similarity index 72% rename from .riot/requirements/63c9090.txt rename to .riot/requirements/1424e42.txt index 0aca2c244d1..f58bbb22bd6 100644 --- a/.riot/requirements/63c9090.txt +++ b/.riot/requirements/1424e42.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/63c9090.in +# pip-compile --no-annotate .riot/requirements/1424e42.in # attrs==24.2.0 coverage[toml]==7.6.1 @@ -10,12 +10,12 @@ dnspython==2.6.1 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 -mongoengine==0.28.2 +mongoengine==0.29.1 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.9.1 -pytest==8.3.2 +pymongo==4.8.0 +pytest==8.3.3 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.15.0 diff --git a/.riot/requirements/9627328.txt b/.riot/requirements/14e85f3.txt similarity index 71% rename from .riot/requirements/9627328.txt rename to .riot/requirements/14e85f3.txt index fa9d0db466f..44ce4a54256 100644 --- a/.riot/requirements/9627328.txt +++ b/.riot/requirements/14e85f3.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/9627328.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/14e85f3.in # attrs==24.2.0 coverage[toml]==7.6.1 @@ -10,12 +10,12 @@ dnspython==2.6.1 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 -mongoengine==0.28.2 +mongoengine==0.29.1 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.9.1 -pytest==8.3.2 +pymongo==4.8.0 +pytest==8.3.3 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.15.0 diff --git a/.riot/requirements/c998f1e.txt b/.riot/requirements/16cae33.txt similarity index 76% rename from .riot/requirements/c998f1e.txt rename to .riot/requirements/16cae33.txt index 9c41810e156..0df83f49b08 100644 --- a/.riot/requirements/c998f1e.txt +++ b/.riot/requirements/16cae33.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.7 # by the following command: # -# pip-compile --allow-unsafe --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/c998f1e.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/16cae33.in # attrs==24.2.0 coverage[toml]==7.2.7 @@ -12,7 +12,7 @@ hypothesis==6.45.0 importlib-metadata==6.7.0 iniconfig==2.0.0 mock==5.1.0 -mongoengine==0.28.2 +mongoengine==0.29.1 opentracing==2.4.0 packaging==24.0 pluggy==1.2.0 diff --git a/.riot/requirements/14fb6c4.txt b/.riot/requirements/1ce9a99.txt similarity index 68% rename from .riot/requirements/14fb6c4.txt rename to .riot/requirements/1ce9a99.txt index 60a9f3c94a3..3d8f032cfab 100644 --- a/.riot/requirements/14fb6c4.txt +++ b/.riot/requirements/1ce9a99.txt @@ -2,25 +2,25 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/14fb6c4.in +# pip-compile --no-annotate .riot/requirements/1ce9a99.in # attrs==24.2.0 coverage[toml]==7.6.1 dnspython==2.6.1 exceptiongroup==1.2.2 hypothesis==6.45.0 -importlib-metadata==8.4.0 +importlib-metadata==8.5.0 iniconfig==2.0.0 mock==5.1.0 -mongoengine==0.28.2 +mongoengine==0.29.1 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.9.1 -pytest==8.3.2 +pymongo==4.8.0 +pytest==8.3.3 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.15.0 sortedcontainers==2.4.0 tomli==2.0.1 -zipp==3.20.1 +zipp==3.20.2 diff --git a/.riot/requirements/16d0967.txt b/.riot/requirements/1ed6ce0.txt similarity index 76% rename from .riot/requirements/16d0967.txt rename to .riot/requirements/1ed6ce0.txt index ac6b8992c58..a51ab00415d 100644 --- a/.riot/requirements/16d0967.txt +++ b/.riot/requirements/1ed6ce0.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.7 # by the following command: # -# pip-compile --allow-unsafe --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/16d0967.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/1ed6ce0.in # attrs==24.2.0 coverage[toml]==7.2.7 @@ -12,7 +12,7 @@ hypothesis==6.45.0 importlib-metadata==6.7.0 iniconfig==2.0.0 mock==5.1.0 -mongoengine==0.28.2 +mongoengine==0.29.1 opentracing==2.4.0 packaging==24.0 pluggy==1.2.0 diff --git a/.riot/requirements/f97f8c0.txt b/.riot/requirements/328b28c.txt similarity index 73% rename from .riot/requirements/f97f8c0.txt rename to .riot/requirements/328b28c.txt index 215dae917a9..38eac9651b9 100644 --- a/.riot/requirements/f97f8c0.txt +++ b/.riot/requirements/328b28c.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/f97f8c0.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/328b28c.in # attrs==24.2.0 coverage[toml]==7.6.1 @@ -11,12 +11,12 @@ exceptiongroup==1.2.2 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 -mongoengine==0.28.2 +mongoengine==0.29.1 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.9.1 -pytest==8.3.2 +pymongo==4.8.0 +pytest==8.3.3 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.15.0 diff --git a/.riot/requirements/182cbd0.txt b/.riot/requirements/ad40916.txt similarity index 71% rename from .riot/requirements/182cbd0.txt rename to .riot/requirements/ad40916.txt index 5e14f535959..853f497ee9e 100644 --- a/.riot/requirements/182cbd0.txt +++ b/.riot/requirements/ad40916.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/182cbd0.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/ad40916.in # attrs==24.2.0 coverage[toml]==7.6.1 @@ -10,12 +10,12 @@ dnspython==2.6.1 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 -mongoengine==0.28.2 +mongoengine==0.29.1 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.9.1 -pytest==8.3.2 +pymongo==4.8.0 +pytest==8.3.3 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.15.0 diff --git a/.riot/requirements/541b4d9.txt b/.riot/requirements/b089663.txt similarity index 67% rename from .riot/requirements/541b4d9.txt rename to .riot/requirements/b089663.txt index c18c76e672a..956c6d73e92 100644 --- a/.riot/requirements/541b4d9.txt +++ b/.riot/requirements/b089663.txt @@ -2,25 +2,25 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/541b4d9.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/b089663.in # attrs==24.2.0 coverage[toml]==7.6.1 dnspython==2.6.1 exceptiongroup==1.2.2 hypothesis==6.45.0 -importlib-metadata==8.4.0 +importlib-metadata==8.5.0 iniconfig==2.0.0 mock==5.1.0 -mongoengine==0.28.2 +mongoengine==0.29.1 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.9.1 -pytest==8.3.2 +pymongo==4.8.0 +pytest==8.3.3 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.15.0 sortedcontainers==2.4.0 tomli==2.0.1 -zipp==3.20.1 +zipp==3.20.2 diff --git a/.riot/requirements/172570f.txt b/.riot/requirements/b344fed.txt similarity index 72% rename from .riot/requirements/172570f.txt rename to .riot/requirements/b344fed.txt index 75c8db9f6ac..73e61eb69f9 100644 --- a/.riot/requirements/172570f.txt +++ b/.riot/requirements/b344fed.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/172570f.in +# pip-compile --no-annotate .riot/requirements/b344fed.in # attrs==24.2.0 coverage[toml]==7.6.1 @@ -10,12 +10,12 @@ dnspython==2.6.1 hypothesis==6.45.0 iniconfig==2.0.0 mock==5.1.0 -mongoengine==0.28.2 +mongoengine==0.29.1 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.9.1 -pytest==8.3.2 +pymongo==4.8.0 +pytest==8.3.3 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.15.0 diff --git a/.riot/requirements/1dad05b.txt b/.riot/requirements/de53117.txt similarity index 67% rename from .riot/requirements/1dad05b.txt rename to .riot/requirements/de53117.txt index 1a42b996482..1dd3dcf18f2 100644 --- a/.riot/requirements/1dad05b.txt +++ b/.riot/requirements/de53117.txt @@ -2,25 +2,25 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/1dad05b.in +# pip-compile --no-annotate --resolver=backtracking .riot/requirements/de53117.in # attrs==24.2.0 coverage[toml]==7.6.1 dnspython==2.6.1 exceptiongroup==1.2.2 hypothesis==6.45.0 -importlib-metadata==8.4.0 +importlib-metadata==8.5.0 iniconfig==2.0.0 mock==5.1.0 -mongoengine==0.28.2 +mongoengine==0.29.1 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.9.1 -pytest==8.3.2 +pymongo==4.8.0 +pytest==8.3.3 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.15.0 sortedcontainers==2.4.0 tomli==2.0.1 -zipp==3.20.1 +zipp==3.20.2 diff --git a/.riot/requirements/178ae92.txt b/.riot/requirements/f9d0e8e.txt similarity index 68% rename from .riot/requirements/178ae92.txt rename to .riot/requirements/f9d0e8e.txt index 4f7d3765a7a..42bc8937d56 100644 --- a/.riot/requirements/178ae92.txt +++ b/.riot/requirements/f9d0e8e.txt @@ -2,25 +2,25 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --allow-unsafe --no-annotate .riot/requirements/178ae92.in +# pip-compile --no-annotate .riot/requirements/f9d0e8e.in # attrs==24.2.0 coverage[toml]==7.6.1 dnspython==2.6.1 exceptiongroup==1.2.2 hypothesis==6.45.0 -importlib-metadata==8.4.0 +importlib-metadata==8.5.0 iniconfig==2.0.0 mock==5.1.0 -mongoengine==0.28.2 +mongoengine==0.29.1 opentracing==2.4.0 packaging==24.1 pluggy==1.5.0 -pymongo==4.9.1 -pytest==8.3.2 +pymongo==4.8.0 +pytest==8.3.3 pytest-cov==5.0.0 pytest-mock==3.14.0 pytest-randomly==3.15.0 sortedcontainers==2.4.0 tomli==2.0.1 -zipp==3.20.1 +zipp==3.20.2 diff --git a/riotfile.py b/riotfile.py index 6ac7ea6fcdc..6c8fa1c4ccf 100644 --- a/riotfile.py +++ b/riotfile.py @@ -1434,7 +1434,8 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION): name="mongoengine", command="pytest {cmdargs} tests/contrib/mongoengine", pkgs={ - "pymongo": latest, + # pymongo v4.9.0 introduced breaking changes that are not yet supported by mongoengine + "pymongo": "<4.9.0", "pytest-randomly": latest, }, venvs=[ From 42e8a18d8f4ec7f582291ba8a2b98648ee85b412 Mon Sep 17 00:00:00 2001 From: Munir Abdinur Date: Thu, 19 Sep 2024 13:26:52 -0400 Subject: [PATCH 7/7] newline --- releasenotes/notes/pymong-4-9-support-83f7c613e5e009e6.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releasenotes/notes/pymong-4-9-support-83f7c613e5e009e6.yaml b/releasenotes/notes/pymong-4-9-support-83f7c613e5e009e6.yaml index 85e5091fe3e..613885e7ee1 100644 --- a/releasenotes/notes/pymong-4-9-support-83f7c613e5e009e6.yaml +++ b/releasenotes/notes/pymong-4-9-support-83f7c613e5e009e6.yaml @@ -1,4 +1,4 @@ --- features: - | - pymongo: Adds support for pymongo>=4.9.0 \ No newline at end of file + pymongo: Adds support for pymongo>=4.9.0