Skip to content

DOC: grammar fixes, add conda install to README #9665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 17, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ looking for a quick way to help out.
...
```

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

```python
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ or `pip`:
pip install pandas
```

or `conda`:

```sh
conda install pandas
```

## Dependencies
- [NumPy](http://www.numpy.org): 1.7.0 or higher
- [python-dateutil](http://labix.org/python-dateutil): 1.5 or higher
Expand Down
4 changes: 2 additions & 2 deletions doc/source/options.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Options and Settings

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

Options have a full "dotted-style", case-insensitive name (e.g. ``display.max_rows``),
Expand Down Expand Up @@ -291,7 +291,7 @@ display.expand_frame_repr True Whether to print out the full DataFrame
multiple lines, `max_columns` is
still respected, but the output will
wrap-around across multiple "pages"
if it's width exceeds `display.width`.
if its width exceeds `display.width`.
display.float_format None The callable should accept a floating
point number and return a string with
the desired format of the number.
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/index.py
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,7 @@ def f(c):
if v is None or is_integer(v):
return v

# warn if its a convertible float
# warn if it's a convertible float
if v == int(v):
warnings.warn("slice indexers when using iloc should be integers "
"and not floating point",FutureWarning)
Expand Down
2 changes: 1 addition & 1 deletion pandas/msgpack.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ cdef class Packer(object):
* *encoding* - Convert unicode to bytes with this encoding. (default: 'utf-8')
* *unicode_errors* - Error handler for encoding unicode. (default: 'strict')
* *use_single_float* - Use single precision float type for float. (default: False)
* *autoreset* - Reset buffer after each pack and return it's content as `bytes`. (default: True).
* *autoreset* - Reset buffer after each pack and return its content as `bytes`. (default: True).
If set this to false, use `bytes()` to get content and `.reset()` to clear buffer.
"""
cdef msgpack_packer pk
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/test_groupby.py
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,7 @@ def test_transform_select_columns(self):
def test_transform_exclude_nuisance(self):

# this also tests orderings in transform between
# series/frame to make sure its consistent
# series/frame to make sure it's consistent
expected = {}
grouped = self.df.groupby('A')
expected['C'] = grouped['C'].transform(np.mean)
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/test_indexing.py
Original file line number Diff line number Diff line change
Expand Up @@ -3717,7 +3717,7 @@ def random_text(nobs=100):
self.assertIsNotNone(df.is_copy)
df.loc[:,'letters'] = df['letters'].apply(str.lower)

# should be ok even though its a copy!
# should be ok even though it's a copy!
self.assertIsNone(df.is_copy)
df['letters'] = df['letters'].apply(str.lower)
self.assertIsNone(df.is_copy)
Expand Down