protobuf 23.3 -> 23.4; update python dependencies

google · Aug 9, 2023 · 8db6803 · 8db6803
1 parent ed8db90
commit 8db6803
Show file tree

Hide file tree

Showing 8 changed files with 452 additions and 366 deletions.
diff --git a/Dependencies.txt b/Dependencies.txt
@@ -1,4 +1,4 @@
-Protobuf=v23.3
+Protobuf=v23.4
 abseil-cpp=20230125.3
 Cbc=2.10.7
 Cgl=0.60.5

diff --git a/WORKSPACE b/WORKSPACE
@@ -93,8 +93,8 @@ git_repository(
 ## Protobuf
 git_repository(
     name = "com_google_protobuf",
-    tag = "v23.3",
-    patches = ["//patches:protobuf-v23.3.patch"],
+    tag = "v23.4",
+    patches = ["//patches:protobuf-v23.4.patch"],
     patch_args = ["-p1"],
     remote = "https://github.com/protocolbuffers/protobuf.git",
 )

diff --git a/bazel/notebook_requirements.in b/bazel/notebook_requirements.in
@@ -1,20 +1,22 @@
 # OR-Tools code dependencies
 absl-py==1.4.0
-numpy==1.24.3
-protobuf==4.23.3
-scipy==1.10.0
+numpy==1.25.2
+protobuf==4.23.4
+scipy==1.11.1
 
 # OR-Tools build dependencies
-mypy-protobuf==3.4.0
-virtualenv==20.16.6
-black==23.3.0
+mypy-protobuf==3.5.0
+virtualenv==20.24.2
+black==23.7.0
 
 # Example dependencies
-pandas==1.5.3
+pandas==2.0.3
 
 # Visualization dependencies
 svgwrite==1.4.3
-plotly==5.13.0
+plotly==5.15.0
 
 # Notebook
-notebook==6.5.4
+notebook==7.0.2
+tornado==6.3.2
+Pygments==2.15.0
diff --git a/bazel/notebook_requirements.txt b/bazel/notebook_requirements.txt
diff --git a/bazel/ortools_requirements.in b/bazel/ortools_requirements.in
@@ -1,13 +1,13 @@
 # OR-Tools code dependencies
 absl-py==1.4.0
-numpy==1.24.3
-protobuf==4.23.3
-scipy==1.10.0
+numpy==1.25.2
+protobuf==4.23.4
+scipy==1.11.1
 
 # OR-Tools build dependencies
-mypy-protobuf==3.4.0
-virtualenv==20.16.6
-black==23.3.0
+mypy-protobuf==3.5.0
+virtualenv==20.24.2
+black==23.7.0
 
 # Example dependencies
-pandas==1.5.3
+pandas==2.0.3
diff --git a/bazel/ortools_requirements.txt b/bazel/ortools_requirements.txt
diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt
@@ -103,9 +103,9 @@ if(BUILD_Protobuf)
   FetchContent_Declare(
     protobuf
     GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
-    GIT_TAG "v23.3"
+    GIT_TAG "v23.4"
     GIT_SUBMODULES ""
-    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v23.3.patch")
+    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v23.4.patch")
   FetchContent_MakeAvailable(protobuf)
   list(POP_BACK CMAKE_MESSAGE_INDENT)
   message(CHECK_PASS "fetched")

diff --git a/patches/protobuf-v23.3.patch → patches/protobuf-v23.4.patch b/patches/protobuf-v23.3.patch → patches/protobuf-v23.4.patch