Skip to content

Commit 4411615

Browse files
committed
Update to mention six
1 parent 1ba3be7 commit 4411615

File tree

4 files changed

+24
-16
lines changed

4 files changed

+24
-16
lines changed

1.3.0/users/installing.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,10 @@ <h3>Installing on Windows<a class="headerlink" href="#installing-on-windows" tit
297297
<dt><a class="reference internal" href="../glossary/index.html#term-dateutil"><em class="xref std std-term">dateutil</em></a> 1.1 or later</dt>
298298
<dd>Provides extensions to python datetime handling. If using pip,
299299
easy_install or installing from source, the installer will attempt
300-
to download and install <tt class="xref py py-obj docutils literal"><span class="pre">python_dateutil</span></tt> from PyPI.</dd>
300+
to download and install <tt class="xref py py-obj docutils literal"><span class="pre">python_dateutil</span></tt> from PyPI. Note that
301+
<tt class="xref py py-obj docutils literal"><span class="pre">python_dateutil</span></tt> also depends on <tt class="xref py py-obj docutils literal"><span class="pre">six</span></tt>. <tt class="xref py py-obj docutils literal"><span class="pre">pip</span></tt> and other package
302+
managers should handle installing that secondary dependency
303+
automatically.</dd>
301304
<dt><tt class="xref py py-obj docutils literal"><span class="pre">pyparsing</span></tt></dt>
302305
<dd>Required for matplotlib&#8217;s mathtext math rendering support. If
303306
using pip, easy_install or installing from source, the installer
@@ -373,7 +376,7 @@ <h3>Navigation</h3>
373376
</div>
374377
<div class="footer">
375378
&copy; Copyright 2002 - 2012 John Hunter, Darren Dale, Eric Firing, Michael Droettboom and the matplotlib development team; 2012 - 2013 The matplotlib development team.
376-
Last updated on Jul 31, 2013.
379+
Last updated on Aug 01, 2013.
377380
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2b1.
378381
</div>
379382
</body>

1.3.0/users/whats_new.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -608,11 +608,12 @@ <h4>Housecleaning<a class="headerlink" href="#housecleaning" title="Permalink to
608608
<h4>New setup script<a class="headerlink" href="#new-setup-script" title="Permalink to this headline"></a></h4>
609609
<p>matplotlib 1.3 includes an entirely rewritten setup script. We now
610610
ship fewer dependencies with the tarballs and installers themselves.
611-
Notably, <tt class="xref py py-obj docutils literal"><span class="pre">pytz</span></tt>, <tt class="xref py py-obj docutils literal"><span class="pre">dateutil</span></tt> and <tt class="xref py py-obj docutils literal"><span class="pre">pyparsing</span></tt> are no longer included
612-
with matplotlib. You can either install them manually first, or let
613-
<tt class="xref py py-obj docutils literal"><span class="pre">pip</span></tt> install them as dependencies along with matplotlib. It is now
614-
possible to not include certain subcomponents, such as the unit test
615-
data, in the install. See <tt class="xref py py-obj docutils literal"><span class="pre">setup.cfg.template</span></tt> for more information.</p>
611+
Notably, <tt class="xref py py-obj docutils literal"><span class="pre">pytz</span></tt>, <tt class="xref py py-obj docutils literal"><span class="pre">dateutil</span></tt>, <tt class="xref py py-obj docutils literal"><span class="pre">pyparsing</span></tt> and <tt class="xref py py-obj docutils literal"><span class="pre">six</span></tt> are no longer
612+
included with matplotlib. You can either install them manually first,
613+
or let <tt class="xref py py-obj docutils literal"><span class="pre">pip</span></tt> install them as dependencies along with matplotlib. It
614+
is now possible to not include certain subcomponents, such as the unit
615+
test data, in the install. See <tt class="xref py py-obj docutils literal"><span class="pre">setup.cfg.template</span></tt> for more
616+
information.</p>
616617
</div>
617618
<div class="section" id="xdg-base-directory-support">
618619
<h4>XDG base directory support<a class="headerlink" href="#xdg-base-directory-support" title="Permalink to this headline"></a></h4>
@@ -1459,7 +1460,7 @@ <h3>Navigation</h3>
14591460
</div>
14601461
<div class="footer">
14611462
&copy; Copyright 2002 - 2012 John Hunter, Darren Dale, Eric Firing, Michael Droettboom and the matplotlib development team; 2012 - 2013 The matplotlib development team.
1462-
Last updated on Jul 31, 2013.
1463+
Last updated on Aug 01, 2013.
14631464
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2b1.
14641465
</div>
14651466
</body>

users/installing.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,10 @@ <h3>Installing on Windows<a class="headerlink" href="#installing-on-windows" tit
297297
<dt><a class="reference internal" href="../glossary/index.html#term-dateutil"><em class="xref std std-term">dateutil</em></a> 1.1 or later</dt>
298298
<dd>Provides extensions to python datetime handling. If using pip,
299299
easy_install or installing from source, the installer will attempt
300-
to download and install <tt class="xref py py-obj docutils literal"><span class="pre">python_dateutil</span></tt> from PyPI.</dd>
300+
to download and install <tt class="xref py py-obj docutils literal"><span class="pre">python_dateutil</span></tt> from PyPI. Note that
301+
<tt class="xref py py-obj docutils literal"><span class="pre">python_dateutil</span></tt> also depends on <tt class="xref py py-obj docutils literal"><span class="pre">six</span></tt>. <tt class="xref py py-obj docutils literal"><span class="pre">pip</span></tt> and other package
302+
managers should handle installing that secondary dependency
303+
automatically.</dd>
301304
<dt><tt class="xref py py-obj docutils literal"><span class="pre">pyparsing</span></tt></dt>
302305
<dd>Required for matplotlib&#8217;s mathtext math rendering support. If
303306
using pip, easy_install or installing from source, the installer
@@ -373,7 +376,7 @@ <h3>Navigation</h3>
373376
</div>
374377
<div class="footer">
375378
&copy; Copyright 2002 - 2012 John Hunter, Darren Dale, Eric Firing, Michael Droettboom and the matplotlib development team; 2012 - 2013 The matplotlib development team.
376-
Last updated on Jul 31, 2013.
379+
Last updated on Aug 01, 2013.
377380
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2b1.
378381
</div>
379382
</body>

users/whats_new.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -608,11 +608,12 @@ <h4>Housecleaning<a class="headerlink" href="#housecleaning" title="Permalink to
608608
<h4>New setup script<a class="headerlink" href="#new-setup-script" title="Permalink to this headline"></a></h4>
609609
<p>matplotlib 1.3 includes an entirely rewritten setup script. We now
610610
ship fewer dependencies with the tarballs and installers themselves.
611-
Notably, <tt class="xref py py-obj docutils literal"><span class="pre">pytz</span></tt>, <tt class="xref py py-obj docutils literal"><span class="pre">dateutil</span></tt> and <tt class="xref py py-obj docutils literal"><span class="pre">pyparsing</span></tt> are no longer included
612-
with matplotlib. You can either install them manually first, or let
613-
<tt class="xref py py-obj docutils literal"><span class="pre">pip</span></tt> install them as dependencies along with matplotlib. It is now
614-
possible to not include certain subcomponents, such as the unit test
615-
data, in the install. See <tt class="xref py py-obj docutils literal"><span class="pre">setup.cfg.template</span></tt> for more information.</p>
611+
Notably, <tt class="xref py py-obj docutils literal"><span class="pre">pytz</span></tt>, <tt class="xref py py-obj docutils literal"><span class="pre">dateutil</span></tt>, <tt class="xref py py-obj docutils literal"><span class="pre">pyparsing</span></tt> and <tt class="xref py py-obj docutils literal"><span class="pre">six</span></tt> are no longer
612+
included with matplotlib. You can either install them manually first,
613+
or let <tt class="xref py py-obj docutils literal"><span class="pre">pip</span></tt> install them as dependencies along with matplotlib. It
614+
is now possible to not include certain subcomponents, such as the unit
615+
test data, in the install. See <tt class="xref py py-obj docutils literal"><span class="pre">setup.cfg.template</span></tt> for more
616+
information.</p>
616617
</div>
617618
<div class="section" id="xdg-base-directory-support">
618619
<h4>XDG base directory support<a class="headerlink" href="#xdg-base-directory-support" title="Permalink to this headline"></a></h4>
@@ -1459,7 +1460,7 @@ <h3>Navigation</h3>
14591460
</div>
14601461
<div class="footer">
14611462
&copy; Copyright 2002 - 2012 John Hunter, Darren Dale, Eric Firing, Michael Droettboom and the matplotlib development team; 2012 - 2013 The matplotlib development team.
1462-
Last updated on Jul 31, 2013.
1463+
Last updated on Aug 01, 2013.
14631464
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2b1.
14641465
</div>
14651466
</body>

0 commit comments

Comments
 (0)