tweak export to notebook; add flags stubs code to allow them to work …

…in a notebook
google · Sep 5, 2023 · 2503029 · 2503029
1 parent d89cb4d
commit 2503029
Show file tree

Hide file tree

Showing 285 changed files with 476 additions and 427 deletions.
diff --git a/bazel/notebook_requirements.in b/bazel/notebook_requirements.in
@@ -17,7 +17,8 @@ svgwrite==1.4.3
 plotly==5.15.0
 
 # Notebook
-notebook==7.0.2
+jupyter==1.0.0
 tornado==6.3.3
 Pygments==2.15.0
 jupyter-server==2.7.2
+jsonschema==4.19.0
diff --git a/bazel/notebook_requirements.txt b/bazel/notebook_requirements.txt
@@ -6,25 +6,31 @@
 #
 absl-py==1.4.0
     # via -r bazel/notebook_requirements.in
-anyio==3.7.0
+anyio==4.0.0
     # via jupyter-server
-argon2-cffi==21.3.0
+appnope==0.1.3
+    # via
+    #   ipykernel
+    #   ipython
+argon2-cffi==23.1.0
     # via jupyter-server
 argon2-cffi-bindings==21.2.0
     # via argon2-cffi
 arrow==1.2.3
     # via isoduration
-asttokens==2.2.1
+asttokens==2.4.0
     # via stack-data
 async-lru==2.0.4
     # via jupyterlab
-attrs==22.2.0
-    # via jsonschema
+attrs==23.1.0
+    # via
+    #   jsonschema
+    #   referencing
 babel==2.12.1
     # via jupyterlab-server
 backcall==0.2.0
     # via ipython
-beautifulsoup4==4.11.2
+beautifulsoup4==4.12.2
     # via nbconvert
 black==23.7.0
     # via -r bazel/notebook_requirements.in
@@ -38,9 +44,11 @@ charset-normalizer==3.2.0
     # via requests
 click==8.1.3
     # via black
-comm==0.1.2
-    # via ipykernel
-debugpy==1.6.6
+comm==0.1.4
+    # via
+    #   ipykernel
+    #   ipywidgets
+debugpy==1.6.7.post1
     # via ipykernel
 decorator==5.1.1
     # via ipython
@@ -50,7 +58,7 @@ distlib==0.3.7
     # via virtualenv
 executing==1.2.0
     # via stack-data
-fastjsonschema==2.16.2
+fastjsonschema==2.18.0
     # via nbformat
 filelock==3.12.2
     # via virtualenv
@@ -61,13 +69,24 @@ idna==3.4
     #   anyio
     #   jsonschema
     #   requests
-ipykernel==6.21.1
-    # via jupyterlab
-ipython==8.10.0
-    # via ipykernel
+ipykernel==6.25.2
+    # via
+    #   jupyter
+    #   jupyter-console
+    #   jupyterlab
+    #   qtconsole
+ipython==8.15.0
+    # via
+    #   ipykernel
+    #   ipywidgets
+    #   jupyter-console
+ipython-genutils==0.2.0
+    # via qtconsole
+ipywidgets==8.1.0
+    # via jupyter
 isoduration==20.11.0
     # via jsonschema
-jedi==0.18.2
+jedi==0.19.0
     # via ipython
 jinja2==3.1.2
     # via
@@ -79,26 +98,37 @@ json5==0.9.14
     # via jupyterlab-server
 jsonpointer==2.4
     # via jsonschema
-jsonschema[format-nongpl]==4.17.3
+jsonschema[format-nongpl]==4.19.0
     # via
+    #   -r bazel/notebook_requirements.in
     #   jupyter-events
     #   jupyterlab-server
     #   nbformat
-jupyter-client==8.0.2
+jsonschema-specifications==2023.7.1
+    # via jsonschema
+jupyter==1.0.0
+    # via -r bazel/notebook_requirements.in
+jupyter-client==8.3.1
     # via
     #   ipykernel
+    #   jupyter-console
     #   jupyter-server
     #   nbclient
-jupyter-core==5.2.0
+    #   qtconsole
+jupyter-console==6.6.3
+    # via jupyter
+jupyter-core==5.3.1
     # via
     #   ipykernel
     #   jupyter-client
+    #   jupyter-console
     #   jupyter-server
     #   jupyterlab
     #   nbclient
     #   nbconvert
     #   nbformat
-jupyter-events==0.6.3
+    #   qtconsole
+jupyter-events==0.7.0
     # via jupyter-server
 jupyter-lsp==2.2.0
     # via jupyterlab
@@ -112,41 +142,45 @@ jupyter-server==2.7.2
     #   notebook-shim
 jupyter-server-terminals==0.4.4
     # via jupyter-server
-jupyterlab==4.0.4
+jupyterlab==4.0.5
     # via notebook
 jupyterlab-pygments==0.2.2
     # via nbconvert
 jupyterlab-server==2.24.0
     # via
     #   jupyterlab
     #   notebook
-markupsafe==2.1.2
+jupyterlab-widgets==3.0.8
+    # via ipywidgets
+markupsafe==2.1.3
     # via
     #   jinja2
     #   nbconvert
 matplotlib-inline==0.1.6
     # via
     #   ipykernel
     #   ipython
-mistune==2.0.5
+mistune==3.0.1
     # via nbconvert
 mypy-extensions==1.0.0
     # via black
 mypy-protobuf==3.5.0
     # via -r bazel/notebook_requirements.in
-nbclient==0.7.2
+nbclient==0.8.0
     # via nbconvert
-nbconvert==7.2.9
-    # via jupyter-server
-nbformat==5.7.3
+nbconvert==7.8.0
+    # via
+    #   jupyter
+    #   jupyter-server
+nbformat==5.9.2
     # via
     #   jupyter-server
     #   nbclient
     #   nbconvert
-nest-asyncio==1.5.6
+nest-asyncio==1.5.7
     # via ipykernel
-notebook==7.0.2
-    # via -r bazel/notebook_requirements.in
+notebook==7.0.3
+    # via jupyter
 notebook-shim==0.2.3
     # via
     #   jupyterlab
@@ -156,9 +190,9 @@ numpy==1.25.2
     #   -r bazel/notebook_requirements.in
     #   pandas
     #   scipy
-overrides==7.3.1
+overrides==7.4.0
     # via jupyter-server
-packaging==23.0
+packaging==23.1
     # via
     #   black
     #   ipykernel
@@ -167,6 +201,8 @@ packaging==23.0
     #   jupyterlab-server
     #   nbconvert
     #   plotly
+    #   qtconsole
+    #   qtpy
 pandas==2.0.3
     # via -r bazel/notebook_requirements.in
 pandocfilters==1.5.0
@@ -186,15 +222,17 @@ platformdirs==3.10.0
     #   virtualenv
 plotly==5.15.0
     # via -r bazel/notebook_requirements.in
-prometheus-client==0.16.0
+prometheus-client==0.17.1
     # via jupyter-server
-prompt-toolkit==3.0.36
-    # via ipython
+prompt-toolkit==3.0.39
+    # via
+    #   ipython
+    #   jupyter-console
 protobuf==4.24.0
     # via
     #   -r bazel/notebook_requirements.in
     #   mypy-protobuf
-psutil==5.9.4
+psutil==5.9.5
     # via ipykernel
 ptyprocess==0.7.0
     # via
@@ -208,9 +246,9 @@ pygments==2.15.0
     # via
     #   -r bazel/notebook_requirements.in
     #   ipython
+    #   jupyter-console
     #   nbconvert
-pyrsistent==0.19.3
-    # via jsonschema
+    #   qtconsole
 python-dateutil==2.8.2
     # via
     #   arrow
@@ -220,13 +258,24 @@ python-json-logger==2.0.7
     # via jupyter-events
 pytz==2022.7.1
     # via pandas
-pyyaml==6.0
+pyyaml==6.0.1
     # via jupyter-events
-pyzmq==25.0.0
+pyzmq==25.1.1
     # via
     #   ipykernel
     #   jupyter-client
+    #   jupyter-console
     #   jupyter-server
+    #   qtconsole
+qtconsole==5.4.4
+    # via jupyter
+qtpy==2.4.0
+    # via qtconsole
+referencing==0.30.2
+    # via
+    #   jsonschema
+    #   jsonschema-specifications
+    #   jupyter-events
 requests==2.31.0
     # via jupyterlab-server
 rfc3339-validator==0.1.4
@@ -237,6 +286,10 @@ rfc3986-validator==0.1.1
     # via
     #   jsonschema
     #   jupyter-events
+rpds-py==0.10.2
+    # via
+    #   jsonschema
+    #   referencing
 scipy==1.11.1
     # via -r bazel/notebook_requirements.in
 send2trash==1.8.2
@@ -249,7 +302,7 @@ six==1.16.0
     #   rfc3339-validator
 sniffio==1.3.0
     # via anyio
-soupsieve==2.3.2.post1
+soupsieve==2.5
     # via beautifulsoup4
 stack-data==0.6.2
     # via ipython
@@ -277,7 +330,9 @@ traitlets==5.9.0
     #   comm
     #   ipykernel
     #   ipython
+    #   ipywidgets
     #   jupyter-client
+    #   jupyter-console
     #   jupyter-core
     #   jupyter-events
     #   jupyter-server
@@ -286,6 +341,7 @@ traitlets==5.9.0
     #   nbclient
     #   nbconvert
     #   nbformat
+    #   qtconsole
 types-protobuf==4.24.0.0
     # via mypy-protobuf
 tzdata==2023.3
@@ -304,5 +360,7 @@ webencodings==0.5.1
     # via
     #   bleach
     #   tinycss2
-websocket-client==1.6.1
+websocket-client==1.6.2
     # via jupyter-server
+widgetsnbextension==4.0.8
+    # via ipywidgets
diff --git a/cmake/python.cmake b/cmake/python.cmake
@@ -283,6 +283,7 @@ file(COPY
   ortools/sat/python/cp_model_helper.py
   DESTINATION ${PYTHON_PROJECT_DIR}/sat/python)
 file(COPY
+  ortools/sat/colab/flags.py
   ortools/sat/colab/visualization.py
   DESTINATION ${PYTHON_PROJECT_DIR}/sat/colab)
 

diff --git a/examples/notebook/algorithms/knapsack.ipynb b/examples/notebook/algorithms/knapsack.ipynb
@@ -5,7 +5,7 @@
    "id": "google",
    "metadata": {},
    "source": [
-    "##### Copyright 2022 Google LLC."
+    "##### Copyright 2023 Google LLC."
    ]
   },
   {

diff --git a/examples/notebook/algorithms/simple_knapsack_program.ipynb b/examples/notebook/algorithms/simple_knapsack_program.ipynb
@@ -5,7 +5,7 @@
    "id": "google",
    "metadata": {},
    "source": [
-    "##### Copyright 2022 Google LLC."
+    "##### Copyright 2023 Google LLC."
    ]
   },
   {

diff --git a/examples/notebook/constraint_solver/cp_is_fun_cp.ipynb b/examples/notebook/constraint_solver/cp_is_fun_cp.ipynb
@@ -5,7 +5,7 @@
    "id": "google",
    "metadata": {},
    "source": [
-    "##### Copyright 2022 Google LLC."
+    "##### Copyright 2023 Google LLC."
    ]
   },
   {

diff --git a/examples/notebook/constraint_solver/cvrp.ipynb b/examples/notebook/constraint_solver/cvrp.ipynb
@@ -5,7 +5,7 @@
    "id": "google",
    "metadata": {},
    "source": [
-    "##### Copyright 2022 Google LLC."
+    "##### Copyright 2023 Google LLC."
    ]
   },
   {

diff --git a/examples/notebook/constraint_solver/cvrp_reload.ipynb b/examples/notebook/constraint_solver/cvrp_reload.ipynb
@@ -5,7 +5,7 @@
    "id": "google",
    "metadata": {},
    "source": [
-    "##### Copyright 2022 Google LLC."
+    "##### Copyright 2023 Google LLC."
    ]
   },
   {

diff --git a/examples/notebook/constraint_solver/cvrptw.ipynb b/examples/notebook/constraint_solver/cvrptw.ipynb
@@ -5,7 +5,7 @@
    "id": "google",
    "metadata": {},
    "source": [
-    "##### Copyright 2022 Google LLC."
+    "##### Copyright 2023 Google LLC."
    ]
   },
   {

diff --git a/examples/notebook/constraint_solver/cvrptw_break.ipynb b/examples/notebook/constraint_solver/cvrptw_break.ipynb
@@ -5,7 +5,7 @@
    "id": "google",
    "metadata": {},
    "source": [
-    "##### Copyright 2022 Google LLC."
+    "##### Copyright 2023 Google LLC."
    ]
   },
   {