DOC: More examples comparison with sql #12932

maxu777 · 2016-04-20T13:11:53Z

closes #xxxx
tests added / passed
passes git diff upstream/master | flake8 --diff
whatsnew entry

added the following examples:

Top N rows with offset
Top N rows per group
ROW_NUMBER() OVER(PARTITION BY day ORDER BY total_bill DESC)
UPDATE
DELETE

jreback · 2016-04-20T13:16:21Z

pls don't close original PR's and open new ones, just push to the SAME one.

jreback · 2016-04-20T13:16:49Z

http://pandas.pydata.org/pandas-docs/stable/contributing.html

jreback · 2016-04-20T13:17:22Z

CONTRIBUTING.md

+Contributing to pandas
+======================
+
+Where to start?


this is not part of your PR, pls remove

maxu777 · 2016-04-20T13:31:49Z

sorry, i'm new to GitHub stuff - have to learn how to deal with that

maxu777 · 2016-04-20T13:47:16Z

@jreback, how can i remove it?

jreback · 2016-04-20T13:48:39Z

just rebase on master

git rebase -i origin/master

maxu777 · 2016-04-20T14:20:12Z

i either have this error message:

[pandas_dev] C:\Users\Max\Anaconda3\envs\pandas-maxu777\doc>git rebase -i origin/master

It seems that there is already a rebase-merge directory, and
I wonder if you are in the middle of another rebase. If that is the
case, please try
git rebase (--continue | --abort | --skip)
If that is not the case, please
rm -fr "C:/Users/Max/Anaconda3/envs/pandas-maxu777/.git/rebase-merge"
and run me again. I am stopping in case you still have something
valuable there.

or that:

[pandas_dev] C:\Users\Max\Anaconda3\envs\pandas-maxu777\doc>git commit -m "restored original CONTRIBUTING.md"
interactive rebase in progress; onto 2267bd3
fatal: Could not open file .git/rebase-merge/done for reading: No such file or directory

i'm giving up - unfortunately i don't have that much time to play with git
:(

jreback · 2016-04-20T14:28:31Z

git rebase --abort

then try again

jreback · 2016-04-20T14:29:29Z

http://stackoverflow.com/questions/2047465/how-can-i-delete-a-file-from-git-repo

you can also do (you need to do the abort though)

git rm contributing.MD --cached

maxu777 · 2016-04-20T19:17:22Z

@jreback, i've pushed it now - is it OK now?

jreback · 2016-04-20T21:21:27Z

not sure what you have pushed here, but doesn't look like its updated according to my comments.

maxu777 · 2016-04-22T18:45:12Z

@jreback, is it OK now?

jreback · 2016-04-22T19:16:22Z

CONTRIBUTING.md

@@ -109,9 +109,9 @@ For a python 3 environment:

    conda create -n pandas_dev python=3 --file ci/requirements_dev.txt


this file should be removed, but if you can't i will do on merge

jreback · 2016-04-22T19:16:44Z

any comments from those SQL inclined

jreback · 2016-04-27T00:11:17Z

doc/source/comparison_with_sql.rst

+
+.. ipython:: python
+
+    tips.sort_values(['total_bill'], ascending=False).groupby('sex').head(3)


show these with chained method syntax e.g.

(tips.sort_values(['total_bill'], ascending=False) .groupby('sex') .head(3) )

codecov-io · 2016-04-27T19:49:46Z

Current coverage is 83.91%

Merging #12932 into master will increase coverage by +0.08%

@@           master     #12932   diff @@
========================================
  Files         135        136     +1   
  Lines       49664      49918   +254   
  Methods         0          0          
  Branches        0          0          
========================================
+ Hits        41610      41885   +275   
+ Misses       8054       8033    -21   
  Partials        0          0

5 files in pandas/tseries were modified. more
- Misses +9
- Hits +108
2 files in pandas/tools were modified. more
- Misses +1
- Hits +50
3 files in pandas/core were modified. more
- Misses -2
- Hits +2
3 files in pandas were modified. more
- Misses -2
- Hits +7
File .../core/categorical.py (not in diff) was modified. more
- Misses -1
- Partials 0
- Hits +1

Powered by Codecov. Last updated by d49cb5a

TomAugspurger · 2016-04-28T12:05:46Z

+1 on the SQL docs.

jreback · 2016-04-28T13:18:55Z

doc/source/comparison_with_sql.rst

+    tips.loc[tips['rn'] < 3].sort_values(['day','rn'])
+
+the same using `rank(method='first')` function
+


(tips.assign(rn=tips.sort_values(['total_bill'], ascending=False) .groupby(['day']) .cumcount() + 1) .query('rn < 3') )

…corresponding Pandas expression

maxu777 · 2016-04-28T16:17:41Z

@jreback, thanks for the hint: assign().query() - i wasn't aware of assign() function

jreback · 2016-04-28T17:29:42Z

thanks!

FYI, I think somehow the CONTRIBUTING.md file got moved to .github/CONTRIBUTING.md; that's why it showed up. I removed that change.

maxu777 added 2 commits April 20, 2016 13:13

Added more examples to comparison_with_sql documentation

e6fea8f

Added more examples to comparison_with_sql documentation

e796b85

jreback added Docs IO SQL to_sql, read_sql, read_sql_query labels Apr 20, 2016

jreback reviewed Apr 20, 2016
View reviewed changes

CONTRIBUTING.md

Contributing to pandas

======================

Where to start?

Copy link

Contributor

jreback Apr 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is not part of your PR, pls remove

maxu777 added 2 commits April 20, 2016 20:15

cosmetic

b42a7a2

removed .github/CONTRIBUTING.md

8dd8724

maxu777 changed the title ~~More examples comparison with sql~~ DOC: More examples comparison with sql Apr 20, 2016

updated according to Jeff's comments

b32738b

maxu777 force-pushed the more_examples__comparison_with_sql branch from 780ded2 to b32738b Compare April 20, 2016 22:16

jreback reviewed Apr 22, 2016
View reviewed changes

jreback added this to the 0.18.1 milestone Apr 22, 2016

jreback reviewed Apr 27, 2016
View reviewed changes

cosmetic changes in code

56d0494

added missing ')'

f64b0e6

fixed bugs

6a4522c

jreback reviewed Apr 28, 2016
View reviewed changes

using assign() + query() functions, changed SQL query for RANK() and …

e554cd7

…corresponding Pandas expression

jreback closed this in a614788 Apr 28, 2016

		@@ -109,9 +109,9 @@ For a python 3 environment:

		conda create -n pandas_dev python=3 --file ci/requirements_dev.txt


		.. ipython:: python

		tips.sort_values(['total_bill'], ascending=False).groupby('sex').head(3)

		tips.loc[tips['rn'] < 3].sort_values(['day','rn'])

		the same using `rank(method='first')` function

Uh oh!

DOC: More examples comparison with sql #12932

DOC: More examples comparison with sql #12932

Uh oh!

Conversation

maxu777 commented Apr 20, 2016

Uh oh!

jreback commented Apr 20, 2016

Uh oh!

jreback commented Apr 20, 2016

Uh oh!

jreback Apr 20, 2016

Choose a reason for hiding this comment

Uh oh!

maxu777 commented Apr 20, 2016

Uh oh!

maxu777 commented Apr 20, 2016

Uh oh!

jreback commented Apr 20, 2016

Uh oh!

maxu777 commented Apr 20, 2016

Uh oh!

jreback commented Apr 20, 2016

Uh oh!

jreback commented Apr 20, 2016

Uh oh!

maxu777 commented Apr 20, 2016

Uh oh!

jreback commented Apr 20, 2016

Uh oh!

maxu777 commented Apr 22, 2016

Uh oh!

jreback Apr 22, 2016

Choose a reason for hiding this comment

Uh oh!

jreback commented Apr 22, 2016

Uh oh!

jreback Apr 27, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov-io commented Apr 27, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Current coverage is 83.91%

Uh oh!

TomAugspurger commented Apr 28, 2016

Uh oh!

jreback Apr 28, 2016

Choose a reason for hiding this comment

Uh oh!

maxu777 commented Apr 28, 2016

Uh oh!

jreback commented Apr 28, 2016

Uh oh!

Uh oh!

jreback Apr 27, 2016 •

edited

Loading

codecov-io commented Apr 27, 2016 •

edited

Loading