CLN: Fix CRLFs in repo + add .gitattributes
State: closed

View this pull request with [`?w=t`](https://github.com/pydata/pandas/pull/3915?w=t) added to the end of the url to see that there are not differences [aside from the .gitattributes files] - this should prevent more commits with CRLF entering the repo.

I think it'd be good to merge this (especially because we can avoid this happening in the future.), though (I think) it'll mess up the history for 10 minutes to pandas and `pandas/core/expressions.py`.

After this, will never need to deal with CRLF again! Yay!


Labels:

Comments:
Looks like it's not a huge deal in re core/expressions - it's all @jreback and looks like only 3 commits total https://github.com/jtratner/pandas/blame/8bde194aef964ff4294271bbf9da587f144ab9bd/pandas/core/expressions.py . More of a loss in 10 minutes to pandas section - https://github.com/pydata/pandas/blame/d1556237eee69aaeee47a4d1014f782413ad2d7f/doc/source/10min.rst

yep that was before changed my git settings to not update line endings
as I edit on windows

@jreback Well, this would prevent this from occurring with anyone else's contributions. 

:+1:  on this because this gets annoying sometimes when a script barfs the oh-so-cryptic `file not found` error and of course there's no way to realize this until git or [text-editor-here] shows u ^M everywher

did u do a doc build?

@cpcloud ? do you mean check if this builds docs okay?

yep sorry didn't mean to be so terse

i can do it if u want

it's no problem...made me install pytables and hdf5 anyways :) took me a
while to realize that pytables is `pip install tables`. Anyways it'll be a
while. Def should revisit the travis doc build.

On Sun, Jun 16, 2013 at 7:56 PM, Phillip Cloud notifications@github.comwrote:

> i can do it if u want
> 
> —
> Reply to this email directly or view it on GitHubhttps://github.com/pydata/pandas/pull/3915#issuecomment-19521496
> .

there's a json error but i'm not sure if that's from here it might be fixed after u rebase. try it and c

well not error but "invalid" sphinx

oh what is the `?w=t` that is kind of cool. where did u find out about that?

FYI I think the doc string is screwed up somehow in read_json which is causing that sphix error
never could format them correctly

@cpcloud I was trying to figure out why I was getting CRLF errors all over the place, so I explored and found that somewhere.

Okay, I need to redo this off of master (going to keep it on the same branch name though). Give me a minute.

Which file is that? I can probably fix it.

On Sun, Jun 16, 2013 at 8:08 PM, jreback notifications@github.com wrote:

> FYI I think the doc string is screwed up somehow in read_json which is
> causing that sphix error
> never could format them correctly
> 
> —
> Reply to this email directly or view it on GitHubhttps://github.com/pydata/pandas/pull/3915#issuecomment-19521636
> .

iirc pandas.io.json

word of caution, the 11.0 release raised issues with pickle files being detected as text
by git autocrlf, should probably flag .pickle as binary in .gitattributes as they are binary
files with large chunks of embedded text.

xref https://github.com/pydata/pandas/issues/3360

problem in json docstring is nested lists, not sure exactly where but if u nest u need to separate each node from its children by a newline

@y-p added that and rebased.

On Sun, Jun 16, 2013 at 9:06 PM, Phillip Cloud notifications@github.comwrote:

> problem in json is nested lists, not sure exactly where but if u nest u
> need to separate each node from its children by a newline
> 
> —
> Reply to this email directly or view it on GitHubhttps://github.com/pydata/pandas/pull/3915#issuecomment-19522456
> .

@cpcloud not going to try to fix this for this commit, given that the issue
isn't caused by this change (right?) Plus, I'm having a difficult time
trying to build the docs and then find that error...

On Sun, Jun 16, 2013 at 9:15 PM, Jeffrey Tratner
jeffrey.tratner@gmail.comwrote:

> @y-p added that and rebased.
> 
> On Sun, Jun 16, 2013 at 9:06 PM, Phillip Cloud notifications@github.comwrote:
> 
> > problem in json is nested lists, not sure exactly where but if u nest u
> > need to separate each node from its children by a newline
> > 
> > —
> > Reply to this email directly or view it on GitHubhttps://github.com/pydata/pandas/pull/3915#issuecomment-19522456
> > .

i fixed it already. was just merged #3930 

@jtratner can u rebase? (just did a doc build and it was fine). will merge after the rebase...

btw i just saw the blames at the top i had no idea about this feature of gh. kind of cool

@cpcloud that's a git feature too (github makes it look nicer though),
checkout `git blame`. I rebased it, let's try merging it :)

On Sun, Jun 16, 2013 at 10:43 PM, Phillip Cloud notifications@github.comwrote:

> btw i just saw the blames at the top i had no idea about this feature of
> gh. kind of cool
> 
> —
> Reply to this email directly or view it on GitHubhttps://github.com/pydata/pandas/pull/3915#issuecomment-19524151
> .

i like git blame but it's a bit ugly. i'm sure there are ways to make it pretty but i don't use it that often...

any objections to merging this?

@jtratner sorry 2 be a pain but what about adding lines in `.gitattributes` for stata, h5, xls(x) (all binary)

so that would be

```
+*.dta binary
+*.xls binary
+*.xlsx binary # this is xml  but god help u if ur looking at the guts of xlsx
+*.h5 binary
```

i think

stata is `.dta`?

Okay, that's done. Not going to squash b/c it's time consuming.