Update scour instructions

general/prog/scour.xml

@@ -22,7 +22,7 @@
     </indexterm>
 
     <sect3 role="package">
-      <title>Introduction to Scour</title>
+      <title>Introduction to Scour Module</title>
 
       <para>
         <application>Scour</application> is an SVG (Scalable Vector Graphics)
@@ -70,17 +70,9 @@
 
       <bridgehead renderas="sect5">Required</bridgehead>
       <para role="required">
-        <xref linkend="six"/> (will be automatically downloaded and installed
-        if not already present)
+        <xref linkend="six"/> 
       </para>
-<!--
-      <note>
-        <para>
-          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>
--->
+
       <para condition="html" role="usernotes">
         User Notes: <ulink url="&blfs-wiki;/scour"/>
       </para>
@@ -89,29 +81,28 @@
     <sect3 role="installation">
       <title>Installation of scour</title>
 
-<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
-      <para>
-        To build the <application>Python 3</application> module
-        run the following commands:
-      </para>
+      <para>When building, the procedure thinks that that the current version of
+      <xref linkend="six"/> is less than six-1.9.  Fix that with:</para>
 
-<screen><userinput>python3 setup.py build</userinput></screen>
+<screen><userinput>sed -i '/requires/s/9/10/' setup.py</userinput></screen>
 
       <para>
-        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>python3 test_scour.py</command>.
+        Build the module:
       </para>
 
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+
       <para>
-        To install the module, run the following command as the
-        <systemitem class="username">root</systemitem> user:
+        To install the module, run the following command as the &root; user:
       </para>
 
-<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir scour</userinput></screen>
 
     </sect3>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/pip3-cmd-explain.xml"/>
+
     <sect3 role="content">
       <title>Contents</title>
 
@@ -128,7 +119,8 @@
             None
           </seg>
           <seg>
-            None
+            /usr/lib/python3.10/site-packages/scour and
+            /usr/lib/python3.10/site-packages/scour-&scour-version;.dist-info
           </seg>
         </seglistitem>
       </segmentedlist>

general/prog/six.xml

@@ -137,9 +137,7 @@ python3 setup.py install - -optimize=1</userinput></screen>
             None
           </seg>
           <seg>
-            None
-<!--            /usr/lib/python&python2-majorver;/site-packages/six-&six-version;-py&python2-majorver;.egg and/or
-            /usr/lib/python&python3-majorver;/site-packages/six-&six-version;-py&python3-majorver;.egg-->
+            /usr/lib/python&python3-majorver;/site-packages/six-&six-version;.dist-info
           </seg>
         </seglistitem>
       </segmentedlist>