Skip to content

Commit b229057

Browse files
committed
Merge pull request pandas-dev#10069 from rockg/docs
DOC: Note on PyTables index issue and additional Contributing refinements
2 parents ea74c00 + 61fae01 commit b229057

File tree

5 files changed

+29
-11
lines changed

5 files changed

+29
-11
lines changed

doc/source/contributing.rst

+22-8
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,10 @@ want to clone your fork to your machine: ::
112112
This creates the directory `pandas-yourname` and connects your repository to
113113
the upstream (main project) *pandas* repository.
114114

115-
You will also need to hook up Travis-CI to your GitHub repository so the suite
116-
is automatically run when a Pull Request is submitted. Instructions are `here
115+
The testing suite will run automatically on Travis-CI once your Pull Request is
116+
submitted. However, if you wish to run the test suite on a branch prior to
117+
submitting the Pull Request, then Travis-CI needs to be hooked up to your
118+
GitHub repository. Instructions are for doing so are `here
117119
<http://about.travis-ci.org/docs/user/getting-started/>`_.
118120

119121
Creating a Branch
@@ -134,6 +136,17 @@ changes in this branch specific to one bug or feature so it is clear
134136
what the branch brings to *pandas*. You can have many shiny-new-features
135137
and switch in between them using the git checkout command.
136138

139+
To update this branch, you need to retrieve the changes from the master branch::
140+
141+
git fetch upstream
142+
git rebase upstream/master
143+
144+
This will replay your commits on top of the lastest pandas git master. If this
145+
leads to merge conflicts, you must resolve these before submitting your Pull
146+
Request. If you have uncommitted changes, you will need to `stash` them prior
147+
to updating. This will effectively store your changes and they can be reapplied
148+
after updating.
149+
137150
.. _contributing.dev_env:
138151

139152
Creating a Development Environment
@@ -338,7 +351,7 @@ dependencies.
338351
Building the documentation
339352
~~~~~~~~~~~~~~~~~~~~~~~~~~
340353

341-
So how do you build the docs? Navigate to your local the folder
354+
So how do you build the docs? Navigate to your local the folder
342355
``pandas/doc/`` directory in the console and run::
343356

344357
python make.py html
@@ -358,8 +371,9 @@ If you want to do a full clean build, do::
358371

359372
Starting with 0.13.1 you can tell ``make.py`` to compile only a single section
360373
of the docs, greatly reducing the turn-around time for checking your changes.
361-
You will be prompted to delete `.rst` files that aren't required, since the
362-
last committed version can always be restored from git.
374+
You will be prompted to delete `.rst` files that aren't required. This is okay
375+
since the prior version can be checked out from git, but make sure to
376+
not commit the file deletions.
363377

364378
::
365379

@@ -417,7 +431,7 @@ deprecation warnings where needed.
417431
Test-driven Development/Writing Code
418432
------------------------------------
419433

420-
*Pandas* is serious about `Test-driven Development (TDD)
434+
*Pandas* is serious about testing and strongly encourages individuals to embrace `Test-driven Development (TDD)
421435
<http://en.wikipedia.org/wiki/Test-driven_development>`_.
422436
This development process "relies on the repetition of a very short development cycle:
423437
first the developer writes an (initially failing) automated test case that defines a desired
@@ -550,8 +564,8 @@ Doing 'git status' again should give something like ::
550564
# modified: /relative/path/to/file-you-added.py
551565
#
552566

553-
Finally, commit your changes to your local repository with an explanatory message. An informal
554-
commit message format is in effect for the project. Please try to adhere to it. Here are
567+
Finally, commit your changes to your local repository with an explanatory message. *Pandas*
568+
uses a convention for commit message prefixes and layout. Here are
555569
some common prefixes along with general guidelines for when to use them:
556570

557571
* ENH: Enhancement, new functionality

doc/source/index.rst.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ See the package overview for more detail about what's in the library.
115115
{%if not single -%}
116116
whatsnew
117117
install
118+
contributing
118119
faq
119120
overview
120121
10min
@@ -149,7 +150,6 @@ See the package overview for more detail about what's in the library.
149150
api
150151
{% endif -%}
151152
{%if not single -%}
152-
contributing
153153
internals
154154
release
155155
{% endif -%}

doc/source/install.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ Optional Dependencies
243243
* `Cython <http://www.cython.org>`__: Only necessary to build development
244244
version. Version 0.19.1 or higher.
245245
* `SciPy <http://www.scipy.org>`__: miscellaneous statistical functions
246-
* `PyTables <http://www.pytables.org>`__: necessary for HDF5-based storage. Version 3.0.0 or higher required.
246+
* `PyTables <http://www.pytables.org>`__: necessary for HDF5-based storage. Version 3.0.0 or higher required, Version 3.2.0 or higher highly recommended.
247247
* `SQLAlchemy <http://www.sqlalchemy.org>`__: for SQL database support. Version 0.8.1 or higher recommended.
248248
* `matplotlib <http://matplotlib.sourceforge.net/>`__: for plotting
249249
* `statsmodels <http://statsmodels.sourceforge.net/>`__

doc/source/io.rst

+4
Original file line numberDiff line numberDiff line change
@@ -2364,6 +2364,10 @@ for some advanced strategies
23642364

23652365
As of version 0.15.0, pandas requires ``PyTables`` >= 3.0.0. Stores written with prior versions of pandas / ``PyTables`` >= 2.3 are fully compatible (this was the previous minimum ``PyTables`` required version).
23662366

2367+
.. warning::
2368+
2369+
There is a ``PyTables`` indexing bug which may appear when querying stores using an index. If you see a subset of results being returned, upgrade to ``PyTables`` >= 3.2. Stores created previously will need to be rewritten using the updated version.
2370+
23672371
.. ipython:: python
23682372
:suppress:
23692373
:okexcept:

doc/source/whatsnew/v0.16.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ Bug Fixes
297297

298298

299299

300-
300+
- Bug in PyTables queries that did not return proper results using the index (:issue:`8265`, :issue:`9676`)
301301

302302

303303

0 commit comments

Comments
 (0)