Changeset f0190231


Ignore:
Timestamp:
01/12/2019 02:57:16 PM (5 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.4, 9.0, 9.1, bdubbs/svn, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
2593c4a
Parents:
9c9dd94
Message:

Make docutils P3 only and tweak mercurial doc for using docutils
Make P2 recommended for dbus-python, and fix an url

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@20960 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • general/prog/dbus-python.xml

    r9c9dd94 rf0190231  
    7474      </para>
    7575
     76      <bridgehead renderas="sect5">Recommended</bridgehead>
     77      <para role="recommended">
     78        <xref linkend="python2"/> (some applications in the book require
     79        the Python 2 module)
     80      </para>
     81
    7682      <bridgehead renderas="sect5">Optional</bridgehead>
    7783      <para role="optional">
    78         <xref linkend="python2"/> and
    7984        <ulink url="https://pypi.python.org/pypi/tap.py/">tap.py</ulink>
    8085           (required for tests)
    … …  
    8590      <para role="optional">
    8691        <xref linkend="docutils"/> and
    87         <ulink url="http://sphinxsearch.com/downloads/">Sphinx</ulink>
     92        <ulink url="http://www.sphinx-doc.org/en/master/">Sphinx</ulink> with
     93        <ulink url="https://github.com/rtfd/sphinx_rtd_theme">sphinx_rtd_theme</ulink>
    8894      </para>
    8995

  • general/prog/docutils.xml

    r9c9dd94 rf0190231  
    99  <!ENTITY docutils-md5sum        "c53768d63db3873b7d452833553469de">
    1010  <!ENTITY docutils-size          "1.6 MB">
    11   <!ENTITY docutils-buildsize     "12 MB">
     11  <!ENTITY docutils-buildsize     "17 MB">
    1212  <!ENTITY docutils-time          "0.4 SBU">
    1313]>
    … …  
    6969      <bridgehead renderas="sect4">Docutils Dependencies</bridgehead>
    7070
    71       <bridgehead renderas="sect5">Recommended</bridgehead>
    72       <para role="recommended">
     71      <bridgehead renderas="sect5">Optional</bridgehead>
     72      <para role="optional">
    7373        <xref linkend="python2"/>
    7474      </para>
    75 
    76       <note><para>This package can be installed with
    77       <application>Python 3</application>, but some packages require
    78       <application>Python 2</application>.</para></note>
    7975
    8076      <para condition="html" role="usernotes">
    … …  
    8985
    9086      <para>
    91         To build the <application>Python 2</application> applications,
     87        To build the <application>Python 3</application> applications,
    9288        run the following command:
    9389      </para>
    9490
    95 <screen><userinput>python setup.py build</userinput></screen>
     91<screen><userinput>python3 setup.py build</userinput></screen>
    9692
    9793      <para>
    … …  
    10197      </para>
    10298
    103 <screen role="root"><userinput>python setup.py install --optimize=1 &amp;&amp;
     99<screen role="root"><userinput>python3 setup.py install --optimize=1 &amp;&amp;
    104100
    105101for f in /usr/bin/rst*.py; do

  • general/prog/mercurial.xml

    r9c9dd94 rf0190231  
    100100    issue:</para>
    101101
    102 <screen><userinput>make doc</userinput></screen>
     102<screen><userinput>sed -i '/runrst/s/N)/N)3/' doc/Makefile &amp;&amp;
     1032to3-3.7 -w doc/hgmanpage.py            &amp;&amp;
     104make doc</userinput></screen>
    103105
    104106<!-- All tests pass (or are skipped) at version 3.8.2
    … …  
    173175  </sect2>
    174176
     177  <sect2 role="commands">
     178    <title>Command Explanations</title>
     179
     180      <para>
     181        <command>sed -i '/runrst/s/N)/N)3/' doc/Makefile</command>: force use
     182        of <application>Python 3</application> for commands using docutils,
     183        allowing to use the docutils <application>Python 3</application> module.
     184      </para>
     185
     186      <para>
     187        <command>2to3-3.7 -w doc/hgmanpage.py</command>: Since <application>
     188        Python 3</application> is used with docutils, one file needs to be
     189        converted in order to be compatible.
     190      </para>
     191
     192  </sect2>
    175193  <sect2 role="configuration">
    176194    <title>Configuring Mercurial</title>

  • introduction/welcome/changelog.xml

    r9c9dd94 rf0190231  
    4747      <itemizedlist>
    4848        <listitem>
     49          <para>[pierre] - Only build Python 3 module for docutils. Tweak
     50          mercurial doc generation to work with docutils-P3.</para>
     51        </listitem>
     52        <listitem>
     53          <para>[pierre] - Make Python 2 recommended for dbus-python, and fix
     54          an url.</para>
     55        </listitem>
     56        <listitem>
    4957          <para>[pierre] - Update to six-1.12.0. Make Python 2 recommended.
    5058          Fixes <ulink url="&blfs-ticket-root;11428">#11428</ulink>.</para>
Note: See TracChangeset for help on using the changeset viewer.