Skip to content

Commit 482643a

Browse files
committed
Merge pull request #9665 from mortada/clean_up
DOC: grammar fixes, add conda install to README
2 parents e106df7 + 6d3635d commit 482643a

File tree

7 files changed

+13
-7
lines changed

7 files changed

+13
-7
lines changed

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ looking for a quick way to help out.
1919
...
2020
```
2121

22-
- Include the full version string of pandas and it's dependencies. In recent (>0.12) versions
22+
- Include the full version string of pandas and its dependencies. In recent (>0.12) versions
2323
of pandas you can use a built in function:
2424

2525
```python

README.md

+6
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@ or `pip`:
8787
pip install pandas
8888
```
8989

90+
or `conda`:
91+
92+
```sh
93+
conda install pandas
94+
```
95+
9096
## Dependencies
9197
- [NumPy](http://www.numpy.org): 1.7.0 or higher
9298
- [python-dateutil](http://labix.org/python-dateutil): 1.5 or higher

doc/source/options.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Options and Settings
1515

1616
Overview
1717
--------
18-
pandas has an options system that lets you customize some aspects of it's behaviour,
18+
pandas has an options system that lets you customize some aspects of its behaviour,
1919
display-related options being those the user is most likely to adjust.
2020

2121
Options have a full "dotted-style", case-insensitive name (e.g. ``display.max_rows``),
@@ -291,7 +291,7 @@ display.expand_frame_repr True Whether to print out the full DataFrame
291291
multiple lines, `max_columns` is
292292
still respected, but the output will
293293
wrap-around across multiple "pages"
294-
if it's width exceeds `display.width`.
294+
if its width exceeds `display.width`.
295295
display.float_format None The callable should accept a floating
296296
point number and return a string with
297297
the desired format of the number.

pandas/core/index.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ def f(c):
699699
if v is None or is_integer(v):
700700
return v
701701

702-
# warn if its a convertible float
702+
# warn if it's a convertible float
703703
if v == int(v):
704704
warnings.warn("slice indexers when using iloc should be integers "
705705
"and not floating point",FutureWarning)

pandas/msgpack.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ cdef class Packer(object):
112112
* *encoding* - Convert unicode to bytes with this encoding. (default: 'utf-8')
113113
* *unicode_errors* - Error handler for encoding unicode. (default: 'strict')
114114
* *use_single_float* - Use single precision float type for float. (default: False)
115-
* *autoreset* - Reset buffer after each pack and return it's content as `bytes`. (default: True).
115+
* *autoreset* - Reset buffer after each pack and return its content as `bytes`. (default: True).
116116
If set this to false, use `bytes()` to get content and `.reset()` to clear buffer.
117117
"""
118118
cdef msgpack_packer pk

pandas/tests/test_groupby.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1039,7 +1039,7 @@ def test_transform_select_columns(self):
10391039
def test_transform_exclude_nuisance(self):
10401040

10411041
# this also tests orderings in transform between
1042-
# series/frame to make sure its consistent
1042+
# series/frame to make sure it's consistent
10431043
expected = {}
10441044
grouped = self.df.groupby('A')
10451045
expected['C'] = grouped['C'].transform(np.mean)

pandas/tests/test_indexing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3717,7 +3717,7 @@ def random_text(nobs=100):
37173717
self.assertIsNotNone(df.is_copy)
37183718
df.loc[:,'letters'] = df['letters'].apply(str.lower)
37193719

3720-
# should be ok even though its a copy!
3720+
# should be ok even though it's a copy!
37213721
self.assertIsNone(df.is_copy)
37223722
df['letters'] = df['letters'].apply(str.lower)
37233723
self.assertIsNone(df.is_copy)

0 commit comments

Comments
 (0)