Skip to content

Commit 1bfe28b

Browse files
committed
Regenerate html
1 parent 69efb64 commit 1bfe28b

File tree

6 files changed

+51
-49
lines changed

6 files changed

+51
-49
lines changed

pandas/guide/_sources/pandas_docstring.rst.txt

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
pandas docstring guide
55
======================
66

7+
.. note::
8+
`Video tutorial: Pandas docstring guide
9+
<https://www.youtube.com/watch?v=EOA0lUeW4NI>`_ by Frank Akogun.
10+
711
About docstrings and standards
812
------------------------------
913

pandas/guide/_sources/pandas_pr.rst.txt

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
Submitting your changes
55
=======================
66

7+
.. note::
8+
`Video tutorial: Submitting docstring changes to GitHub
9+
<https://www.youtube.com/watch?v=7eC3MjDIxNM>`_ by Frank Akogun.
10+
711
Once you finished the changes to your assigned docstring, you can follow the
812
instructions in this document in order to get your changes merged into pandas,
913
and released in the next version.

pandas/guide/organizers.html

+8-15
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,12 @@
44

55
<html xmlns="http://www.w3.org/1999/xhtml">
66
<head>
7+
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
78
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
89
<title>Information for organizers &#8212; Python documentation</title>
910
<link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
1011
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
11-
<script type="text/javascript">
12-
var DOCUMENTATION_OPTIONS = {
13-
URL_ROOT: './',
14-
VERSION: '',
15-
COLLAPSE_INDEX: false,
16-
FILE_SUFFIX: '.html',
17-
HAS_SOURCE: true,
18-
SOURCELINK_SUFFIX: '.txt'
19-
};
20-
</script>
12+
<script type="text/javascript" src="_static/documentation_options.js"></script>
2113
<script type="text/javascript" src="_static/jquery.js"></script>
2214
<script type="text/javascript" src="_static/underscore.js"></script>
2315
<script type="text/javascript" src="_static/doctools.js"></script>
@@ -29,8 +21,7 @@
2921

3022
<meta name="viewport" content="width=device-width, initial-scale=0.9, maximum-scale=0.9" />
3123

32-
</head>
33-
<body>
24+
</head><body>
3425

3526

3627
<div class="document">
@@ -273,12 +264,14 @@ <h3>This Page</h3>
273264
</div>
274265
<div id="searchbox" style="display: none" role="search">
275266
<h3>Quick search</h3>
267+
<div class="searchformwrapper">
276268
<form class="search" action="search.html" method="get">
277-
<div><input type="text" name="q" /></div>
278-
<div><input type="submit" value="Go" /></div>
269+
<input type="text" name="q" />
270+
<input type="submit" value="Go" />
279271
<input type="hidden" name="check_keywords" value="yes" />
280272
<input type="hidden" name="area" value="default" />
281273
</form>
274+
</div>
282275
</div>
283276
<script type="text/javascript">$('#searchbox').show(0);</script>
284277
</div>
@@ -289,7 +282,7 @@ <h3>Quick search</h3>
289282
&copy;.
290283

291284
|
292-
Powered by <a href="http://sphinx-doc.org/">Sphinx 1.6.6</a>
285+
Powered by <a href="http://sphinx-doc.org/">Sphinx 1.7.1</a>
293286
&amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.10</a>
294287

295288
|

pandas/guide/pandas_docstring.html

+4
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333

3434
<div class="section" id="pandas-docstring-guide">
3535
<span id="docstring"></span><h1>pandas docstring guide<a class="headerlink" href="#pandas-docstring-guide" title="Permalink to this headline"></a></h1>
36+
<div class="admonition note">
37+
<p class="first admonition-title">Note</p>
38+
<p class="last"><a class="reference external" href="https://www.youtube.com/watch?v=EOA0lUeW4NI">Video tutorial: Pandas docstring guide</a> by Frank Akogun.</p>
39+
</div>
3640
<div class="section" id="about-docstrings-and-standards">
3741
<h2>About docstrings and standards<a class="headerlink" href="#about-docstrings-and-standards" title="Permalink to this headline"></a></h2>
3842
<p>A Python docstring is a string used to document a Python module, class,

pandas/guide/pandas_pr.html

+30-33
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,12 @@
44

55
<html xmlns="http://www.w3.org/1999/xhtml">
66
<head>
7+
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
78
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
89
<title>Submitting your changes &#8212; Python documentation</title>
910
<link rel="stylesheet" href="_static/alabaster.css" type="text/css" />
1011
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
11-
<script type="text/javascript">
12-
var DOCUMENTATION_OPTIONS = {
13-
URL_ROOT: './',
14-
VERSION: '',
15-
COLLAPSE_INDEX: false,
16-
FILE_SUFFIX: '.html',
17-
HAS_SOURCE: true,
18-
SOURCELINK_SUFFIX: '.txt'
19-
};
20-
</script>
12+
<script type="text/javascript" src="_static/documentation_options.js"></script>
2113
<script type="text/javascript" src="_static/jquery.js"></script>
2214
<script type="text/javascript" src="_static/underscore.js"></script>
2315
<script type="text/javascript" src="_static/doctools.js"></script>
@@ -30,8 +22,7 @@
3022

3123
<meta name="viewport" content="width=device-width, initial-scale=0.9, maximum-scale=0.9" />
3224

33-
</head>
34-
<body>
25+
</head><body>
3526

3627

3728
<div class="document">
@@ -41,6 +32,10 @@
4132

4233
<div class="section" id="submitting-your-changes">
4334
<span id="pandas-pr"></span><h1>Submitting your changes<a class="headerlink" href="#submitting-your-changes" title="Permalink to this headline"></a></h1>
35+
<div class="admonition note">
36+
<p class="first admonition-title">Note</p>
37+
<p class="last"><a class="reference external" href="https://www.youtube.com/watch?v=7eC3MjDIxNM">Video tutorial: Submitting docstring changes to GitHub</a> by Frank Akogun.</p>
38+
</div>
4439
<p>Once you finished the changes to your assigned docstring, you can follow the
4540
instructions in this document in order to get your changes merged into pandas,
4641
and released in the next version.</p>
@@ -49,12 +44,12 @@ <h2>1. Validate that your docstring does not have technical errors<a class="head
4944
<p>There is a script in pandas that validates whether a docstring follows the
5045
technical parts of the pandas docstring convention. To run the script,
5146
execute in your terminal:</p>
52-
<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">cd</span> <span class="o">&lt;</span><span class="n">pandas</span><span class="o">-</span><span class="nb">dir</span><span class="o">&gt;</span>
47+
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">cd</span> <span class="o">&lt;</span><span class="n">pandas</span><span class="o">-</span><span class="nb">dir</span><span class="o">&gt;</span>
5348
<span class="n">python</span> <span class="n">scripts</span><span class="o">/</span><span class="n">validate_docstrings</span><span class="o">.</span><span class="n">py</span> <span class="o">&lt;</span><span class="n">your</span><span class="o">-</span><span class="n">function</span><span class="o">-</span><span class="ow">or</span><span class="o">-</span><span class="n">method</span><span class="o">&gt;</span>
5449
</pre></div>
5550
</div>
56-
<p>where <code class="docutils literal"><span class="pre">&lt;your-function-or-method&gt;</span></code> is for example <code class="docutils literal"><span class="pre">pandas.DataFrame.head</span></code>,
57-
<code class="docutils literal"><span class="pre">pandas.Series.tail</span></code> or <code class="docutils literal"><span class="pre">pandas.to_datetime</span></code>.</p>
51+
<p>where <code class="docutils literal notranslate"><span class="pre">&lt;your-function-or-method&gt;</span></code> is for example <code class="docutils literal notranslate"><span class="pre">pandas.DataFrame.head</span></code>,
52+
<code class="docutils literal notranslate"><span class="pre">pandas.Series.tail</span></code> or <code class="docutils literal notranslate"><span class="pre">pandas.to_datetime</span></code>.</p>
5853
<p>The output of the script will show the final docstring. In many cases just a
5954
verbatim copy, but in some cases the docstring is implemented as a template,
6055
and reused by more than one method or function, and this is useful to see
@@ -64,12 +59,12 @@ <h2>1. Validate that your docstring does not have technical errors<a class="head
6459
missing dot at the end of a sentence, a blank line where it should not be, etc.</p>
6560
<p>Finally, the output will also contain errors from running the examples.</p>
6661
<p>With few exceptions, you should fix all the errors before continuing.</p>
67-
<p>If you are changing a docstring in a cython file (with <code class="docutils literal"><span class="pre">.pyx</span></code> extension),
62+
<p>If you are changing a docstring in a cython file (with <code class="docutils literal notranslate"><span class="pre">.pyx</span></code> extension),
6863
you need to rebuild the pandas C extensions to be able to see the resulting
6964
changes in the docstring and to validate the docstring with the command
7065
above.</p>
7166
<p>To recompile pandas, run:</p>
72-
<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">cd</span> <span class="o">&lt;</span><span class="n">pandas</span><span class="o">-</span><span class="nb">dir</span><span class="o">&gt;</span>
67+
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">cd</span> <span class="o">&lt;</span><span class="n">pandas</span><span class="o">-</span><span class="nb">dir</span><span class="o">&gt;</span>
7368
<span class="n">python</span> <span class="n">setup</span><span class="o">.</span><span class="n">py</span> <span class="n">build_ext</span> <span class="o">--</span><span class="n">inplace</span>
7469
</pre></div>
7570
</div>
@@ -82,14 +77,14 @@ <h2>2. Visual validation of the docstring<a class="headerlink" href="#visual-val
8277
them, as well as the visualization of your docstring in the pandas website
8378
you need to generate the html version of the page you worked on.</p>
8479
<p>To build the documentation run:</p>
85-
<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">cd</span> <span class="o">&lt;</span><span class="n">pandas</span><span class="o">-</span><span class="nb">dir</span><span class="o">&gt;/</span><span class="n">doc</span>
80+
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">cd</span> <span class="o">&lt;</span><span class="n">pandas</span><span class="o">-</span><span class="nb">dir</span><span class="o">&gt;/</span><span class="n">doc</span>
8681
<span class="n">python</span> <span class="n">make</span><span class="o">.</span><span class="n">py</span> <span class="n">html</span> <span class="o">--</span><span class="n">single</span> <span class="o">&lt;</span><span class="n">your</span><span class="o">-</span><span class="n">function</span><span class="o">-</span><span class="ow">or</span><span class="o">-</span><span class="n">method</span><span class="o">&gt;</span>
8782
</pre></div>
8883
</div>
89-
<p>where <code class="docutils literal"><span class="pre">&lt;your-function-or-method&gt;</span></code> follows the format described in the previous
84+
<p>where <code class="docutils literal notranslate"><span class="pre">&lt;your-function-or-method&gt;</span></code> follows the format described in the previous
9085
section.</p>
9186
<p>This will generate a file
92-
<code class="docutils literal"><span class="pre">&lt;pandas-dir&gt;/doc/build/html/generated_single/&lt;your-function-or-method&gt;.html</span></code>
87+
<code class="docutils literal notranslate"><span class="pre">&lt;pandas-dir&gt;/doc/build/html/generated_single/&lt;your-function-or-method&gt;.html</span></code>
9388
that can be opened with your web browser.</p>
9489
</div>
9590
<div class="section" id="validate-that-the-docstring-is-clear-to-others">
@@ -104,21 +99,21 @@ <h2>4. Commit your changes<a class="headerlink" href="#commit-your-changes" titl
10499
into git.</p>
105100
<p>Before committing your changes, make sure you are in the branch of the feature
106101
you are going to commit with:</p>
107-
<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">git</span> <span class="n">branch</span>
102+
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">git</span> <span class="n">branch</span>
108103
</pre></div>
109104
</div>
110-
<p>If the current branch is <code class="docutils literal"><span class="pre">master</span></code>, do not commit your changes, as you can get
105+
<p>If the current branch is <code class="docutils literal notranslate"><span class="pre">master</span></code>, do not commit your changes, as you can get
111106
into a situation where you need to undo your history in git, which is not
112107
straightforward.</p>
113108
<p>Then, get the latest upstream changes and commit your changes on top:</p>
114-
<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">git</span> <span class="n">fetch</span> <span class="n">upstream</span>
109+
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">git</span> <span class="n">fetch</span> <span class="n">upstream</span>
115110
<span class="n">git</span> <span class="n">merge</span> <span class="n">upstream</span><span class="o">/</span><span class="n">master</span>
116111
<span class="n">git</span> <span class="n">add</span> <span class="o">&lt;</span><span class="n">modified</span><span class="o">-</span><span class="n">file</span><span class="p">(</span><span class="n">s</span><span class="p">)</span><span class="o">&gt;</span>
117112
<span class="n">git</span> <span class="n">commit</span> <span class="o">-</span><span class="n">m</span> <span class="s2">&quot;&lt;commit-message&gt;&quot;</span>
118113
</pre></div>
119114
</div>
120-
<p>where <code class="docutils literal"><span class="pre">&lt;modified-file(s)&gt;</span></code> is the file where you made your changes (in rare
121-
cases it could be more than one file). And <code class="docutils literal"><span class="pre">&lt;commit-message&gt;</span></code> is a short
115+
<p>where <code class="docutils literal notranslate"><span class="pre">&lt;modified-file(s)&gt;</span></code> is the file where you made your changes (in rare
116+
cases it could be more than one file). And <code class="docutils literal notranslate"><span class="pre">&lt;commit-message&gt;</span></code> is a short
122117
description of your changes, starting by “DOC:” (e.g. “DOC: Improve the
123118
docstring of DataFrame.head()”).</p>
124119
</div>
@@ -128,7 +123,7 @@ <h2>5. Push your changes to pandas<a class="headerlink" href="#push-your-changes
128123
pandas maintainers, so they can add them to the main pandas repository.</p>
129124
<p>The first step is to push your local changes to your own fork, so they are
130125
available online:</p>
131-
<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">git</span> <span class="n">push</span> <span class="o">-</span><span class="n">u</span> <span class="n">origin</span> <span class="o">&lt;</span><span class="n">your</span><span class="o">-</span><span class="n">branch</span><span class="o">-</span><span class="n">name</span><span class="o">&gt;</span>
126+
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">git</span> <span class="n">push</span> <span class="o">-</span><span class="n">u</span> <span class="n">origin</span> <span class="o">&lt;</span><span class="n">your</span><span class="o">-</span><span class="n">branch</span><span class="o">-</span><span class="n">name</span><span class="o">&gt;</span>
132127
</pre></div>
133128
</div>
134129
<p>Then, visit <a class="reference external" href="https://github.com/pandas-dev/pandas">https://github.com/pandas-dev/pandas</a> in your browser, and click
@@ -142,12 +137,12 @@ <h2>5. Push your changes to pandas<a class="headerlink" href="#push-your-changes
142137
we do not need to add/run tests or add a <cite>whatsnew</cite> entry. So you can ignore
143138
these check boxes. Just verify that your changes respect the PEP-8 style by
144139
running the command:</p>
145-
<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">git</span> <span class="n">diff</span> <span class="n">upstream</span><span class="o">/</span><span class="n">master</span> <span class="o">-</span><span class="n">u</span> <span class="o">--</span> <span class="s2">&quot;*.py&quot;</span> <span class="o">|</span> <span class="n">flake8</span> <span class="o">--</span><span class="n">diff</span>
140+
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">git</span> <span class="n">diff</span> <span class="n">upstream</span><span class="o">/</span><span class="n">master</span> <span class="o">-</span><span class="n">u</span> <span class="o">--</span> <span class="s2">&quot;*.py&quot;</span> <span class="o">|</span> <span class="n">flake8</span> <span class="o">--</span><span class="n">diff</span>
146141
</pre></div>
147142
</div>
148143
<p>If you don’t already have flake8 installed, you can install it in the Anaconda
149144
Prompt it via</p>
150-
<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">conda</span> <span class="n">install</span> <span class="n">flake8</span>
145+
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">conda</span> <span class="n">install</span> <span class="n">flake8</span>
151146
</pre></div>
152147
</div>
153148
<p>If the command does not return any warning, mark that checkbox with an X (do
@@ -165,9 +160,9 @@ <h3>Updating a pull request<a class="headerlink" href="#updating-a-pull-request"
165160
contributors.</p>
166161
<p>For comments in your review, you can make new changes in your local branch for
167162
that pull request. And once you addressed all the comments, you can commit them
168-
and push again to your local branch. As you used the parameter <code class="docutils literal"><span class="pre">-u</span></code> to set
163+
and push again to your local branch. As you used the parameter <code class="docutils literal notranslate"><span class="pre">-u</span></code> to set
169164
the upstream branch in your first push, you can simply run:</p>
170-
<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">git</span> <span class="n">push</span>
165+
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">git</span> <span class="n">push</span>
171166
</pre></div>
172167
</div>
173168
<p>from your local branch, and the changes will be pushed to your remote branch.</p>
@@ -227,12 +222,14 @@ <h3>This Page</h3>
227222
</div>
228223
<div id="searchbox" style="display: none" role="search">
229224
<h3>Quick search</h3>
225+
<div class="searchformwrapper">
230226
<form class="search" action="search.html" method="get">
231-
<div><input type="text" name="q" /></div>
232-
<div><input type="submit" value="Go" /></div>
227+
<input type="text" name="q" />
228+
<input type="submit" value="Go" />
233229
<input type="hidden" name="check_keywords" value="yes" />
234230
<input type="hidden" name="area" value="default" />
235231
</form>
232+
</div>
236233
</div>
237234
<script type="text/javascript">$('#searchbox').show(0);</script>
238235
</div>
@@ -243,7 +240,7 @@ <h3>Quick search</h3>
243240
&copy;.
244241

245242
|
246-
Powered by <a href="http://sphinx-doc.org/">Sphinx 1.6.6</a>
243+
Powered by <a href="http://sphinx-doc.org/">Sphinx 1.7.1</a>
247244
&amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.10</a>
248245

249246
|

0 commit comments

Comments
 (0)