Skip to content

Commit e92a13c

Browse files
committedJun 21, 2018
added license/contrib, fixed typos re issues #7 and #8
1 parent 6c9b6ac commit e92a13c

File tree

4 files changed

+72
-14
lines changed

4 files changed

+72
-14
lines changed
 

‎CONTRIBUTING.md

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Contributing to Learn.co Curriculum
2+
3+
We're really exited that you're about to contribute to the [open curriculum](https://learn.co/content-license) on [Learn.co](https://learn.co). If this is your first time contributing, please continue reading to learn how to make the most meaningful and useful impact possible.
4+
5+
## Raising an Issue to Encourage a Contribution
6+
7+
If you notice a problem with the curriculum that you believe needs improvement
8+
but you're unable to make the change yourself, you should raise a Github issue
9+
containing a clear description of the problem. Include relevant snippets of
10+
the content and/or screenshots if applicable. Curriculum owners regularly review
11+
issue lists and your issue will be prioritized and addressed as appropriate.
12+
13+
## Submitting a Pull Request to Suggest an Improvement
14+
15+
If you see an opportunity for improvement and can make the change yourself go
16+
ahead and use a typical git workflow to make it happen:
17+
18+
* Fork this curriculum repository
19+
* Make the change on your fork, with descriptive commits in the standard format
20+
* Open a Pull Request against this repo
21+
22+
A curriculum owner will review your change and approve or comment on it in due
23+
course.
24+
25+
# Why Contribute?
26+
27+
Curriculum on Learn is publicly and freely available under Learn's
28+
[Educational Content License](https://learn.co/content-license). By
29+
embracing an open-source contribution model, our goal is for the curriculum
30+
on Learn to become, in time, the best educational content the world has
31+
ever seen.
32+
33+
We need help from the community of Learners to maintain and improve the
34+
educational content. Everything from fixing typos, to correcting
35+
out-dated information, to improving exposition, to adding better examples,
36+
to fixing tests—all contributions to making the curriculum more effective are
37+
welcome.

‎LICENSE.md

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Learn.co Educational Content License
2+
3+
Copyright (c) 2018 Flatiron School, Inc
4+
5+
The Flatiron School, Inc. owns this Educational Content. However, the Flatiron
6+
School supports the development and availability of educational materials in
7+
the public domain. Therefore, the Flatiron School grants Users of the Flatiron
8+
Educational Content set forth in this repository certain rights to reuse, build
9+
upon and share such Educational Content subject to the terms of the Educational
10+
Content License set forth [here](http://learn.co/content-license)
11+
(http://learn.co/content-license). You must read carefully the terms and
12+
conditions contained in the Educational Content License as such terms govern
13+
access to and use of the Educational Content.
14+
15+
Flatiron School is willing to allow you access to and use of the Educational
16+
Content only on the condition that you accept all of the terms and conditions
17+
contained in the Educational Content License set forth
18+
[here](http://learn.co/content-license) (http://learn.co/content-license). By
19+
accessing and/or using the Educational Content, you are agreeing to all of the
20+
terms and conditions contained in the Educational Content License. If you do
21+
not agree to any or all of the terms of the Educational Content License, you
22+
are prohibited from accessing, reviewing or using in any way the Educational
23+
Content.

‎README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Going further with dictionaries
2+
# Going further with dictionaries
33

44
### Introduction
55

@@ -23,7 +23,7 @@ Now if we download this spreadsheet in the form of an .xlsx file we can start to
2323

2424
We've already placed that file into this lesson, and you can see it [here](https://github.com/learn-co-curriculum/excel-to-python), where the contents of this lesson are also located.
2525

26-
### From Local File to Python
26+
### From Local File to Python
2727

2828
Now that we have this file in the folder we are working with, we can get this data into Python code in a few lines.
2929

@@ -48,17 +48,17 @@ cities[0]
4848
4949
The code above relies on using an outside library called `pandas`, as it's good at reading excel files. A library is just a set of reusable functions. The `pandas` library is available for free online. We tell our current Jupyter notebook that we are about to use it with the line `import pandas`.
5050

51-
And that gives us an object, like a dictionary, which has a method on it called `read_excel`. Similar so how we can call `{'foo': 'bar'}.keys()`. That's the benefit of a library, we can get methods that do not come out of the box with Python. So we use the `read_excel` data to read our excel file, by providing the name of the file, `cities.xlsx`, and the preceding `./` just indicates that the file is found in the current folder. Finally with the line `travel_df.to_dict('records')` we return a list of our dictionaries representing our data. You can see that when we access the first element of this list, we it returns our first dictionary.
51+
And that gives us an object, like a dictionary, which has a method on it called `read_excel`. Similar so how we can call `{'foo': 'bar'}.keys()`. That's the benefit of a library, we can get methods that do not come out of the box with Python. So we use the `read_excel` data to read our excel file, by providing the name of the file, `cities.xlsx`, and the preceding `./` just indicates that the file is found in the current folder. Finally with the line `travel_df.to_dict('records')` we return a list of our dictionaries representing our data. You can see that when we access the first element of this list, it returns our first dictionary.
5252

5353
Here is the code again, with some comments, if you are interested.
5454

5555

5656
```python
57-
# Here we use a library, which is some code not part of standard Python, to this process easier
57+
# Here we use a library, which is some code not part of standard Python, to make this process easier
5858
import pandas
59-
# If we use the `import pandas` we have access to the pandas library
59+
# If we use the `import pandas` we have access to the pandas library
6060
travel_df = pandas.read_excel('./cities.xlsx')
61-
# We call the pandas.read_excel method and pass through the string './cities.xlsx' as the file is called cities.xlsx. By saying './' we are saying
61+
# We call the pandas.read_excel method and pass through the string './cities.xlsx' as the file is called cities.xlsx. By saying './' we are saying
6262
# go to the current folder, lists-lab, and find the 'cities.xlsx' file there
6363
cities = travel_df.to_dict('records')
6464
```
@@ -199,7 +199,7 @@ Once again, we call the method, and then coerce it into a list, by using the `li
199199

200200
### Creating Dictionaries
201201

202-
So far, we have seen one way of creating dictionaries:
202+
So far, we have seen one way of creating dictionaries:
203203

204204

205205
```python

‎index.ipynb

+5-7
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"source": [
139139
"The code above relies on using an outside library called `pandas`, as it's good at reading excel files. A library is just a set of reusable functions. The `pandas` library is available for free online. We tell our current Jupyter notebook that we are about to use it with the line `import pandas`. \n",
140140
"\n",
141-
"And that gives us an object, like a dictionary, which has a method on it called `read_excel`. Similar so how we can call `{'foo': 'bar'}.keys()`. That's the benefit of a library, we can get methods that do not come out of the box with Python. So we use the `read_excel` data to read our excel file, by providing the name of the file, `cities.xlsx`, and the preceding `./` just indicates that the file is found in the current folder. Finally with the line `travel_df.to_dict('records')` we return a list of our dictionaries representing our data. You can see that when we access the first element of this list, we it returns our first dictionary. "
141+
"And that gives us an object, like a dictionary, which has a method on it called `read_excel`. Similar so how we can call `{'foo': 'bar'}.keys()`. That's the benefit of a library, we can get methods that do not come out of the box with Python. So we use the `read_excel` data to read our excel file, by providing the name of the file, `cities.xlsx`, and the preceding `./` just indicates that the file is found in the current folder. Finally with the line `travel_df.to_dict('records')` we return a list of our dictionaries representing our data. You can see that when we access the first element of this list, it returns our first dictionary. "
142142
]
143143
},
144144
{
@@ -150,13 +150,11 @@
150150
},
151151
{
152152
"cell_type": "code",
153-
"execution_count": 2,
154-
"metadata": {
155-
"collapsed": true
156-
},
153+
"execution_count": 1,
154+
"metadata": {},
157155
"outputs": [],
158156
"source": [
159-
"# Here we use a library, which is some code not part of standard Python, to this process easier \n",
157+
"# Here we use a library, which is some code not part of standard Python, to make this process easier \n",
160158
"import pandas\n",
161159
"# If we use the `import pandas` we have access to the pandas library \n",
162160
"travel_df = pandas.read_excel('./cities.xlsx')\n",
@@ -523,7 +521,7 @@
523521
"name": "python",
524522
"nbconvert_exporter": "python",
525523
"pygments_lexer": "ipython3",
526-
"version": "3.6.5"
524+
"version": "3.6.4"
527525
}
528526
},
529527
"nbformat": 4,

0 commit comments

Comments
 (0)
Please sign in to comment.