Ignore:
Timestamp:
12/04/2021 08:32:42 AM (2 years ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
qt5new
Children:
104ff4e
Parents:
ce5723af (diff), edd2feb7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' into qt5new

File:
1 edited

Legend:

Unmodified
Added
Removed
  • general/prog/lxml.xml

    rce5723af r1daaab6d  
    77  <!ENTITY lxml-download-http "&pymodules-dl;/l/lxml/lxml-&lxml-version;.tar.gz">
    88  <!ENTITY lxml-download-ftp  " ">
    9   <!ENTITY lxml-md5sum        "017f94473dcec0f9b2e9b03524398fa5">
     9  <!ENTITY lxml-md5sum        "1e5354ce400123658b9e1079508fca52">
    1010  <!ENTITY lxml-size          "3.0 MB">
    11   <!ENTITY lxml-buildsize     "204 MB (add 29 MB for tests)">
    12   <!ENTITY lxml-time          "1.6 SBU (add 0.6 SBU for tests)">
     11  <!ENTITY lxml-buildsize     "77 MB (add 21 MB for tests)">
     12  <!ENTITY lxml-time          "0.9 SBU (add 0.6 SBU for tests)">
    1313]>
    1414
     
    7373        <xref linkend="libxslt"/>
    7474      </para>
    75 
     75<!--
    7676      <bridgehead renderas="sect5">Recommended</bridgehead>
    7777      <para role="recommended">
    7878        <xref linkend="python2"/>
    7979      </para>
    80 
     80-->
    8181      <bridgehead renderas="sect5">Optional (to run more tests)</bridgehead>
    8282      <para role="optional">
     
    9393    <sect3 role="installation">
    9494      <title>Installation of lxml</title>
    95 
     95<!--
    9696      <note>
    9797        <para>
     
    101101        </para>
    102102      </note>
    103 
     103-->
    104104<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
    105105
    106106      <para>
    107         To build both <application>Python 2</application> and
    108         <application>Python 3</application> modules, run:
     107        To build <!--both <application>Python 2</application> and --> the
     108        <application>Python 3</application> module, run:
    109109      </para>
    110110
    111 <screen><userinput>python2 setup.py build &amp;&amp;
    112 python3 setup.py build</userinput></screen>
     111<screen><userinput>python3 setup.py build</userinput></screen>
    113112
    114113     <para>
    115114       If you wish to run the tests, enter:
    116        <command>make PYTHON=python2 test</command> and
    117115       <command>make PYTHON=python3 test</command>.
    118116       This will rebuild the package for inplace use before running the tests.
     117       Several tests (28 of 1933) are known to fail with Python-3.10.
    119118     </para>
    120119
    121120      <para>
    122         To install both modules, issue the following commands as the
     121        To install the module, issue the following command as the
    123122        <systemitem class="username">root</systemitem> user:
    124123      </para>
    125124
    126 <screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
    127 python3 setup.py install --optimize=1</userinput></screen>
     125<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
    128126
    129127    </sect3>
     
    145143          </seg>
    146144          <seg>
    147             /usr/lib/python&python2-majorver;/site-packages/lxml,
     145<!--            /usr/lib/python&python2-majorver;/site-packages/lxml,
    148146            /usr/lib/python&python2-majorver;/site-packages/lxml-&lxml-version;-py&python2-majorver;-linux-$ARCH.egg-info
    149             and/or
     147            and/or -->
    150148            /usr/lib/python&python3-majorver;/site-packages/lxml,
    151149            /usr/lib/python&python3-majorver;/site-packages/lxml-&lxml-version;-py&python3-majorver;-linux-$ARCH.egg-info
Note: See TracChangeset for help on using the changeset viewer.