mwerge

Merge branch 'master' of github.com:DS-100/textbook
DS-100 · Apr 29, 2023 · 987f64f · 987f64f
2 parents 4ca82f7 + 1006771
commit 987f64f
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 38 deletions.
diff --git a/environment.yml b/environment.yml
@@ -1,13 +1,12 @@
 name: textbook
 channels:
-  - conda-forge
   - defaults
+  - conda-forge
 dependencies:
   - alabaster=0.7.12=pyhd3eb1b0_0
   - anaconda=2021.05=py39_0
   - anaconda-client=1.7.2=py39hecd8cb5_0
   - anaconda-project=0.9.1=pyhd3eb1b0_1
-  - anyio=2.2.0=py39hecd8cb5_1
   - appdirs=1.4.4=py_0
   - applaunchservices=0.2.1=py_0
   - appnope=0.1.2=py39hecd8cb5_1001
@@ -25,7 +24,6 @@ dependencies:
   - backcall=0.2.0=pyhd3eb1b0_0
   - backports=1.0=pyhd3eb1b0_2
   - backports.shutil_get_terminal_size=1.0.0=pyhd3eb1b0_3
-  - beautifulsoup4=4.9.3=pyha847dfd_0
   - bitarray=1.9.2=py39h9ed2024_1
   - bkcharts=0.2=py39hecd8cb5_0
   - black=19.10b0=py_0
@@ -85,8 +83,6 @@ dependencies:
   - idna=2.10=pyhd3eb1b0_0
   - imagecodecs=2021.3.31=py39h2ea9c00_0
   - imageio=2.9.0=pyhd3eb1b0_0
-  - imagesize=1.2.0=pyhd3eb1b0_0
-  - importlib-metadata=3.10.0=py39hecd8cb5_0
   - importlib_metadata=3.10.0=hd3eb1b0_0
   - iniconfig=1.1.1=pyhd3eb1b0_0
   - intel-openmp=2021.2.0=hecd8cb5_564
@@ -100,15 +96,13 @@ dependencies:
   - jbig=2.1=h4d881f8_0
   - jdcal=1.4.1=py_0
   - jedi=0.17.2=py39hecd8cb5_1
-  - jinja2=2.11.3=pyhd3eb1b0_0
   - joblib=1.0.1=pyhd3eb1b0_0
   - jpeg=9b=he5867d9_2
   - json5=0.9.5=py_0
   - jsonschema=3.2.0=py_2
   - jupyter=1.0.0=py39hecd8cb5_7
   - jupyter_client=6.1.12=pyhd3eb1b0_0
   - jupyter_console=6.4.0=pyhd3eb1b0_0
-  - jupyter_core=4.7.1=py39hecd8cb5_0
   - jupyter_server=1.4.1=py39hecd8cb5_0
   - jupyterlab=3.0.14=pyhd3eb1b0_1
   - jupyterlab_pygments=0.1.2=py_0
@@ -147,10 +141,8 @@ dependencies:
   - llvm-openmp=10.0.0=h28b9765_0
   - llvmlite=0.36.0=py39he4411ff_4
   - locket=0.2.1=py39hecd8cb5_1
-  - lxml=4.6.3=py39h26b266a_0
   - lz4-c=1.9.3=h23ab428_0
   - lzo=2.10=haf1e3a3_2
-  - markupsafe=1.1.1=py39h9ed2024_0
   - mathjax=2.7.7=0
   - matplotlib=3.3.4=py39hecd8cb5_0
   - matplotlib-base=3.3.4=py39h8b3ea08_0
@@ -186,7 +178,6 @@ dependencies:
   - openjpeg=2.3.0=hb95cd4c_1
   - openpyxl=3.0.7=pyhd3eb1b0_0
   - openssl=1.1.1k=h9ed2024_0
-  - packaging=20.9=pyhd3eb1b0_0
   - pandas=1.2.4=py39h23ab428_0
   - pandoc=2.12=hecd8cb5_0
   - pandocfilters=1.4.3=py39hecd8cb5_1
@@ -220,7 +211,6 @@ dependencies:
   - pydocstyle=6.0.0=pyhd3eb1b0_0
   - pyerfa=1.7.3=py39h9ed2024_0
   - pyflakes=2.2.0=pyhd3eb1b0_0
-  - pygments=2.8.1=pyhd3eb1b0_0
   - pylint=2.7.4=py39hecd8cb5_1
   - pyls-black=0.4.6=hd3eb1b0_0
   - pyls-spyder=0.3.2=pyhd3eb1b0_0
@@ -236,12 +226,10 @@ dependencies:
   - python-dateutil=2.8.1=pyhd3eb1b0_0
   - python-jsonrpc-server=0.4.0=py_0
   - python-kaleido=0.2.1=pyhd8ed1ab_0
-  - python-language-server=0.36.2=pyhd3eb1b0_0
   - python-libarchive-c=2.9=pyhd3eb1b0_1
   - python.app=3=py39h9ed2024_0
   - pytz=2021.1=pyhd3eb1b0_0
   - pywavelets=1.1.1=py39he3068b8_4
-  - pyyaml=5.4.1=py39h9ed2024_1
   - pyzmq=20.0.0=py39h23ab428_1
   - qdarkstyle=2.8.1=py_0
   - qt=5.9.7=h468cd18_1
@@ -270,16 +258,12 @@ dependencies:
   - snowballstemmer=2.1.0=pyhd3eb1b0_0
   - sortedcollections=2.1.0=pyhd3eb1b0_0
   - sortedcontainers=2.3.0=pyhd3eb1b0_0
-  - soupsieve=2.2.1=pyhd3eb1b0_0
   - sphinxcontrib=1.0=py39hecd8cb5_1
   - sphinxcontrib-applehelp=1.0.2=pyhd3eb1b0_0
   - sphinxcontrib-devhelp=1.0.2=pyhd3eb1b0_0
-  - sphinxcontrib-htmlhelp=1.0.3=pyhd3eb1b0_0
   - sphinxcontrib-jsmath=1.0.1=pyhd3eb1b0_0
   - sphinxcontrib-qthelp=1.0.3=pyhd3eb1b0_0
-  - sphinxcontrib-serializinghtml=1.1.4=pyhd3eb1b0_0
   - sphinxcontrib-websupport=1.2.4=py_0
-  - spyder=4.2.5=py39hecd8cb5_0
   - spyder-kernels=1.10.2=py39hecd8cb5_0
   - sqlalchemy=1.4.7=py39h9ed2024_0
   - sqlite=3.35.4=hce871da_0
@@ -299,7 +283,6 @@ dependencies:
   - toolz=0.11.1=pyhd3eb1b0_0
   - tornado=6.1=py39h9ed2024_0
   - tqdm=4.59.0=pyhd3eb1b0_1
-  - traitlets=5.0.5=pyhd3eb1b0_0
   - typed-ast=1.4.2=py39h9ed2024_1
   - typing_extensions=3.7.4.3=pyha847dfd_0
   - tzdata=2020f=h52ac0ba_0
@@ -332,47 +315,95 @@ dependencies:
   - zope.interface=5.3.0=py39h9ed2024_0
   - zstd=1.4.5=h41d2c2f_0
   - pip:
+    - accessible-pygments==0.0.4
+    - anyio==3.5.0
+    - beautifulsoup4==4.12.2
+    - bs4==0.0.1
+    - cdsapi==0.5.1
+    - colorful==0.5.4
+    - csvtomd==0.3.0
     - deprecation==2.1.0
     - docopt==0.6.2
+    - docstring-to-markdown==0.10
     - docutils==0.16
+    - fastcore==1.3.27
+    - fastjsonschema==2.16.1
+    - fastrelease==0.1.12
+    - ghapi==0.1.19
     - ghp-import==1.0.0
     - gitdb==4.0.7
     - gitpython==3.1.18
-    - jupyter-book==0.11.2
-    - jupyter-cache==0.4.3
+    - imagesize==1.4.1
+    - importlib-metadata==6.6.0
+    - jinja2==3.1.2
+    - jupyter-book==0.15.1
+    - jupyter-book-to-htmlbook==1.0.8
+    - jupyter-cache==0.6.1
+    - jupyter-contrib-core==0.3.3
+    - jupyter-contrib-nbextensions==0.5.1
+    - jupyter-core==5.3.0
+    - jupyter-highlight-selected-word==0.2.0
+    - jupyter-latex-envs==1.4.6
+    - jupyter-nbextensions-configurator==0.4.1
     - jupyter-packaging==0.10.4
     - jupyter-server-mathjax==0.2.3
     - jupyter-sphinx==0.3.2
-    - jupytext==1.10.3
+    - jupyterlab-quickopen==1.0.0
+    - jupyterlab-spellchecker==0.7.2
+    - jupytext==1.14.5
     - latexcodec==2.0.1
-    - linkify-it-py==1.0.1
-    - markdown-it-py==0.6.2
-    - mdit-py-plugins==0.2.6
-    - myst-nb==0.12.3
-    - myst-parser==0.13.7
-    - nbconvert==5.6.1
+    - libcst==0.3.21
+    - linkify-it-py==2.0.0
+    - lxml==4.9.2
+    - markdown-it-py==2.2.0
+    - markupsafe==2.1.2
+    - marshmallow==3.14.0
+    - marshmallow-sqlalchemy==0.26.1
+    - mdit-py-plugins==0.3.5
+    - mdurl==0.1.2
+    - myst-nb==0.17.2
+    - myst-parser==0.18.1
+    - nbconvert==5.6.0
+    - nbdev==1.1.23
     - nbdime==3.1.0
+    - packaging==23.1
+    - platformdirs==3.5.0
+    - prettyprinter==0.18.0
     - pybtex==0.24.0
     - pybtex-docutils==1.0.1
-    - pydata-sphinx-theme==0.6.3
+    - pydata-sphinx-theme==0.13.3
     - pyee==8.2.2
+    - pygments==2.15.1
+    - pyperclip==1.8.2
     - pyppeteer==0.2.6
+    - python-language-server==0.36.2+49.g3536061
+    - pyyaml==6.0
     - ruamel-yaml==0.17.16
     - ruamel-yaml-clib==0.2.6
+    - simplejson==3.17.5
     - smmap==4.0.0
-    - sphinx==3.5.4
-    - sphinx-book-theme==0.1.2
+    - soupsieve==2.3.1
+    - sphinx==5.0.2
+    - sphinx-book-theme==1.0.1
     - sphinx-comments==0.0.3
     - sphinx-copybutton==0.4.0
-    - sphinx-external-toc==0.2.3
-    - sphinx-jupyterbook-latex==0.4.2
+    - sphinx-design==0.3.0
+    - sphinx-external-toc==0.3.1
+    - sphinx-jupyterbook-latex==0.5.2
     - sphinx-multitoc-numbering==0.1.3
-    - sphinx-panels==0.5.2
-    - sphinx-thebe==0.0.8
+    - sphinx-thebe==0.2.1
     - sphinx-togglebutton==0.2.3
     - sphinxcontrib-bibtex==2.2.1
+    - sphinxcontrib-htmlhelp==2.0.1
+    - sphinxcontrib-serializinghtml==1.1.5
     - sphinxext-rediraffe==0.2.5
+    - tabulate==0.9.0
+    - tinycss2==1.1.1
     - tomlkit==0.7.2
+    - traitlets==5.9.0
+    - typer==0.7.0
+    - typing-inspect==0.7.1
     - uc-micro-py==1.0.1
+    - websocket-client==1.2.3
     - websockets==9.1
 prefix: /Users/sam/anaconda3/envs/textbook
diff --git a/requirements.txt b/requirements.txt
@@ -1,14 +1,11 @@
 # These requirements are sufficient to build the book but not to run
 # all of the code. See environment.yml for the complete book dependencies.
-jupyter-book==0.11.2
+jupyter-book==0.15.1
 ghp-import==1.0.0
 sphinxext-rediraffe==0.2.5
 docopt==0.6.2
 ruamel.yaml==0.17.16
 
-# https://github.com/executablebooks/jupyter-book/issues/1676
-Jinja2<3.1
-
 # numpy
 # pandas
 # scipy