Changeset 6b551e8

Timestamp:

12/17/2018 07:05:10 PM (5 years ago)

Author:

Bruce Dubbs <bdubbs@…>

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:

e2aae21f

Parents:

d04e883

Message:

Clean up python modules.

Remove unneeded funcsigs and beaker.
Remove unneeded python2 builds of markupsafe and mako.

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

Files:

• general/prog/mako.xml (modified) (8 diffs)
• general/prog/markupsafe.xml (modified) (4 diffs)
• general/prog/python-modules.xml (modified) (3 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general/prog/mako.xml

@@ -71 +71 @@
       <bridgehead renderas="sect5">Required</bridgehead>
       <para role="required">
-        <xref linkend="Beaker"/> and
+<!--        <xref linkend="Beaker"/> and -->
         <xref linkend="MarkupSafe"/>
       </para>
@@ -82 +82 @@
     <sect3 role="installation">
       <title>Installation of Mako</title>
-
+<!--
       <note>
         <para>
@@ -90 +90 @@
         </para>
       </note>
-
+-->
 <!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
-
+<!--
       <para>
         To install the <application>Python 2</application> module,
@@ -99 +99 @@
       </para>
 
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
-
+<screen role="root"><userinput>python setup.py install - -optimize=1</userinput></screen>
+-->
       <para>
         To install the <application>Python 3</application> module,
@@ -107 +107 @@
       </para>
 
-<screen role="root"><userinput>sed -i "s:mako-render:&amp;3:g" setup.py &amp;&amp;
-python3 setup.py install --optimize=1</userinput></screen>
-
+<!--sed -i "s:mako-render:&amp;3:g" setup.py &amp;&amp;-->
+<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
     </sect3>
-
+<!--
     <sect3 role="commands">
       <title>Command Explanations</title>
@@ -124 +123 @@
 
     </sect3>
-
+-->
     <sect3 role="content">
       <title>Contents</title>
@@ -135 +134 @@
         <seglistitem>
           <seg>
-            mako-render and/or mako-render3
+            <!--mako-render and/or--> mako-render3
           </seg>
           <seg>
@@ -141 +140 @@
           </seg>
           <seg>
-            /usr/lib/python&python2-majorver;/site-packages/mako,
-            /usr/lib/python&python2-majorver;/site-packages/Mako-&mako-version;-py&python2-majorver;.egg-info and/or
-            /usr/lib/python&python3-majorver;/site-packages/mako,
+<!--            /usr/lib/python&python2-majorver;/site-packages/mako,
+            /usr/lib/python&python2-majorver;/site-packages/Mako-&mako-version;-py&python2-majorver;.egg-info and/or-->
+            /usr/lib/python&python3-majorver;/site-packages/mako and 
             /usr/lib/python&python3-majorver;/site-packages/Mako-&mako-version;-py&python3-majorver;.egg-info
           </seg>

general/prog/markupsafe.xml

@@ -82 +82 @@
     <sect3 role="installation">
       <title>Installation of MarkupSafe</title>
-
+<!--
       <note>
         <para>
@@ -90 +90 @@
         </para>
       </note>
-
+-->
 <!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
-
+<!--
       <para>
         To build the <application>Python 2</application> module,
@@ -106 +106 @@
       </para>
 
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
-
+<screen role="root"><userinput>python setup.py install - -optimize=1</userinput></screen>
+-->
       <para>
         To build the <application>Python 3</application> module,
@@ -141 +141 @@
           </seg>
           <seg>
-            /usr/lib/python&python2-majorver;/site-packages/markupsafe,
-            /usr/lib/python&python2-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;-py&python2-majorver;.egg-info and/or
-            /usr/lib/python&python3-majorver;/site-packages/markupsafe,
+i<!--            /usr/lib/python&python2-majorver;/site-packages/markupsafe,
+            /usr/lib/python&python2-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;-py&python2-majorver;.egg-info and/or-->
+            /usr/lib/python&python3-majorver;/site-packages/markupsafe and 
             /usr/lib/python&python3-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;-py&python3-majorver;.egg-info
           </seg>

general/prog/python-modules.xml

@@ -75 +75 @@
         </para>
       </listitem>
-      <listitem>
+<!--      <listitem>
         <para>
           <xref linkend="funcsigs"/>
@@ -84 +84 @@
           <xref linkend="Beaker"/>
         </para>
-      </listitem>
+      </listitem> -->
       <listitem>
         <para>
@@ -166 +166 @@
     href="funcsigs.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="beaker.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="beaker.xml"/>-->
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

introduction/welcome/changelog.xml

@@ -47 +47 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Clean up python modules. Remove unneeded
+          funcsigs and beaker. Remove unneeded python2 builds of markupsafe
+          and mako.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to xterm-340. Fixes
           <ulink url="&blfs-ticket-root;11456">#11456</ulink>.</para>