From 2c08412a24eb825421f7347764abc21b96a35707 Mon Sep 17 00:00:00 2001 From: David Lutz Date: Wed, 17 Jan 2018 08:54:01 -0500 Subject: [PATCH 1/2] DOC: add `source activate` for older versions of Anaconda and fix a typo --- doc/source/contributing.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst index cdbbad6eb75d6..6b14f392640c5 100644 --- a/doc/source/contributing.rst +++ b/doc/source/contributing.rst @@ -171,6 +171,8 @@ We'll now kick off a three-step process: # Create and activate the build environment conda env create -f ci/environment-dev.yaml conda activate pandas-dev + # or with older versions of Anaconda: + source activate pandas-dev # Build and install pandas python setup.py build_ext --inplace -j 4 @@ -456,7 +458,7 @@ Here are *some* of the more common ``cpplint`` issues: - we restrict line-length to 80 characters to promote readability - every header file must include a header guard to avoid name collisions if re-included -:ref:`Continuous Integration `. will run the +:ref:`Continuous Integration ` will run the `cpplint `_ tool and report any stylistic errors in your code. Therefore, it is helpful before submitting code to run the check yourself:: From 7c1e95df46d4c27479a165ed2d065c6fc5d2d1af Mon Sep 17 00:00:00 2001 From: David Lutz Date: Fri, 19 Jan 2018 00:13:25 +0000 Subject: [PATCH 2/2] Add a blank line --- doc/source/contributing.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst index 6b14f392640c5..258ab874cafcf 100644 --- a/doc/source/contributing.rst +++ b/doc/source/contributing.rst @@ -171,6 +171,7 @@ We'll now kick off a three-step process: # Create and activate the build environment conda env create -f ci/environment-dev.yaml conda activate pandas-dev + # or with older versions of Anaconda: source activate pandas-dev