Changeset 0941953

Timestamp:

10/23/2020 08:30:46 PM (4 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 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:

a10e20c

Parents:

758f3f6

Message:

Fix test broken test commands in scour, and remove its python2 module since inkscape works with the python3 module.

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

Files:

• general.ent (modified) (2 diffs)
• general/prog/scour.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "22">                   <!-- Always 2 digits -->
+<!ENTITY day          "23">                   <!-- Always 2 digits -->
 <!ENTITY month        "10">                   <!-- Always 2 digits -->
 <!ENTITY year         "2020">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "October 22nd, &year;">
+<!ENTITY releasedate  "October 23rd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

general/prog/scour.xml

@@ -75 +75 @@
       </para>
 
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="python2"/>
-      </para>
-
       <note>
         <para>
-          The only use of Scour in this book is by applications which
-          require Python2.
+          Although the download link works fine with wget, in this case downloading
+          with a browser such as firefox will create scour-038.1.tar.gz.
         </para>
       </note>
@@ -95 +90 @@
       <title>Installation of scour</title>
 
-
-      <note>
-        <para>
-          Both <application>Python 2</application> and
-          <application>Python 3</application> modules can
-          be built and installed without any conflicts.
-        </para>
-      </note>
-
 <!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
-
       <para>
-        To build both <application>Python 2</application> and
-        <application>Python 3</application> modules,
+        To build the <application>Python 3</application> module
         run the following commands:
       </para>
 
-<screen><userinput>python2 setup.py build &amp;&amp;
-python3 setup.py build</userinput></screen>
+<screen><userinput>python3 setup.py build</userinput></screen>
 
       <para>
-        To partially test the results, issue: <command>python2 testcss.py</command>.
+        To partially test the results, issue: <command>python3 test_css.py</command>.
         If you have installed <application>Six</application> you can run the main
-        tests by issuing: <command>python2 testscour.py</command>.
+        tests by issuing: <command>python3 test_scour.py</command>.
       </para>
 
       <para>
-        To install both modules, run the following command as the
+        To install the module, run the following command as the
         <systemitem class="username">root</systemitem> user:
       </para>
 
-<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
-python3 setup.py install --optimize=1</userinput></screen>
+<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
 
     </sect3>

introduction/welcome/changelog.xml

@@ -43 +43 @@
     -->
     <listitem>
+      <para>October 23rd, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - In scour-0.38.1 fix the test invocation, and
+          drop the python2 module since nothing in the book uses it.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>October 22nd, 2020</para>
       <itemizedlist>