Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix an issue in merge lecture #199

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix an issue in merge lecture #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b74f459
Update merge.md
wupeifan Jan 4, 2022
1e0405c
move fiona to conda rather than PyPI
mmcky Jan 13, 2022
349dc71
remove sphinx_exercise as directives {exercise} and {solution} are no…
mmcky Jan 13, 2022
c725fe6
check if later version of nltk fixes download issue
mmcky Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -13,7 +13,6 @@ dependencies:
- joblib
- interpolation
- sphinx-tojupyter
- fiona
- geopandas
- pyLDAvis >= 3.3.0
- gensim
Expand All @@ -38,3 +37,6 @@ dependencies:
- lxml
- conda:
- python-graphviz
- fiona
- llvmlite
- nltk
2 changes: 1 addition & 1 deletion lectures/_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
4 changes: 2 additions & 2 deletions lectures/pandas/merge.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
```

Expand Down