diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst index 467d6456d60cd..8af7de688a2ae 100644 --- a/doc/source/contributing.rst +++ b/doc/source/contributing.rst @@ -536,10 +536,10 @@ signatures and add deprecation warnings where needed. .. _contributing.ci: -Testing Thru Continuous Integration +Testing With Continuous Integration ----------------------------------- -The *pandas* testing suite will run automatically on `Travis-CI `__, +The *pandas* test suite will run automatically on `Travis-CI `__, `Appveyor `__, and `Circle CI `__ continuous integration services, once your pull request is submitted. However, if you wish to run the test suite on a branch prior to submitting the pull request, @@ -548,14 +548,14 @@ for `Travis-CI `__, `Appveyor `__ , and `CircleCI `__. A pull-request will be considered for merging when you have an all 'green' build. If any tests are failing, -then you will get a red 'X', where you can click thru to see the individual failed tests. +then you will get a red 'X', where you can click through to see the individual failed tests. This is an example of a green build. .. image:: _static/ci.png .. note:: - Each time you push to *your* fork, a *new* run of the tests will trigger on the CI. Appveyor will auto-cancel + Each time you push to *your* fork, a *new* run of the tests will be triggered on the CI. Appveyor will auto-cancel any non-currently-running tests for that same pull-request. You can enable the auto-cancel feature for `Travis-CI here `__ and for `CircleCI here `__. @@ -623,12 +623,12 @@ testing of many cases in a concise way that enables an easy-to-read syntax. .. note:: - .. code-block:: python + *pandas* existing test structure is *mostly* classed based, meaning that you will typically find tests wrapped in a class, inheriting from ``tm.TestCase``. - *pandas* existing test structure is *mostly* classed based, meaning that you will typically find tests wrapped in a class, inheriting from ``tm.TestCase``. + .. code-block:: python class TestReallyCoolFeature(tm.TestCase): - .... + .... Going forward we are moving to a more *functional* style, please see below. diff --git a/pandas/core/series.py b/pandas/core/series.py index bcd58ea791083..1aaa106d2c68f 100644 --- a/pandas/core/series.py +++ b/pandas/core/series.py @@ -80,7 +80,7 @@ If True, performs operation inplace and returns None.""", unique='np.ndarray', duplicated='Series', optional_by='', - versionadded_to_excel='\n.. versionadded:: 0.20.0\n') + versionadded_to_excel='\n .. versionadded:: 0.20.0\n') def _coerce_method(converter): diff --git a/pandas/io/json/normalize.py b/pandas/io/json/normalize.py index 518e0bc2064e2..401d8d9ead2b8 100644 --- a/pandas/io/json/normalize.py +++ b/pandas/io/json/normalize.py @@ -114,10 +114,10 @@ def json_normalize(data, record_path=None, meta=None, meta_prefix : string, default None errors : {'raise', 'ignore'}, default 'raise' - * ignore : will ignore KeyError if keys listed in meta are not - always present - * raise : will raise KeyError if keys listed in meta are not - always present + * 'ignore' : will ignore KeyError if keys listed in meta are not + always present + * 'raise' : will raise KeyError if keys listed in meta are not + always present .. versionadded:: 0.20.0