From b74f459194b32419d518e328370af3d7d318524b Mon Sep 17 00:00:00 2001
From: Peifan Wu <wupeifan@gmail.com>
Date: Tue, 4 Jan 2022 12:42:24 -0800
Subject: [PATCH 1/4] Update merge.md

---
 lectures/pandas/merge.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lectures/pandas/merge.md b/lectures/pandas/merge.md
index 7f67d946..15602fef 100644
--- a/lectures/pandas/merge.md
+++ b/lectures/pandas/merge.md
@@ -660,7 +660,7 @@ avg_delays
 The one issue with this dataset is that we don't know what all those two
 letter carrier codes are!
 
-Thankfully, we have a second dataset that maps the two letter code
+Thankfully, we have a second dataset that maps the two-letter code
 into the full airline name.
 
 ```{code-cell} python
@@ -673,7 +673,7 @@ Let's merge these names so we know which airlines we should avoid
 flying...
 
 ```{code-cell} python
-avg_delays_w_code = avg_delays.join(carrier_code)
+avg_delays_w_code = avg_delays.join(carrier_code.set_index("Code"))
 avg_delays_w_code.sort_values("CarrierDelay", ascending=False)
 ```
 

From 1e0405ca90c469e09a424e6adeb66eeec38d4624 Mon Sep 17 00:00:00 2001
From: mmcky <mamckay@gmail.com>
Date: Thu, 13 Jan 2022 12:49:06 +1100
Subject: [PATCH 2/4] move fiona to conda rather than PyPI

---
 environment.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/environment.yml b/environment.yml
index 7852bcbf..a8de26a8 100644
--- a/environment.yml
+++ b/environment.yml
@@ -2,8 +2,8 @@ name: lecture-datascience
 channels:
   - default
 dependencies:
-  - python=3.8
-  - anaconda=2021.05
+  - python=3.9
+  - anaconda=2021.11
   - pip
   - pip:
     - jupyter-book>=0.12.1,<0.13
@@ -13,7 +13,6 @@ dependencies:
     - joblib
     - interpolation
     - sphinx-tojupyter
-    - fiona 
     - geopandas 
     - pyLDAvis >= 3.3.0
     - gensim 
@@ -38,3 +37,4 @@ dependencies:
     - lxml
   - conda:
     - python-graphviz
+    - fiona

From 349dc7138367f5bdb4108819fa9001b84a859aed Mon Sep 17 00:00:00 2001
From: mmcky <mamckay@gmail.com>
Date: Thu, 13 Jan 2022 13:39:29 +1100
Subject: [PATCH 3/4] remove sphinx_exercise as directives {exercise} and
 {solution} are not used in this project

---
 lectures/_config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lectures/_config.yml b/lectures/_config.yml
index 2eb21f74..66c1d1dc 100644
--- a/lectures/_config.yml
+++ b/lectures/_config.yml
@@ -11,7 +11,7 @@ html:
   baseurl: https://datascience.quantecon.org/
 
 sphinx:
-  extra_extensions: [sphinx_multitoc_numbering, sphinx_exercise, sphinx_tojupyter]
+  extra_extensions: [sphinx_multitoc_numbering, sphinx_tojupyter]
   config:
     html_favicon: _static/lectures-favicon.ico
     html_static_path: ['_static']

From c725fe62fa905454cb369aaed6ab272a984f6bd4 Mon Sep 17 00:00:00 2001
From: mmcky <mamckay@gmail.com>
Date: Thu, 13 Jan 2022 14:47:28 +1100
Subject: [PATCH 4/4] check if later version of nltk fixes download issue

---
 environment.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/environment.yml b/environment.yml
index a8de26a8..219188ce 100644
--- a/environment.yml
+++ b/environment.yml
@@ -38,3 +38,5 @@ dependencies:
   - conda:
     - python-graphviz
     - fiona
+    - llvmlite
+    - nltk