Skip to content

Conversation

TomAugspurger
Copy link
Contributor

Also redoes some of the changes that were inadvertently reverted
in #12260.

That PR had two commits, one of which was an older version of
what was eventually merged in
#12162.

The stale commit incorrectly merged was a15248a.
It should have been a3c38fe.

For the most part the changes were just style, but there was a python2
import error, which our tests didn't fail on because I was trying to
catch a jinja ImportError, and instead caught all ImportErrors.

@TomAugspurger TomAugspurger added Testing pandas testing functions or related to the test suite Code Style Code style, linting, code_checks labels Mar 4, 2016
@TomAugspurger TomAugspurger added this to the 0.18.0 milestone Mar 4, 2016
Also redoes some of the changes that were inadvertently revereted
in pandas-dev#12260.

That PR had two commits, one of which was an older version of
what was eventually merged in
pandas-dev#12162.

The stale commit incorrectly merged was a15248a.
It should have been a3c38fe.

For the most part the changes were just style, but there was a python2
import error, which our tests didn't fail on because I was trying to
catch a jinja ImportError, and instead caught all ImportErrors.
@jreback
Copy link
Contributor

jreback commented Mar 5, 2016

@TomAugspurger

I am adding a commit which fixes the 3.4 issue: https://travis-ci.org/jreback/pandas/builds/113805804

issue was a libgfortran change where the meta-data wasn't pulling the right deps: conda/conda#2177

I'll merge on pass.

@jreback
Copy link
Contributor

jreback commented Mar 5, 2016

closed via c387fd8

@jreback jreback closed this Mar 5, 2016
@TomAugspurger TomAugspurger deleted the style-fixups branch November 3, 2016 12:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Style Code style, linting, code_checks Testing pandas testing functions or related to the test suite
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants