Merge commit 'tags/v0.13.0' into AHLMSS

Conflicts:
	pandas/tseries/tests/test_timezones.py

Author: Andrew Burrows

.gitignore

@@ -38,3 +38,4 @@ pandas/io/*.json
 .pydevproject
 .settings
 .idea
+*.pdb

.travis.yml

@@ -48,3 +48,4 @@ script:
 
 after_script:
   - ci/print_versions.py
+  - ci/print_skipped.py /tmp/nosetests.xml

CONTRIBUTING.md

@@ -4,41 +4,38 @@ All contributions, bug reports, bug fixes, documentation improvements,
 enhancements and ideas are welcome.
 
 The [GitHub "issues" tab](https://github.com/pydata/pandas/issues)
-contains some issues labeled "Good as first PR"; these are
-tasks which do not require deep knowledge of the package. Look those up if you're
+contains some issues labeled "Good as first PR"; Look those up if you're
 looking for a quick way to help out.
 
-Please try and follow these guidelines, as this makes it easier for us to accept
-your contribution or address the issue you're having.
-
 #### Bug Reports
 
   - Please include a short, self-contained Python snippet reproducing the problem.
   You can have the code formatted nicely by using [GitHub Flavored Markdown](http://github.github.com/github-flavored-markdown/) :
 
         ```python
-    
+
         print("I ♥ pandas!")
 
         ```
 
-  - A [test case](https://github.com/pydata/pandas/tree/master/pandas/tests) may be more helpful.
-  - Specify the pandas (and NumPy) version used. (check `pandas.__version__`
-    and `numpy.__version__`)
-  - Explain what the expected behavior was, and what you saw instead.
-  - If the issue seems to involve some of [pandas' dependencies](https://github.com/pydata/pandas#dependencies)
-    such as
-    [NumPy](http://numpy.org),
-    [matplotlib](http://matplotlib.org/), and
-    [PyTables](http://www.pytables.org/)
-    you should include (the relevant parts of) the output of
+  - Specify the pandas version used and those of it's dependencies. You can simply include   the output of
     [`ci/print_versions.py`](https://github.com/pydata/pandas/blob/master/ci/print_versions.py).
+  - Explain what the expected behavior was, and what you saw instead.
 
 #### Pull Requests
 
-  - **Make sure the test suite passes** for both python2 and python3.
-    You can use `test_fast.sh`, **tox** locally, and/or enable **Travis-CI** on your fork.
-    See "Getting Travis-CI going" below.
+  - **Make sure the test suite passes** on your box, Use the provided `test_*.sh` scripts or tox.
+  - Use [proper commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html):
+    - a subject line with `< 80` chars.
+    - One blank line.
+    - Optionally, a commit message body.
+  - Please reference relevant Github issues in your commit message using `GH1234`
+    or `#1234`. Either style is fine but the '#' style generates nose when your rebase your PR.
+  - `doc/source/release.rst` and `doc/source/vx.y.z.txt` contain an ongoing
+    changelog for each release. Add entries to these files
+    as needed in a separate commit in your PR: document the fix, enhancement,
+    or (unavoidable) breaking change.
+  - Keep style fixes to a separate commit to make your PR more readable.
   - An informal commit message format is in effect for the project. Please try
     and adhere to it. Check `git log` for examples. Here are some common prefixes
     along with general guidelines for when to use them:
@@ -49,119 +46,31 @@ your contribution or address the issue you're having.
       - **BLD**: Updates to the build process/scripts
       - **PERF**: Performance improvement
       - **CLN**: Code cleanup
-  - Commit messages should have:
-    - a subject line with `< 80` chars
-    - one blank line
-    - a commit message body, if there's a need for one
-  - If you are changing any code, you should enable Travis-CI on your fork
-    to make it easier for the team to see that the PR does indeed pass all the tests.
-  - **Backward-compatibility really matters**. Pandas already has a large user base and
-    a lot of existing user code.
-    - Don't break old code if you can avoid it.
-    - If there is a need, explain it in the PR.
-    - Changes to method signatures should be made in a way which doesn't break existing
-      code. For example, you should beware of changes to ordering and naming of keyword
-      arguments.
+  - Maintain backward-compatibility. Pandas has lots of users with lots of existing code. Don't break it.
+    - If you think breakage is required clearly state why as part of the PR.
+    - Be careful when changing method signatures.
     - Add deprecation warnings where needed.
-  - Performance matters. You can use the included `test_perf.sh`
-    script to make sure your PR does not introduce any new performance regressions
-    in the library.
+  - Performance matters. Make sure your PR hasn't introduced perf regressions by using `test_perf.sh`.
   - Docstrings follow the [numpydoc](https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt) format.
-  - **Don't** merge upstream into a branch you're going to submit as a PR.
-    This can create all sorts of problems. Use `git rebase` instead. This ensures
-    no merge conflicts occur when your code is merged by the core team.
-  - Please reference the GH issue number in your commit message using `GH1234`
-    or `#1234`. Either style is fine.
-  - Use `raise AssertionError` rather then plain `assert` in library code (`assert` is fine
-    for test code). `python -o` strips assertions. Better safe than sorry.
-  - When writing tests, don't use "new" assertion methods added to the `unittest` module
-    in 2.7 since pandas currently supports 2.6. The most common pitfall is:
-
-        with self.assertRaises(ValueError):
-            foo
-
-
-    which fails with Python 2.6. You need to use `assertRaises` from
-    `pandas.util.testing` instead (or use `self.assertRaises(TheException,func,args)`).
-
-  - `doc/source/release.rst` and `doc/source/vx.y.z.txt` contain an ongoing
-    changelog for each release. Add entries to these files
-    as needed in a separate commit in your PR: document the fix, enhancement,
-    or (unavoidable) breaking change.
-  - For extra brownie points, use `git rebase -i` to squash and reorder
-    commits in your PR so that the history makes the most sense. Use your own
-    judgment to decide what history needs to be preserved.
-  - Pandas source code should not -- with some exceptions, such as 3rd party licensed code --
-    generally speaking, include an "Authors" list or attribution to individuals in source code.
-    `RELEASE.rst` details changes and enhancements to the code over time.
-    A "thanks goes to @JohnSmith." as part of the appropriate entry is a suitable way to acknowledge
-    contributions. The rest is `git blame`/`git log`.
-    Feel free to ask the commiter who merges your code to include such an entry
-    or include it directly yourself as part of the PR if you'd like to.
-    **We're always glad to have new contributors join us from the ever-growing pandas community.**
-    You may also be interested in the copyright policy as detailed in the pandas [LICENSE](https://github.com/pydata/pandas/blob/master/LICENSE).
+  - When writing tests, use 2.6 compatible `self.assertFoo` methods. Some polyfills such as `assertRaises`
+    can be found in `pandas.util.testing`.
+  - Generally, pandas source files should not contain attributions. You can include a "thanks to..."
+    in the release changelog. The rest is `git blame`/`git log`.
+  - When you start working on a PR, start by creating a new branch pointing at the latest
+    commit on github master.
+  - **Do not** merge upstream into a branch you're going to submit as a PR.
+    Use `git rebase` against the current github master.
+  - For extra brownie points, you can squash and reorder the commits in your PR using `git rebase -i`.
+    Use your own judgment to decide what history needs to be preserved. If git frightens you, that's OK too.
+  - Use `raise AssertionError` over `assert` unless you want the assertion stripped by `python -o`.
+  - The pandas copyright policy is detailed in the pandas [LICENSE](https://github.com/pydata/pandas/blob/master/LICENSE).
   - On the subject of [PEP8](http://www.python.org/dev/peps/pep-0008/): yes.
-  - On the subject of massive PEP8 fix PRs touching everything, please consider the following:
-    - They create noisy merge conflicts for people working in their own fork.
-    - They make `git blame` less effective.
-    - Different tools / people achieve PEP8 in different styles. This can create
-      "style wars" and churn that produces little real benefit.
-    - If your code changes are intermixed with style fixes, they are harder to review
-      before merging. Keep style fixes in separate commits.
-    - It's fine to clean-up a little around an area you just worked on.
-    - Generally it's a BAD idea to PEP8 on documentation.
-
-    Having said that, if you still feel a PEP8 storm is in order, go for it.
+  - On the subject of a massive PEP8-storm touching everything: not too often (once per release works).
 
 ### Notes on plotting function conventions
 
 https://groups.google.com/forum/#!topic/pystatsmodels/biNlCvJPNNY/discussion
 
-### Getting Travis-CI going
-
-Instructions for getting Travis-CI installed are available [here](http://about.travis-ci.org/docs/user/getting-started/).
-For those users who are new to Travis-CI and [continuous integration](https://en.wikipedia.org/wiki/Continuous_integration) in particular,
-Here's a few high-level notes:
-- Travis-CI is a free service (with premium account upgrades available) that integrates
-  well with GitHub.
-- Enabling Travis-CI on your GitHub fork of a project will cause any *new* commit
-  pushed to the repo to trigger a full build+test on Travis-CI's servers.
-- All the configuration for Travis-CI builds is already specified by `.travis.yml` in the repo.
-  That means all you have to do is enable Travis-CI once, and then just push commits
-  and you'll get full testing across py2/3 with pandas' considerable
-  [test-suite](https://github.com/pydata/pandas/tree/master/pandas/tests).
-- Enabling Travis-CI will attach the test results (red/green) to the Pull-Request
-  page for any PR you submit. For example:
-
-    https://github.com/pydata/pandas/pull/2532,
-
-See the Green "Good to merge!" banner? that's it.
-
-This is especially important for new contributors, as members of the pandas dev team
-like to know that the test suite passes before considering it for merging.
-Even regular contributors who test religiously on their local box (using tox
-for example) often rely on a PR+travis=green to make double sure everything
-works ok on another system, as occasionally, it doesn't.
-
-#### Steps to enable Travis-CI
-
-- Open https://travis-ci.org/
-- Select "Sign in with GitHub" (Top Navbar)
-- Select \[your username\] -> "Accounts" (Top Navbar)
-- Select 'Sync now' to refresh the list of repos from your GH account.
-- Flip the switch for the repos you want Travis-CI enabled for.
-  "pandas", obviously.
-- Then, pushing a *new* commit to a certain branch on that repo
-  will trigger a build/test for that branch. For example, the branch
-  might be `master` or `PR1234_fix_everything__atomically`, if that's the
-  name of your PR branch.
-
-You can see the build history and current builds for your fork
-at: https://travis-ci.org/(your_GH_username)/pandas.
-
-For example, the builds for the main pandas repo can be seen at:
-https://travis-ci.org/pydata/pandas.
-
 ####More developer docs
 
 * See the [developers](http://pandas.pydata.org/developers.html) page on the

MANIFEST.in

@@ -2,9 +2,7 @@ include MANIFEST.in
 include LICENSE
 include RELEASE.md
 include README.rst
-include TODO.rst
 include setup.py
-include setupegg.py
 
 graft doc
 prune doc/build

ci/install.sh

@@ -55,9 +55,6 @@ if [ -n "$LOCALE_OVERRIDE" ]; then
     time sudo locale-gen "$LOCALE_OVERRIDE"
 fi
 
-# show-skipped is working at this particular commit
-show_skipped_commit=fa4ff84e53c09247753a155b428c1bf2c69cb6c3
-time pip install git+git://github.com/cpcloud/nose-show-skipped.git@$show_skipped_commit
 time pip install $PIP_ARGS -r ci/requirements-${wheel_box}.txt
 
 # we need these for numpy

ci/print_skipped.py

@@ -0,0 +1,51 @@
+#!/usr/bin/env python
+
+import sys
+import math
+import xml.etree.ElementTree as et
+
+
+def parse_results(filename):
+    tree = et.parse(filename)
+    root = tree.getroot()
+    skipped = []
+
+    current_class = old_class = ''
+    i = 1
+    assert i - 1 == len(skipped)
+    for el in root.findall('testcase'):
+        cn = el.attrib['classname']
+        for sk in el.findall('skipped'):
+            old_class = current_class
+            current_class = cn
+            name = '{classname}.{name}'.format(classname=current_class,
+                                               name=el.attrib['name'])
+            msg = sk.attrib['message']
+            out = ''
+            if old_class != current_class:
+                ndigits = int(math.log(i, 10) + 1)
+                out += ('-' * (len(name + msg) + 4 + ndigits) + '\n') # 4 for : + space + # + space
+            out += '#{i} {name}: {msg}'.format(i=i, name=name, msg=msg)
+            skipped.append(out)
+            i += 1
+            assert i - 1 == len(skipped)
+    assert i - 1 == len(skipped)
+    assert len(skipped) == int(root.attrib['skip'])
+    return '\n'.join(skipped)
+
+
+def main(args):
+    print('SKIPPED TESTS:')
+    print(parse_results(args.filename))
+    return 0
+
+
+def parse_args():
+    import argparse
+    parser = argparse.ArgumentParser()
+    parser.add_argument('filename', help='XUnit file to parse')
+    return parser.parse_args()
+
+
+if __name__ == '__main__':
+    sys.exit(main(parse_args()))

ci/print_versions.py

@@ -2,14 +2,14 @@
 
 
 def show_versions():
-    import subprocess
+    import imp
     import os
     fn = __file__
     this_dir = os.path.dirname(fn)
-    pandas_dir = os.path.dirname(this_dir)
-    sv_path = os.path.join(pandas_dir, 'pandas', 'util',
-                            'print_versions.py')
-    return subprocess.check_call(['python', sv_path])
+    pandas_dir = os.path.abspath(os.path.join(this_dir,".."))
+    sv_path = os.path.join(pandas_dir, 'pandas','util')
+    mod = imp.load_module('pvmod', *imp.find_module('print_versions', [sv_path]))
+    return mod.show_versions()
 
 
 if __name__ == '__main__':

ci/requirements-2.6.txt

@@ -4,4 +4,4 @@ python-dateutil==1.5
 pytz==2013b
 http://www.crummy.com/software/BeautifulSoup/bs4/download/4.2/beautifulsoup4-4.2.0.tar.gz
 html5lib==1.0b2
-bigquery==2.0.15
+bigquery==2.0.17

ci/requirements-2.7.txt

@@ -1,14 +1,14 @@
 python-dateutil==2.1
 pytz==2013b
 xlwt==0.7.5
-numpy==1.7.1
+numpy==1.8.0
 cython==0.19.1
 bottleneck==0.6.0
 numexpr==2.1
 tables==2.3.1
 matplotlib==1.1.1
 openpyxl==1.6.2
-xlsxwriter==0.4.3
+xlsxwriter==0.4.6
 xlrd==0.9.2
 patsy==0.1.0
 html5lib==1.0b2
@@ -18,4 +18,4 @@ MySQL-python==1.2.4
 scipy==0.10.0
 beautifulsoup4==4.2.1
 statsmodels==0.5.0
-bigquery==2.0.15
+bigquery==2.0.17

ci/requirements-2.7_LOCALE.txt

@@ -2,7 +2,7 @@ python-dateutil
 pytz==2013b
 xlwt==0.7.5
 openpyxl==1.6.2
-xlsxwriter==0.4.3
+xlsxwriter==0.4.6
 xlrd==0.9.2
 numpy==1.6.1
 cython==0.19.1
@@ -16,4 +16,4 @@ lxml==3.2.1
 scipy==0.10.0
 beautifulsoup4==4.2.1
 statsmodels==0.5.0
-bigquery==2.0.15
+bigquery==2.0.17

ci/requirements-3.2.txt

@@ -1,9 +1,9 @@
 python-dateutil==2.1
 pytz==2013b
 openpyxl==1.6.2
-xlsxwriter==0.4.3
+xlsxwriter==0.4.6
 xlrd==0.9.2
-numpy==1.6.2
+numpy==1.7.1
 cython==0.19.1
 numexpr==2.1
 tables==3.0.0

ci/requirements-3.3.txt

@@ -1,10 +1,10 @@
-python-dateutil==2.1
+python-dateutil==2.2
 pytz==2013b
 openpyxl==1.6.2
-xlsxwriter==0.4.3
+xlsxwriter==0.4.6
 xlrd==0.9.2
 html5lib==1.0b2
-numpy==1.7.1
+numpy==1.8.0
 cython==0.19.1
 numexpr==2.1
 tables==3.0.0

ci/script.sh

@@ -9,5 +9,5 @@ if [ -n "$LOCALE_OVERRIDE" ]; then
     python -c "$pycmd"
 fi
 
-echo nosetests --exe -w /tmp -A "$NOSE_ARGS" pandas --show-skipped
-nosetests --exe -w /tmp -A "$NOSE_ARGS" pandas --show-skipped
+echo nosetests --exe -w /tmp -A "$NOSE_ARGS" pandas --with-xunit --xunit-file=/tmp/nosetests.xml
+nosetests --exe -w /tmp -A "$NOSE_ARGS" pandas --with-xunit --xunit-file=/tmp/nosetests.xml

doc/make.py

@@ -72,7 +72,12 @@ def upload_prev(ver, doc_root='./'):
     if os.system(pdf_cmd):
         raise SystemExit('Upload PDF to %s from %s failed' % (ver, doc_root))
 
-
+def build_pandas():
+        os.chdir('..')
+        os.system('python setup.py clean')
+        os.system('python setup.py build_ext --inplace')
+        os.chdir('doc')
+        
 def build_prev(ver):
     if os.system('git checkout v%s' % ver) != 1:
         os.chdir('..')
@@ -238,6 +243,7 @@ def _get_config():
     'clean': clean,
     'auto_dev': auto_dev_build,
     'auto_debug': lambda: auto_dev_build(True),
+    'build_pandas': build_pandas,
     'all': all,
 }