Fix runtime errors during execution of etc/make_release.py (#1280)

mongodb · Nov 20, 2024 · 2a11882 · 2a11882
1 parent 924c174
commit 2a11882
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 158 deletions.
diff --git a/cmake/make_dist/MakeDistCheck.cmake b/cmake/make_dist/MakeDistCheck.cmake
@@ -60,6 +60,7 @@ function(RUN_DIST_CHECK PACKAGE_PREFIX EXT)
          -S ../${PACKAGE_PREFIX}
          -B .
          -DCMAKE_BUILD_TYPE=Release
+         -DENABLE_TESTS=ON
          -DMONGOCXX_ENABLE_SLOW_TESTS=ON
          -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
          -DCMAKE_INSTALL_PREFIX=../${INSTALL_DIR}

diff --git a/etc/make_release.py b/etc/make_release.py
@@ -407,7 +407,7 @@ def build_c_driver(c_driver_build_ref, quiet):
 
     env = os.environ.copy()
     env['mongoc_version'] = c_driver_build_ref
-    run_shell_script('./.evergreen/scripts/install_c_driver.sh', env=env)
+    run_shell_script('./.evergreen/scripts/install-c-driver.sh', env=env)
 
     if not quiet:
         click.echo('Build of C Driver version "{}" was successful.'.format(c_driver_build_ref))
@@ -441,7 +441,7 @@ def build_distribution(release_tag, release_version, c_driver_dir, quiet, skip_d
     run_shell_script('. .evergreen/scripts/find-cmake-old.sh;'
                      'cd build;'
                      'echo ' + release_version + ' > VERSION_CURRENT;'
-                     '${CMAKE} -DCMAKE_BUILD_TYPE=Release '
+                     '${CMAKE} -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTS=ON '
                      '-DCMAKE_PREFIX_PATH="' + c_driver_dir + '" '
                      '-DENABLE_UNINSTALL=ON ..;'
                      'cmake --build . --target dist')

diff --git a/etc/releasing.md b/etc/releasing.md
@@ -413,6 +413,7 @@ Run the release script with the git tag created above as an argument and
 make_release_args=(
     --jira-creds-file ~/.secrets/jira-creds.txt
     --github-token-file ~/.secrets/github-token.txt
+    -r upstream # Only if mongodb/mongo-cxx-driver is not "origin".
 )
 python ./etc/make_release.py "${make_release_args[@]:?}" --dry-run rX.Y.Z
 ```

diff --git a/pyproject.toml b/pyproject.toml
@@ -2,7 +2,7 @@
 name = "mongo-cxx-driver"
 version = "0.1.0"
 description = "For development only."
-requires-python = ">=3.10"
+requires-python = ">=3.10,<3.12"
 dependencies = []
 
 [dependency-groups]
@@ -12,7 +12,7 @@ dev = [
     "pydantic>=2.7",
     "shrub-py>=3.4.0",
 
-    # etc/make_release.py
+    # etc/make_release.py (requires python<3.12)
     "click>=6.0",
     "gitpython>=3.1",
     "jira>=3.1",