Skip to content

Commit d9f9413

Browse files
Merge pull request #22 from jonathanrocher/feature/update_2016
Feature: update to SciPy2016 edition
2 parents 39924d4 + d627d3c commit d9f9413

File tree

2 files changed

+35
-28
lines changed

2 files changed

+35
-28
lines changed

LICENSE

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015 Jonathan Rocher
3+
Copyright (c) 2015-2016 Jonathan Rocher
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121
SOFTWARE.
22-

README.rst

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
===============================================================
2-
SciPy2015 tutorial: Analyzing and Manipulating Data with Pandas
2+
SciPy2015 & SciPy2016 tutorial: Analyzing and Manipulating Data with Pandas
33
===============================================================
44

55
This repository contains all the material needed by students registered to the
6-
Pandas tutorial of **SciPy 2015** (http://scipy2015.scipy.org/ehome/115969/289057/?&)
7-
on July Mon July 6th 2015.
6+
Pandas tutorial of **SciPy 2016** (http://scipy2016.scipy.org/)
7+
on July Tuesday July 12th 2016.
88

99
For a smooth experience, you will need to make sure that you install or update
1010
your python distribution and download the tutorial material **before** the day
@@ -23,12 +23,11 @@ or Continuum's Anaconda (http://continuum.io/downloads). That is due to the
2323
number of dependencies it has that we will want to play with during the
2424
tutorial.
2525

26-
**Note for Enthought Canopy users:** To reduce download time, the regular
27-
installer of Canopy doesn't contain some of the packages we will need. After
26+
**Note for Enthought Canopy users:** To reduce download time, the Canopy
27+
installer doesn't contain some of the packages we will need. After
2828
installation, please login inside the application (on the welcome screen). Then
2929
go to the package manager (in the Tools menu) and install any of the packages
30-
below that are not already present. Specifically, statsmodels, lxml,
31-
beautifulSoup4 (note the 4, not just BeautifulSoup!), html5lib are the only
30+
below that are not already present. Specifically, statsmodels, and pytables
3231
ones that may not be present depending on the version of installer you choose.
3332

3433

@@ -49,17 +48,18 @@ If you already have a working distribution, you will need to make sure that you
4948
install or update all needed packages. To be able to run the examples, demoes
5049
and exercises, you must have the following packages installed:
5150
- pandas 0.15+
52-
- numpy 1.8+
51+
- numpy 1.9+
5352
- matplotlib 1.4+
54-
- ipython 2.0+ (for running, experimenting and doing exercises)
55-
- nose (only to test your distribution)
53+
- pytables 3.1.1+
54+
- jupyter 1.0 or ipython 4.0+ (for running, experimenting and doing exercises)
55+
- nose (only to test your python installation)
5656

57-
In certain parts of the class, demoes or exercises, the following packages will
58-
be used occasionally:
59-
- statsmodels 0.6+
57+
In certain parts of the notebook, the following packages will be used
58+
occasionally:
6059
- lxml
6160
- beautifulsoup4 (careful to get BeautifulSoup4, not just BeautifulSoup!)
6261
- html5lib
62+
- statsmodels 0.6+
6363

6464

6565
Testing that you are all set
@@ -99,17 +99,17 @@ for line ending, the option commonly chosen is
9999
* Mac OSX
100100
---------
101101
If you don't already have git available, a good git client for Mac can be
102-
downloaded at http://www.git-scm.com/downloads.
103-
It installs git in /usr/local/git/bin/, so to have it available from any
102+
downloaded at ``http://www.git-scm.com/downloads``.
103+
It installs git in ``/usr/local/git/bin/``, so to have it available from any
104104
terminal, you will want to make sure that location is on your PATH environment
105105
variable.
106106

107107

108108
* Linux
109109
-------
110-
The easiest on Linux is to install git from your distro's package manager (yum
111-
for redhat based distros, apt-get for Ubuntu, ...). For example on Ubuntu, it
112-
should be enough to type::
110+
The easiest on Linux is to install git from your distro's package manager
111+
(``yum`` for redhat based distros, ``apt-get`` for Ubuntu, ...). For example on
112+
Ubuntu, it should be enough to run::
113113

114114
$ sudo apt-get install git
115115

@@ -124,21 +124,29 @@ only make git accessible from there) and type::
124124

125125
git clone https://github.com/jonathanrocher/pandas_tutorial.git
126126

127-
That will create a new folder named SciPy2015_pandas_tutorial/ with all the
128-
content you will need: the slides I will go through (slides.pdf), and a folder
129-
of exercises.
127+
That will create a new folder named ``pandas_tutorial/`` with all the
128+
content you will need, mostly a folder named ``climate_timeseries`` with the
129+
demo notebook that we will follow for the whole tutorial.
130130

131131
As you get closer to the day of the tutorial, it is highly recommended to
132132
update this repository, as I will be improving it this week. To update it, open
133-
a command prompt, move **into** the SciPy2015_pandas_tutorial/ folder and run::
133+
a command prompt, move **into** the ``pandas_tutorial/`` folder and run::
134134

135135
$ git pull
136136

137137

138138

139139
Questions? Problems?
140140
====================
141-
Questions? Problems? Don't wait, shoot me and the rest of the group an email on
142-
the tutorial mailing list: scipy2015-pandas-tutorial@googlegroups.com. You can
143-
view all message and sign up at
144-
https://groups.google.com/forum/#!forum/scipy2015-pandas-tutorial
141+
Questions? Problems? Don't wait! Shoot me and the rest of the group a message
142+
on the tutorial's slack channel::
143+
144+
https://scipy2016.slack.com/messages/pandas/
145+
146+
That requires to create a (free) slack account on
147+
``https://scipy2016.slack.com``, following the instructions in the email you
148+
(should have) received from Jill Cowan on June 29th 2016. Once the account is
149+
created, you will need to click on ``CHANNELS (22)`` in the left banner to find
150+
the pandas channel. If you have issues connecting to slack or finding the
151+
pandas channel, please shoot SciPy and me an email at ``SciPy@enthought.com``
152+
and ``jonathanrocher@gmail.com``.

0 commit comments

Comments
 (0)