diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..8050a3b
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,397 @@
+Attribution 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+ Considerations for licensors: Our public licenses are
+ intended for use by those authorized to give the public
+ permission to use material in ways otherwise restricted by
+ copyright and certain other rights. Our licenses are
+ irrevocable. Licensors should read and understand the terms
+ and conditions of the license they choose before applying it.
+ Licensors should also secure all rights necessary before
+ applying our licenses so that the public can reuse the
+ material as expected. Licensors should clearly mark any
+ material not subject to the license. This includes other CC-
+ licensed material, or material used under an exception or
+ limitation to copyright. More considerations for licensors:
+ wiki.creativecommons.org/Considerations_for_licensors
+
+ Considerations for the public: By using one of our public
+ licenses, a licensor grants the public permission to use the
+ licensed material under specified terms and conditions. If
+ the licensor's permission is not necessary for any reason--for
+ example, because of any applicable exception or limitation to
+ copyright--then that use is not regulated by the license. Our
+ licenses grant only permissions under copyright and certain
+ other rights that a licensor has authority to grant. Use of
+ the licensed material may still be restricted for other
+ reasons, including because others have copyright or other
+ rights in the material. A licensor may make special requests,
+ such as asking that all changes be marked or described.
+ Although not required by our licenses, you are encouraged to
+ respect those requests where reasonable. More considerations
+ for the public:
+ wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution 4.0 International Public License ("Public License"). To the
+extent this Public License may be interpreted as a contract, You are
+granted the Licensed Rights in consideration of Your acceptance of
+these terms and conditions, and the Licensor grants You such rights in
+consideration of benefits the Licensor receives from making the
+Licensed Material available under these terms and conditions.
+
+
+Section 1 -- Definitions.
+
+ a. Adapted Material means material subject to Copyright and Similar
+ Rights that is derived from or based upon the Licensed Material
+ and in which the Licensed Material is translated, altered,
+ arranged, transformed, or otherwise modified in a manner requiring
+ permission under the Copyright and Similar Rights held by the
+ Licensor. For purposes of this Public License, where the Licensed
+ Material is a musical work, performance, or sound recording,
+ Adapted Material is always produced where the Licensed Material is
+ synched in timed relation with a moving image.
+
+ b. Adapter's License means the license You apply to Your Copyright
+ and Similar Rights in Your contributions to Adapted Material in
+ accordance with the terms and conditions of this Public License.
+
+ c. Copyright and Similar Rights means copyright and/or similar rights
+ closely related to copyright including, without limitation,
+ performance, broadcast, sound recording, and Sui Generis Database
+ Rights, without regard to how the rights are labeled or
+ categorized. For purposes of this Public License, the rights
+ specified in Section 2(b)(1)-(2) are not Copyright and Similar
+ Rights.
+
+ d. Effective Technological Measures means those measures that, in the
+ absence of proper authority, may not be circumvented under laws
+ fulfilling obligations under Article 11 of the WIPO Copyright
+ Treaty adopted on December 20, 1996, and/or similar international
+ agreements.
+
+ e. Exceptions and Limitations means fair use, fair dealing, and/or
+ any other exception or limitation to Copyright and Similar Rights
+ that applies to Your use of the Licensed Material.
+
+ f. Licensed Material means the artistic or literary work, database,
+ or other material to which the Licensor applied this Public
+ License.
+
+ g. Licensed Rights means the rights granted to You subject to the
+ terms and conditions of this Public License, which are limited to
+ all Copyright and Similar Rights that apply to Your use of the
+ Licensed Material and that the Licensor has authority to license.
+
+ h. Licensor means the individual(s) or entity(ies) granting rights
+ under this Public License.
+
+ i. Share means to provide material to the public by any means or
+ process that requires permission under the Licensed Rights, such
+ as reproduction, public display, public performance, distribution,
+ dissemination, communication, or importation, and to make material
+ available to the public including in ways that members of the
+ public may access the material from a place and at a time
+ individually chosen by them.
+
+ j. Sui Generis Database Rights means rights other than copyright
+ resulting from Directive 96/9/EC of the European Parliament and of
+ the Council of 11 March 1996 on the legal protection of databases,
+ as amended and/or succeeded, as well as other essentially
+ equivalent rights anywhere in the world.
+
+ k. You means the individual or entity exercising the Licensed Rights
+ under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+ a. License grant.
+
+ 1. Subject to the terms and conditions of this Public License,
+ the Licensor hereby grants You a worldwide, royalty-free,
+ non-sublicensable, non-exclusive, irrevocable license to
+ exercise the Licensed Rights in the Licensed Material to:
+
+ a. reproduce and Share the Licensed Material, in whole or
+ in part; and
+
+ b. produce, reproduce, and Share Adapted Material.
+
+ 2. Exceptions and Limitations. For the avoidance of doubt, where
+ Exceptions and Limitations apply to Your use, this Public
+ License does not apply, and You do not need to comply with
+ its terms and conditions.
+
+ 3. Term. The term of this Public License is specified in Section
+ 6(a).
+
+ 4. Media and formats; technical modifications allowed. The
+ Licensor authorizes You to exercise the Licensed Rights in
+ all media and formats whether now known or hereafter created,
+ and to make technical modifications necessary to do so. The
+ Licensor waives and/or agrees not to assert any right or
+ authority to forbid You from making technical modifications
+ necessary to exercise the Licensed Rights, including
+ technical modifications necessary to circumvent Effective
+ Technological Measures. For purposes of this Public License,
+ simply making modifications authorized by this Section 2(a)
+ (4) never produces Adapted Material.
+
+ 5. Downstream recipients.
+
+ a. Offer from the Licensor -- Licensed Material. Every
+ recipient of the Licensed Material automatically
+ receives an offer from the Licensor to exercise the
+ Licensed Rights under the terms and conditions of this
+ Public License.
+
+ b. No downstream restrictions. You may not offer or impose
+ any additional or different terms or conditions on, or
+ apply any Effective Technological Measures to, the
+ Licensed Material if doing so restricts exercise of the
+ Licensed Rights by any recipient of the Licensed
+ Material.
+
+ 6. No endorsement. Nothing in this Public License constitutes or
+ may be construed as permission to assert or imply that You
+ are, or that Your use of the Licensed Material is, connected
+ with, or sponsored, endorsed, or granted official status by,
+ the Licensor or others designated to receive attribution as
+ provided in Section 3(a)(1)(A)(i).
+
+ b. Other rights.
+
+ 1. Moral rights, such as the right of integrity, are not
+ licensed under this Public License, nor are publicity,
+ privacy, and/or other similar personality rights; however, to
+ the extent possible, the Licensor waives and/or agrees not to
+ assert any such rights held by the Licensor to the limited
+ extent necessary to allow You to exercise the Licensed
+ Rights, but not otherwise.
+
+ 2. Patent and trademark rights are not licensed under this
+ Public License.
+
+ 3. To the extent possible, the Licensor waives any right to
+ collect royalties from You for the exercise of the Licensed
+ Rights, whether directly or through a collecting society
+ under any voluntary or waivable statutory or compulsory
+ licensing scheme. In all other cases the Licensor expressly
+ reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+ a. Attribution.
+
+ 1. If You Share the Licensed Material (including in modified
+ form), You must:
+
+ a. retain the following if it is supplied by the Licensor
+ with the Licensed Material:
+
+ i. identification of the creator(s) of the Licensed
+ Material and any others designated to receive
+ attribution, in any reasonable manner requested by
+ the Licensor (including by pseudonym if
+ designated);
+
+ ii. a copyright notice;
+
+ iii. a notice that refers to this Public License;
+
+ iv. a notice that refers to the disclaimer of
+ warranties;
+
+ v. a URI or hyperlink to the Licensed Material to the
+ extent reasonably practicable;
+
+ b. indicate if You modified the Licensed Material and
+ retain an indication of any previous modifications; and
+
+ c. indicate the Licensed Material is licensed under this
+ Public License, and include the text of, or the URI or
+ hyperlink to, this Public License.
+
+ 2. You may satisfy the conditions in Section 3(a)(1) in any
+ reasonable manner based on the medium, means, and context in
+ which You Share the Licensed Material. For example, it may be
+ reasonable to satisfy the conditions by providing a URI or
+ hyperlink to a resource that includes the required
+ information.
+
+ 3. If requested by the Licensor, You must remove any of the
+ information required by Section 3(a)(1)(A) to the extent
+ reasonably practicable.
+
+ 4. If You Share Adapted Material You produce, the Adapter's
+ License You apply must not prevent recipients of the Adapted
+ Material from complying with this Public License.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+ a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+ to extract, reuse, reproduce, and Share all or a substantial
+ portion of the contents of the database;
+
+ b. if You include all or a substantial portion of the database
+ contents in a database in which You have Sui Generis Database
+ Rights, then the database in which You have Sui Generis Database
+ Rights (but not its individual contents) is Adapted Material; and
+
+ c. You must comply with the conditions in Section 3(a) if You Share
+ all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+ a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+ EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+ AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+ ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+ IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+ WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+ ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+ KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+ ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+ b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+ TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+ NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+ INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+ COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+ USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+ ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+ DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+ IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+ c. The disclaimer of warranties and limitation of liability provided
+ above shall be interpreted in a manner that, to the extent
+ possible, most closely approximates an absolute disclaimer and
+ waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+ a. This Public License applies for the term of the Copyright and
+ Similar Rights licensed here. However, if You fail to comply with
+ this Public License, then Your rights under this Public License
+ terminate automatically.
+
+ b. Where Your right to use the Licensed Material has terminated under
+ Section 6(a), it reinstates:
+
+ 1. automatically as of the date the violation is cured, provided
+ it is cured within 30 days of Your discovery of the
+ violation; or
+
+ 2. upon express reinstatement by the Licensor.
+
+ For the avoidance of doubt, this Section 6(b) does not affect any
+ right the Licensor may have to seek remedies for Your violations
+ of this Public License.
+
+ c. For the avoidance of doubt, the Licensor may also offer the
+ Licensed Material under separate terms or conditions or stop
+ distributing the Licensed Material at any time; however, doing so
+ will not terminate this Public License.
+
+ d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+ License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+ a. The Licensor shall not be bound by any additional or different
+ terms or conditions communicated by You unless expressly agreed.
+
+ b. Any arrangements, understandings, or agreements regarding the
+ Licensed Material not stated herein are separate from and
+ independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+ a. For the avoidance of doubt, this Public License does not, and
+ shall not be interpreted to, reduce, limit, restrict, or impose
+ conditions on any use of the Licensed Material that could lawfully
+ be made without permission under this Public License.
+
+ b. To the extent possible, if any provision of this Public License is
+ deemed unenforceable, it shall be automatically reformed to the
+ minimum extent necessary to make it enforceable. If the provision
+ cannot be reformed, it shall be severed from this Public License
+ without affecting the enforceability of the remaining terms and
+ conditions.
+
+ c. No term or condition of this Public License will be waived and no
+ failure to comply consented to unless expressly agreed to by the
+ Licensor.
+
+ d. Nothing in this Public License constitutes or may be interpreted
+ as a limitation upon, or waiver of, any privileges and immunities
+ that apply to the Licensor or You, including from the legal
+ processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
+
+
diff --git a/README.md b/README.md
index 2972bd8..d195995 100644
--- a/README.md
+++ b/README.md
@@ -1,95 +1,140 @@
-# D-Lab's Python Web Scraping Workshop
+# D-Lab Python Web Scraping Workshop
-[](https://dlab.datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https%3A%2F%2Fgithub.com%2Fdlab-berkeley%2FPython-Web-Scraping&urlpath=lab%2Ftree%2FPython-Web-Scraping%2F)
-[](https://mybinder.org/v2/gh/dlab-berkeley/Python-Web-Scraping/main?urlpath=tree)
+[](https://dlab.datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https%3A%2F%2Fgithub.com%2Fdlab-berkeley%2FPython-Web-Scraping&urlpath=lab%2Ftree%2FPython-Web-Scraping%2F&branch=main)
+[](https://mybinder.org/v2/gh/dlab-berkeley/Python-Web-Scraping/HEAD)
+[](https://creativecommons.org/licenses/by/4.0/)
-This repository contains the materials for D-Lab’s Python Web Scraping Workshop. Prior experience with Python Fundamentals and Python Data Wrangling is assumed.
-## Workshop Goals
+This repository contains the materials for D-Lab’s Python Web Scraping Workshop.
+We recommend attending Python Fundamentals and Python Data Wrangling prior to
+this workshop. We additionally recommend a basic understanding of HTML and CSS.
+
-In this workshop, we cover how to scrape data from the web using Python. Web scraping involves downloading a webpage's source code and sifting through the material to extract the desired data.
+## Workshop Goals
-Web scraping is typically only done when Web APIs are not available. Platforms like Twitter, Reddit, or The New York Times offer APIs to retrieve data. If you want to learn how to use web APIs in Python, see D-Lab's [Python Web APIs](https://github.com/dlab-berkeley/Python-Web-APIs) workshop.
+In this workshop, we cover how to scrape data from the web using Python. Web
+scraping involves downloading a webpage's source code and sifting through the
+material to extract desired data.
-Basic familiarity with Python is assumed. Understanding the material in the [Python Fundamentals](https://github.com/dlab-berkeley/Python-Fundamentals) and [Python Data Wrangling](https://github.com/dlab-berkeley/Python-Data-Wrangling) workshops highly recommended. We additionally recommend a basic understanding of HTML and CSS.
+Web scraping is typically only done when Web APIs are not available. Platforms
+like Twitter, Reddit, or The New York Times offer APIs to retrieve data. If you
+want to learn how to use web APIs in Python, see D-Lab's [Python Web
+APIs](https://github.com/dlab-berkeley/Python-Web-APIs) workshop.
## Installation Instructions
Anaconda is a useful package management software that allows you to run Python
-and Jupyter notebooks very easily. Installing Anaconda is the easiest way to
-make sure you have all the necessary software to run the materials for this
-workshop. Complete the following steps:
+and Jupyter notebooks easily. Installing Anaconda is the easiest way to make
+sure you have all the necessary software to run the materials for this workshop.
+If you would like to run Python on your own computer, complete the following
+steps prior to the workshop:
-1. [Download and install Anaconda (Python 3.8
- distribution)](https://www.anaconda.com/products/individual). Click
- "Download" and then click 64-bit "Graphical Installer" for your current
- operating system.
+1. [Download and install Anaconda (Python 3.9
+ distribution)](https://www.anaconda.com/products/individual). Click the
+ "Download" button.
-2. Download the [Python-Web-Scraping workshop
+2. Download the Python Web Scraping [workshop
materials](https://github.com/dlab-berkeley/Python-Web-Scraping):
-* Click the green "Code" button in the top right of the repository information.
-* Click "Download Zip".
-* Extract this file to a folder on your computer where you can easily access it
- (we recommend Desktop).
+ - Click the green "Code" button in the top right of the repository
+ information.
+ - Click "Download Zip".
+ - Extract this file to a folder on your computer where you can easily
+ access it (we recommend Desktop).
3. Optional: if you're familiar with `git`, you can instead clone this
- repository by opening a terminal and entering `git clone
+ repository by opening a terminal and entering the command `git clone
git@github.com:dlab-berkeley/Python-Web-Scraping.git`.
+
## Is Python Not Working on Your Computer?
-If you do not have Anaconda installed and the materials loaded on your workshop by the time it starts, we *strongly* recommend using the UC Berkeley Datahub to run the materials for these lessons. You can access the DataHub by clicking this button:
+If you do not have Anaconda installed and the materials loaded on your workshop
+by the time it starts, we *strongly* recommend using the UC Berkeley Datahub to
+run the materials for these lessons. You can access the DataHub by clicking this
+button:
-[](https://dlab.datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https%3A%2F%2Fgithub.com%2Fdlab-berkeley%2FPython-Web-Scraping&urlpath=lab%2Ftree%2FPython-Web-Scraping%2F)
+[](https://dlab.datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https%3A%2F%2Fgithub.com%2Fdlab-berkeley%2FPython-Web-Scraping&urlpath=lab%2Ftree%2FPython-Web-Scraping%2F&branch=main)
-The DataHub downloads this repository, along with any necessary packages, and allows you to run the materials in a Jupyter notebook that is stored on UC Berkeley's servers. No installation is necessary from your end - you only need an internet browser and a CalNet ID to log in. By using the DataHub, you can save your work and come back to it at any time. When you want to return to your saved work, just go straight to [DataHub](https://datahub.berkeley.edu), sign in, and you click on the `Python-Web-Scraping` folder.
+The DataHub downloads this repository, along with any necessary packages, and
+allows you to run the materials in a Jupyter notebook that is stored on UC
+Berkeley's servers. No installation is necessary from your end - you only need
+an internet browser and a CalNet ID to log in. By using the DataHub, you can
+save your work and come back to it at any time. When you want to return to your
+saved work, just go straight to [DataHub](https://datahub.berkeley.edu), sign
+in, and you click on the `Python-Web-Scraping` folder.
-If you don't have a Berkeley CalNet ID, you can still run these lessons in the cloud, by clicking this button:
+If you don't have a Berkeley CalNet ID, you can still run these lessons in the
+cloud, by clicking this button:
-[](https://mybinder.org/v2/gh/dlab-berkeley/Python-Web-Scraping/main?urlpath=tree)
+[](https://mybinder.org/v2/gh/dlab-berkeley/Python-Web-Scraping/HEAD)
By using this button, however, you cannot save your work.
## Run the code
-1. Open the Anaconda Navigator application. You should see the green snake logo appear on your screen. Note that this can take a few minutes to load up the first time.
+1. Open the Anaconda Navigator application. You should see the green snake logo
+ appear on your screen. Note that this can take a few minutes to load up the
+ first time.
-2. Click the "Launch" button under "Jupyter Notebooks" and navigate through your file system to the `Python-Web-Scraping` folder you downloaded above.
+2. Click the "Launch" button under "Jupyter Notebooks" and navigate through your
+ file system to the `Python-Web-Scraping` folder you downloaded above. Note
+ that, if you download the materials from GitHub, the folder name may instead
+ be `Python-Text-Analysis-main`.
3. Open the `lessons` folder, and click `01_introduction.md` to begin.
4. Press Shift + Enter (or Ctrl + Enter) to run a cell.
-5. By default, the necessary packages for this workshop should already be installed. You can install them within the Jupyter notebook by running the following line in its own cell:
+5. By default, the necessary packages for this workshop should already be
+ installed. You can install them within the Jupyter notebook by running the
+ following line in its own cell:
-> ```!pip install -r requirements.txt```
+> ```%pip install -r requirements.txt```
-Note that all of the above steps can be run from the terminal, if you're familiar with how to interact with Anaconda in that fashion. However, using Anaconda Navigator is the easiest way to get started if this is your first time working with Anaconda.
+Note that all of the above steps can be run from the terminal, if you're
+familiar with how to interact with Anaconda in that fashion. However, using
+Anaconda Navigator is the easiest way to get started if this is your first time
+working with Anaconda.
# About the UC Berkeley D-Lab
-D-Lab works with Berkeley faculty, research staff, and students to advance data-intensive social science and humanities research. Our goal at D-Lab is to provide practical training, staff support, resources, and space to enable you to use R for your own research applications. Our services cater to all skill levels and no programming, statistical, or computer science backgrounds are necessary. We offer these services in the form of workshops, one-to-one consulting, and working groups that cover a variety of research topics, digital tools, and programming languages.
-
-Visit the [D-Lab homepage](https://dlab.berkeley.edu/) to learn more about us. You can view our [calendar](https://dlab.berkeley.edu/events/calendar) for upcoming events, learn about how to utilize our [consulting](https://dlab.berkeley.edu/consulting) and [data](https://dlab.berkeley.edu/data) services, and check out upcoming [workshops](https://dlab.berkeley.edu/events/workshops).
+D-Lab works with Berkeley faculty, research staff, and students to advance
+data-intensive social science and humanities research. Our goal at D-Lab is to
+provide practical training, staff support, resources, and space to enable you to
+use R for your own research applications. Our services cater to all skill levels
+and no programming, statistical, or computer science backgrounds are necessary.
+We offer these services in the form of workshops, one-to-one consulting, and
+working groups that cover a variety of research topics, digital tools, and
+programming languages.
+
+Visit the [D-Lab homepage](https://dlab.berkeley.edu/) to learn more about us.
+You can view our [calendar](https://dlab.berkeley.edu/events/calendar) for
+upcoming events, learn about how to utilize our
+[consulting](https://dlab.berkeley.edu/consulting) and [data
+services](https://dlab.berkeley.edu/data), and check out upcoming
+[workshops](https://dlab.berkeley.edu/events/workshops). Subscribe to our
+[newsletter](https://dlab.berkeley.edu/news/weekly-newsletter) to stay up to
+date on D-Lab events, services, and opportunities.
# Other D-Lab Python Workshops
-Here are other Python workshops offered by the D-Lab:
+D-Lab offers a variety of Python workshops, catered toward different levels of
+expertise.
-## Basic competency
+## Introductory Workshops
-* [Python Fundamentals](https://github.com/dlab-berkeley/python-fundamentals)
-* [Introduction to Pandas](https://github.com/dlab-berkeley/introduction-to-pandas)
-* [Geospatial Fundamentals in Python](https://github.com/dlab-berkeley/Geospatial-Fundamentals-in-Python)
-* [Python Visualization](https://github.com/dlab-berkeley/Python-Data-Visualization)
+- [Python Fundamentals](https://github.com/dlab-berkeley/Python-Fundamentals)
+- [Python Data Wrangling](https://github.com/dlab-berkeley/Python-Data-Wrangling)
+- [Python Data Visualization](https://github.com/dlab-berkeley/Python-Data-Visualization)
-## Intermediate/advanced competency
+## Intermediate and Advanced Workshops
-* [Computational Text Analysis in Python](https://github.com/dlab-berkeley/computational-text-analysis-spring-2019)
-* [Introduction to Machine Learning in Python](https://github.com/dlab-berkeley/python-machine-learning)
-* [Introduction to Artificial Neural Networks in Python](https://github.com/dlab-berkeley/ANN-Fundamentals)
-* [Fairness and Bias in Machine Learning](https://github.com/dlab-berkeley/fairML)
+- [Python Geospatial Fundamentals](https://github.com/dlab-berkeley/Geospatial-Data-and-Mapping-in-Python)
+- [Python Web Scraping and APIs](https://github.com/dlab-berkeley/Python-Web-Scraping)
+- [Python Machine Learning](https://github.com/dlab-berkeley/Python-Machine-Learning)
+- [Python Text Analysis](https://github.com/dlab-berkeley/Python-Text-Analysis)
+- [Python Deep Learning](https://github.com/dlab-berkeley/Python-Deep-Learning)
# Contributors
diff --git a/lessons/02_web_scraping.ipynb b/lessons/02_web_scraping.ipynb
index 9518e1d..10e7479 100644
--- a/lessons/02_web_scraping.ipynb
+++ b/lessons/02_web_scraping.ipynb
@@ -10,7 +10,7 @@
"\n",
"### Icons used in this notebook\n",
"🔔 **Question**: A quick question to help you understand what's going on.
\n",
- "🥊 **Challenge**: Interactive excercise. We'll work through these in the workshop!
\n",
+ "🥊 **Challenge**: Interactive exercise. We'll work through these in the workshop!
\n",
"💭 **Reflection**: Helping you think about programming.
\n",
"⚠️ **Warning**: Heads-up about tricky stuff or common mistakes.
\n",
"💡 **Tip**: How to do something a bit more efficiently or effectively.
\n",
@@ -23,6 +23,7 @@
]
},
{
+ "attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": [
@@ -32,87 +33,19 @@
"\n",
"When we'd like to access data from the web, we first have to make sure if the website we are interested in offers a Web API. Platforms like Twitter, Reddit, and the New York Times offer APIs. **Check out D-Lab's [Python Web APIs](https://github.com/dlab-berkeley/Python-Web-APIs) workshop if you want to learn how to use APIs.**\n",
"\n",
- "However, there are often cases when a Web API does not exist. In these cases, we may have to resort to web scraping, where we extract the underlying HTML from a web page, and directly obtain the information we want. There are several packages in Python we can use to accomplish these tasks. We'll focus on packages called `requests` and Beautiful Soup.\n",
+ "However, there are often cases when a Web API does not exist. In these cases, we may have to resort to web scraping, where we extract the underlying HTML from a web page, and directly obtain the information we want. There are several packages in Python we can use to accomplish these tasks. We'll focus two packages: Requests and Beautiful Soup.\n",
"\n",
- "Our case study will be scraping information on the state senators of Illinois (available [here](http://www.ilga.gov/senate)), as well as the list of bills each senator has sponsored (available [here](http://www.ilga.gov/senate/SenatorBills.asp?MemberID=1911&GA=98&Primary=True)). Before we get started, peruse these websites to take a look at their structure."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "tags": []
- },
- "outputs": [],
- "source": [
- "# Complete this function\n",
- "def get_bills(url):\n",
- " src = requests.get(url).text\n",
- " soup = BeautifulSoup(src)\n",
- " rows = soup.select('tr')\n",
- " bills = []\n",
- " for row in rows:\n",
- " # YOUR CODE HERE\n",
- " \n",
- " bill = (bill_id, description, chamber, last_action, last_action_date)\n",
- " bills.append(bill)\n",
- " return bills"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "tags": []
- },
- "outputs": [],
- "source": [
- "# Uncomment to test your code\n",
- "# test_url = senate_members[0][3]\n",
- "# get_bills(test_url)[0:5]"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "### Challenge 6: Scrape All Bills\n",
- "\n",
- "Finally, create a dictionary `bills_dict` which maps a district number (the key) onto a list of bills (the value) coming from that district. You can do this by looping over all of the senate members in `members_dict` and calling `get_bills()` for each of their associated bill URLs.\n",
- "\n",
- "**NOTE:** please call the function `time.sleep(1)` for each iteration of the loop, so that we don't destroy the state's web site."
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "tags": []
- },
- "outputs": [],
- "source": [
- "# Challenge 6 solution here\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "tags": []
- },
- "outputs": [],
- "source": [
- "# Uncomment to test\n",
- "# bills_dict[52]"
+ "Our case study will be scraping information on the [state senators of Illinois](http://www.ilga.gov/senate), as well as the [list of bills](http://www.ilga.gov/senate/SenatorBills.asp?MemberID=1911&GA=98&Primary=True) each senator has sponsored. Before we get started, peruse these websites to take a look at their structure."
]
},
{
+ "attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": [
"## Installation\n",
"\n",
- "We will use two main packages: `requests` ([documentation](http://docs.python-requests.org/en/latest/user/quickstart/)) and Beautiful Soup ([documentation](http://www.crummy.com/software/BeautifulSoup/bs4/doc/)). Go ahead and install these packages, if you haven't already:"
+ "We will use two main packages: [Requests](http://docs.python-requests.org/en/latest/user/quickstart/) and [Beautiful Soup](http://www.crummy.com/software/BeautifulSoup/bs4/doc/). Go ahead and install these packages, if you haven't already:"
]
},
{
@@ -121,7 +54,7 @@
"metadata": {},
"outputs": [],
"source": [
- "!pip install requests"
+ "%pip install requests"
]
},
{
@@ -130,7 +63,7 @@
"metadata": {},
"outputs": [],
"source": [
- "!pip install beautifulsoup4"
+ "%pip install beautifulsoup4"
]
},
{
@@ -146,7 +79,7 @@
"metadata": {},
"outputs": [],
"source": [
- "!pip install lxml"
+ "%pip install lxml"
]
},
{
@@ -180,12 +113,13 @@
]
},
{
+ "attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": [
- "### 1. Make a GET Request to Obtain a Page's HTML\n",
+ "## Step 1: Make a GET Request to Obtain a Page's HTML\n",
"\n",
- "We can use the `requests` library to:\n",
+ "We can use the Requests library to:\n",
"\n",
"1. Make a GET request to the page, and\n",
"2. Read in the webpage's HTML code.\n",
@@ -210,10 +144,11 @@
]
},
{
+ "attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": [
- "### 2. Parse the Page with Beautiful Soup\n",
+ "## Step 2: Parse the Page with Beautiful Soup\n",
"\n",
"Now, we use the `BeautifulSoup` function to parse the reponse into an HTML tree. This returns an object (called a **soup object**) which contains all of the HTML in the original document.\n",
"\n",
@@ -240,10 +175,11 @@
]
},
{
+ "attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": [
- "### 3. Search for HTML Elements\n",
+ "## Step 3: Search for HTML Elements\n",
"\n",
"Beautiful Soup has a number of functions to find useful components on a page. Beautiful Soup lets you find elements by their:\n",
"\n",
@@ -309,6 +245,7 @@
]
},
{
+ "attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": [
@@ -316,7 +253,7 @@
"\n",
"What if we wanted to search for HTML tags with certain attributes, such as particular CSS classes? \n",
"\n",
- "We can do this by adding an additional argument to the `find_all`. In the example below, we are finding all the `a` tags, and then filtering those with `class = \"sidemenu\"`."
+ "We can do this by adding an additional argument to the `find_all`. In the example below, we are finding all the `a` tags, and then filtering those with `class_=\"sidemenu\"`."
]
},
{
@@ -369,14 +306,15 @@
"metadata": {},
"outputs": [],
"source": [
- "# Challenge 1 solution here\n"
+ "# YOUR CODE HERE\n"
]
},
{
+ "attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": [
- "### 4 Get Attributes and Text of Elements\n",
+ "## Step 4: Get Attributes and Text of Elements\n",
"\n",
"Once we identify elements, we want the access information in that element. Usually, this means two things:\n",
"\n",
@@ -458,9 +396,7 @@
"metadata": {},
"outputs": [],
"source": [
- "# YOUR CODE HERE\n",
- "\n",
- "\n"
+ "# YOUR CODE HERE\n"
]
},
{
@@ -905,10 +841,10 @@
" name = row_data[0]\n",
" district = int(row_data[3])\n",
" party = row_data[4]\n",
- " \n",
+ "\n",
" # YOUR CODE HERE\n",
" full_path = ''\n",
- " \n",
+ "\n",
" # Store in a tuple\n",
" senator = (name, district, party, full_path)\n",
" # Append to list\n",
@@ -957,7 +893,7 @@
},
"outputs": [],
"source": [
- "# Test your code!\n",
+ "# Test your code\n",
"url = 'http://www.ilga.gov/senate/default.asp?GA=98'\n",
"senate_members = get_members(url)\n",
"len(senate_members)"
@@ -992,8 +928,6 @@
},
"outputs": [],
"source": [
- "# Complete this function\n",
- "\n",
"def get_bills(url):\n",
" src = requests.get(url).text\n",
" soup = BeautifulSoup(src)\n",
@@ -1001,7 +935,11 @@
" bills = []\n",
" for row in rows:\n",
" # YOUR CODE HERE\n",
- " \n",
+ " bill_id =\n",
+ " description =\n",
+ " chamber =\n",
+ " last_action =\n",
+ " last_action_date =\n",
" bill = (bill_id, description, chamber, last_action, last_action_date)\n",
" bills.append(bill)\n",
" return bills"
@@ -1039,9 +977,7 @@
},
"outputs": [],
"source": [
- "# YOUR CODE HERE\n",
- "\n",
- "\n"
+ "# YOUR CODE HERE\n"
]
},
{
@@ -1052,7 +988,7 @@
},
"outputs": [],
"source": [
- "# Uncomment to test\n",
+ "# Uncomment to test your code\n",
"# bills_dict[52]"
]
}
@@ -1060,7 +996,7 @@
"metadata": {
"anaconda-cloud": {},
"kernelspec": {
- "display_name": "Python 3 (ipykernel)",
+ "display_name": "workshops",
"language": "python",
"name": "python3"
},
@@ -1074,7 +1010,12 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.8.13"
+ "version": "3.10.0"
+ },
+ "vscode": {
+ "interpreter": {
+ "hash": "b6f9fe9f4b7182690503d8ecc2bae97b0ee3ebf54e877167ae4d28c119a56988"
+ }
}
},
"nbformat": 4,
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..9c5347e
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,3 @@
+requests >= 2.26
+beautifulsoup4 >= 4.11
+lxml >= 4.9
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies: