diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 56eb5b6ea..8fb2368e4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -53,6 +53,10 @@ jobs: with: submodules: true + - uses: actions/setup-python@v5 + with: + python-version: '3.13' + - id: setup-mongodb uses: mongodb-labs/drivers-evergreen-tools@master with: diff --git a/sbom.json b/sbom.json index fb98f7605..7ed391e81 100644 --- a/sbom.json +++ b/sbom.json @@ -19,22 +19,22 @@ "version": "1.12.0" }, { - "bom-ref": "pkg:github/mongodb/mongo-c-driver@1.29.0", + "bom-ref": "pkg:github/mongodb/mongo-c-driver@1.29.2", "externalReferences": [ { "type": "distribution", - "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.29.0.tar.gz" + "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.29.2.tar.gz" }, { "type": "website", - "url": "https://github.com/mongodb/mongo-c-driver/tree/1.29.0" + "url": "https://github.com/mongodb/mongo-c-driver/tree/1.29.2" } ], "group": "mongodb", "name": "mongo-c-driver", - "purl": "pkg:github/mongodb/mongo-c-driver@1.29.0", + "purl": "pkg:github/mongodb/mongo-c-driver@1.29.2", "type": "library", - "version": "1.29.0" + "version": "1.29.2" } ], "dependencies": [ @@ -42,11 +42,11 @@ "ref": "pkg:github/mongodb/libmongocrypt@1.12.0" }, { - "ref": "pkg:github/mongodb/mongo-c-driver@1.29.0" + "ref": "pkg:github/mongodb/mongo-c-driver@1.29.2" } ], "metadata": { - "timestamp": "2024-11-12T18:00:38.546484+00:00", + "timestamp": "2025-01-14T14:24:24.250261+00:00", "tools": [ { "externalReferences": [ @@ -90,7 +90,7 @@ ] }, "serialNumber": "urn:uuid:acb30d08-ee47-4ff0-b301-d66ef1f54082", - "version": 7, + "version": 8, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.5", diff --git a/src/LIBMONGOC_VERSION_CURRENT b/src/LIBMONGOC_VERSION_CURRENT index 5e57fb895..412114252 100644 --- a/src/LIBMONGOC_VERSION_CURRENT +++ b/src/LIBMONGOC_VERSION_CURRENT @@ -1 +1 @@ -1.29.0 +1.29.2 diff --git a/src/MongoDB/Exception/WriteException.stub.php b/src/MongoDB/Exception/WriteException.stub.php index 4372e933a..9ee7bfc26 100644 --- a/src/MongoDB/Exception/WriteException.stub.php +++ b/src/MongoDB/Exception/WriteException.stub.php @@ -8,7 +8,7 @@ namespace MongoDB\Driver\Exception; /** @deprecated use MongoDB\Driver\Exception\BulkWriteException instead */ -abstract class WriteException extends RuntimeException +abstract class WriteException extends ServerException { /** @var \MongoDB\Driver\WriteResult */ protected $writeResult; diff --git a/src/MongoDB/Exception/WriteException_arginfo.h b/src/MongoDB/Exception/WriteException_arginfo.h index 9c3e9f43d..e373c6bfe 100644 --- a/src/MongoDB/Exception/WriteException_arginfo.h +++ b/src/MongoDB/Exception/WriteException_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: bf7229dbad041a8fe73af62d1961700783a933e3 */ + * Stub hash: d68a9b6bb6ba6a1222689ffe95c58ce91b3a6704 */ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_MongoDB_Driver_Exception_WriteException_getWriteResult, 0, 0, MongoDB\\Driver\\WriteResult, 0) ZEND_END_ARG_INFO() @@ -13,12 +13,12 @@ static const zend_function_entry class_MongoDB_Driver_Exception_WriteException_m ZEND_FE_END }; -static zend_class_entry *register_class_MongoDB_Driver_Exception_WriteException(zend_class_entry *class_entry_MongoDB_Driver_Exception_RuntimeException) +static zend_class_entry *register_class_MongoDB_Driver_Exception_WriteException(zend_class_entry *class_entry_MongoDB_Driver_Exception_ServerException) { zend_class_entry ce, *class_entry; INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "WriteException", class_MongoDB_Driver_Exception_WriteException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_MongoDB_Driver_Exception_RuntimeException); + class_entry = zend_register_internal_class_ex(&ce, class_entry_MongoDB_Driver_Exception_ServerException); class_entry->ce_flags |= ZEND_ACC_ABSTRACT|ZEND_ACC_DEPRECATED; zval property_writeResult_default_value; diff --git a/src/libmongoc b/src/libmongoc index fc82e03cb..48011c65d 160000 --- a/src/libmongoc +++ b/src/libmongoc @@ -1 +1 @@ -Subproject commit fc82e03cbea13abf276b5abb3736249e97c7ee0f +Subproject commit 48011c65d759bc288a02a583c378a224c1141bbb