Author: ken Date: Fri Oct 23 13:30:46 2020 New Revision: 23835 Log: Fix test broken test commands in scour, and remove its python2 module since inkscape works with the python3 module.
Modified: trunk/BOOK/general.ent trunk/BOOK/general/prog/scour.xml trunk/BOOK/introduction/welcome/changelog.xml Modified: trunk/BOOK/general.ent ============================================================================== --- trunk/BOOK/general.ent Thu Oct 22 18:22:34 2020 (r23834) +++ trunk/BOOK/general.ent Fri Oct 23 13:30:46 2020 (r23835) @@ -1,12 +1,12 @@ <!-- $LastChangedBy$ $Date$ --> -<!ENTITY day "22"> <!-- Always 2 digits --> +<!ENTITY day "23"> <!-- Always 2 digits --> <!ENTITY month "10"> <!-- Always 2 digits --> <!ENTITY year "2020"> <!ENTITY copyrightdate "2001-&year;"> <!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 #] --> <!ENTITY lfs-version "development"> <!-- x.y|development --> Modified: trunk/BOOK/general/prog/scour.xml ============================================================================== --- trunk/BOOK/general/prog/scour.xml Thu Oct 22 18:22:34 2020 (r23834) +++ trunk/BOOK/general/prog/scour.xml Fri Oct 23 13:30:46 2020 (r23835) @@ -74,15 +74,10 @@ if not already present) </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> @@ -94,39 +89,26 @@ <sect3 role="installation"> <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 && -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 && -python3 setup.py install --optimize=1</userinput></screen> +<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen> </sect3> Modified: trunk/BOOK/introduction/welcome/changelog.xml ============================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml Thu Oct 22 18:22:34 2020 (r23834) +++ trunk/BOOK/introduction/welcome/changelog.xml Fri Oct 23 13:30:46 2020 (r23835) @@ -42,6 +42,16 @@ </listitem> --> <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> <listitem> -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page