diff --git a/Dependencies.txt b/Dependencies.txt index 0dd27e0900..3644d3f8dd 100644 --- a/Dependencies.txt +++ b/Dependencies.txt @@ -16,4 +16,4 @@ pybind11=v2.12.0 pybind11_abseil=52f2739 pybind11_protobuf=3b11990 # Testing -googletest=v1.14.0 +googletest=v1.15.2 diff --git a/WORKSPACE b/WORKSPACE index 9177bb2dc5..a399d160b5 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -309,12 +309,12 @@ contrib_rules_jvm_setup() ## Testing git_repository( name = "com_google_googletest", - tag = "v1.14.0", + tag = "v1.15.2", remote = "https://github.com/google/googletest.git", ) git_repository( name = "com_google_benchmark", - tag = "v1.8.3", + tag = "v1.8.5", remote = "https://github.com/google/benchmark.git", ) diff --git a/bazel/notebook_requirements.in b/bazel/notebook_requirements.in index cb3c7b8188..42743e3958 100644 --- a/bazel/notebook_requirements.in +++ b/bazel/notebook_requirements.in @@ -1,7 +1,7 @@ # OR-Tools code dependencies absl-py==2.0.0 immutabledict==3.0.0 -numpy==1.26.1 +numpy==1.26.4 protobuf==5.26.1 requests==2.32.0 scipy==1.11.3 diff --git a/bazel/notebook_requirements.txt b/bazel/notebook_requirements.txt index 98d261d85d..bedd3882ae 100644 --- a/bazel/notebook_requirements.txt +++ b/bazel/notebook_requirements.txt @@ -1,11 +1,11 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # bazel run //bazel:notebook_requirements.update # absl-py==2.0.0 - # via -r notebook_requirements.in + # via -r bazel/notebook_requirements.in anyio==4.0.0 # via jupyter-server argon2-cffi==23.1.0 @@ -29,7 +29,7 @@ backcall==0.2.0 beautifulsoup4==4.12.2 # via nbconvert black==24.3.0 - # via -r notebook_requirements.in + # via -r bazel/notebook_requirements.in bleach==6.0.0 # via nbconvert certifi==2024.7.4 @@ -66,7 +66,7 @@ idna==3.7 # jsonschema # requests immutabledict==3.0.0 - # via -r notebook_requirements.in + # via -r bazel/notebook_requirements.in ipykernel==6.25.2 # via # jupyter @@ -98,14 +98,14 @@ jsonpointer==2.4 # via jsonschema jsonschema[format-nongpl]==4.19.0 # via - # -r notebook_requirements.in + # -r bazel/notebook_requirements.in # jupyter-events # jupyterlab-server # nbformat jsonschema-specifications==2023.7.1 # via jsonschema jupyter==1.0.0 - # via -r notebook_requirements.in + # via -r bazel/notebook_requirements.in jupyter-client==8.3.1 # via # ipykernel @@ -132,7 +132,7 @@ jupyter-lsp==2.2.2 # via jupyterlab jupyter-server==2.12.5 # via - # -r notebook_requirements.in + # -r bazel/notebook_requirements.in # jupyter-lsp # jupyterlab # jupyterlab-server @@ -161,13 +161,13 @@ matplotlib-inline==0.1.6 mistune==3.0.1 # via nbconvert mypy==1.6.1 - # via -r notebook_requirements.in + # via -r bazel/notebook_requirements.in mypy-extensions==1.0.0 # via # black # mypy mypy-protobuf==3.5.0 - # via -r notebook_requirements.in + # via -r bazel/notebook_requirements.in nbclient==0.8.0 # via nbconvert nbconvert==7.8.0 @@ -187,9 +187,9 @@ notebook-shim==0.2.3 # via # jupyterlab # notebook -numpy==1.26.1 +numpy==1.26.4 # via - # -r notebook_requirements.in + # -r bazel/notebook_requirements.in # pandas # scipy overrides==7.4.0 @@ -206,7 +206,7 @@ packaging==23.1 # qtconsole # qtpy pandas==2.1.2 - # via -r notebook_requirements.in + # via -r bazel/notebook_requirements.in pandocfilters==1.5.0 # via nbconvert parso==0.8.3 @@ -223,7 +223,7 @@ platformdirs==3.10.0 # jupyter-core # virtualenv plotly==5.15.0 - # via -r notebook_requirements.in + # via -r bazel/notebook_requirements.in prometheus-client==0.17.1 # via jupyter-server prompt-toolkit==3.0.39 @@ -232,7 +232,7 @@ prompt-toolkit==3.0.39 # jupyter-console protobuf==5.26.1 # via - # -r notebook_requirements.in + # -r bazel/notebook_requirements.in # mypy-protobuf psutil==5.9.5 # via ipykernel @@ -246,7 +246,7 @@ pycparser==2.21 # via cffi pygments==2.15.0 # via - # -r notebook_requirements.in + # -r bazel/notebook_requirements.in # ipython # jupyter-console # nbconvert @@ -280,7 +280,7 @@ referencing==0.30.2 # jupyter-events requests==2.32.0 # via - # -r notebook_requirements.in + # -r bazel/notebook_requirements.in # jupyterlab-server rfc3339-validator==0.1.4 # via @@ -295,7 +295,7 @@ rpds-py==0.10.2 # jsonschema # referencing scipy==1.11.3 - # via -r notebook_requirements.in + # via -r bazel/notebook_requirements.in send2trash==1.8.2 # via jupyter-server six==1.16.0 @@ -311,7 +311,7 @@ soupsieve==2.5 stack-data==0.6.2 # via ipython svgwrite==1.4.3 - # via -r notebook_requirements.in + # via -r bazel/notebook_requirements.in tenacity==8.2.1 # via plotly terminado==0.17.1 @@ -322,7 +322,7 @@ tinycss2==1.2.1 # via nbconvert tornado==6.4.1 # via - # -r notebook_requirements.in + # -r bazel/notebook_requirements.in # ipykernel # jupyter-client # jupyter-server @@ -357,7 +357,7 @@ uri-template==1.3.0 urllib3==2.2.2 # via requests virtualenv==20.24.6 - # via -r notebook_requirements.in + # via -r bazel/notebook_requirements.in wcwidth==0.2.6 # via prompt-toolkit webcolors==1.13 diff --git a/bazel/ortools_requirements.in b/bazel/ortools_requirements.in index 54e03db612..37171a5d72 100644 --- a/bazel/ortools_requirements.in +++ b/bazel/ortools_requirements.in @@ -1,7 +1,7 @@ # OR-Tools code dependencies absl-py==2.0.0 immutabledict==3.0.0 -numpy==1.26.1 +numpy==1.26.4 protobuf==5.26.1 requests==2.32.0 scipy==1.11.3 diff --git a/bazel/ortools_requirements.txt b/bazel/ortools_requirements.txt index 167ad4784f..bf5f16fa87 100644 --- a/bazel/ortools_requirements.txt +++ b/bazel/ortools_requirements.txt @@ -1,13 +1,13 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # bazel run //bazel:ortools_requirements.update # absl-py==2.0.0 - # via -r ortools_requirements.in + # via -r bazel/ortools_requirements.in black==24.3.0 - # via -r ortools_requirements.in + # via -r bazel/ortools_requirements.in certifi==2024.7.4 # via requests charset-normalizer==3.3.2 @@ -21,24 +21,24 @@ filelock==3.12.2 idna==3.7 # via requests immutabledict==3.0.0 - # via -r ortools_requirements.in + # via -r bazel/ortools_requirements.in mypy==1.6.1 - # via -r ortools_requirements.in + # via -r bazel/ortools_requirements.in mypy-extensions==1.0.0 # via # black # mypy mypy-protobuf==3.5.0 - # via -r ortools_requirements.in -numpy==1.26.1 + # via -r bazel/ortools_requirements.in +numpy==1.26.4 # via - # -r ortools_requirements.in + # -r bazel/ortools_requirements.in # pandas # scipy packaging==23.1 # via black pandas==2.1.2 - # via -r ortools_requirements.in + # via -r bazel/ortools_requirements.in pathspec==0.11.1 # via black platformdirs==3.10.0 @@ -47,20 +47,20 @@ platformdirs==3.10.0 # virtualenv protobuf==5.26.1 # via - # -r ortools_requirements.in + # -r bazel/ortools_requirements.in # mypy-protobuf python-dateutil==2.8.2 # via pandas pytz==2022.7.1 # via pandas requests==2.32.0 - # via -r ortools_requirements.in + # via -r bazel/ortools_requirements.in scipy==1.11.3 - # via -r ortools_requirements.in + # via -r bazel/ortools_requirements.in six==1.16.0 # via python-dateutil svgwrite==1.4.3 - # via -r ortools_requirements.in + # via -r bazel/ortools_requirements.in types-protobuf==4.24.0.0 # via mypy-protobuf typing-extensions==4.8.0 @@ -70,4 +70,4 @@ tzdata==2023.3 urllib3==2.2.2 # via requests virtualenv==20.24.6 - # via -r ortools_requirements.in + # via -r bazel/ortools_requirements.in diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt index f91bd20d62..b6ee347c95 100644 --- a/cmake/dependencies/CMakeLists.txt +++ b/cmake/dependencies/CMakeLists.txt @@ -396,7 +396,7 @@ if(BUILD_googletest) FetchContent_Declare( googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG v1.14.0 + GIT_TAG v1.15.2 GIT_SHALLOW TRUE #PATCH_COMMAND git apply --ignore-whitespace "" )