Changeset 1937fe0

Timestamp:

04/18/2022 03:45:10 AM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

644d5e0

Parents:

caf32c8 (diff), 5a2aca5 (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:

Automatic merge of trunk into multilib

Files:

• appendices/dependencies.xml (modified) (1 diff)
• chapter01/changelog.xml (modified) (1 diff)
• chapter01/whatsnew.xml (modified) (1 diff)
• chapter03/packages.xml (modified) (1 diff)
• chapter08/chapter08.xml (modified) (1 diff)
• chapter08/python.xml (modified) (1 diff)
• chapter08/wheel.xml (added)
• packages.ent (modified) (1 diff)
• prologue/why.xml (modified) (1 diff)

appendices/dependencies.xml

@@ -3079 +3079 @@
       </segmentedlist>
 
+<!-- Begin Wheel dependency info -->
+  <bridgehead renderas="sect2" id="wheel-dep">wheel</bridgehead>
+
+      <segmentedlist id="wheel-depends">
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+          <seg>Python</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="wheel-rundeps">
+        <segtitle>&runtime;</segtitle>
+        <seglistitem>
+          <seg>Python</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="wheel-testdeps">
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>No test suite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="wheel-before">
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>Jinja2</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="wheel-optdeps">
+        <segtitle>&external;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin XML::Parser dependency info -->
   <bridgehead renderas="sect2" id="xml-parser-dep">XML::Parser</bridgehead>

chapter01/changelog.xml

@@ -45 +45 @@
       <itemizedlist>
         <listitem>
+           <para>[bdubbs] - Add wheel-0.37.1 (Python module).</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2022-04-15</para>
+      <itemizedlist>
+        <listitem>
           <para>[ken] - Patch Xz for a security fix.  Fixes
           <ulink url="&lfs-ticket-root;5047">#5047</ulink>.</para>

chapter01/whatsnew.xml

@@ -282 +282 @@
     <listitem><para></para></listitem>  <!-- satisfy build -->
     <listitem>
+      <para>Wheel-&wheel-version;</para>
+    </listitem>
+    <listitem>
       <para>&xz-upstream-fix-patch;</para>
     </listitem>

chapter03/packages.xml

@@ -795 +795 @@
 
     <varlistentry>
+      <term>Wheel (&wheel-version;) - <token>&wheel-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&wheel-home;"/></para>
+        <para>Download: <ulink url="&wheel-url;"/></para>
+        <para>MD5 sum: <literal>&wheel-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>XML::Parser (&xml-parser-version;) - <token>&xml-parser-size;</token>:</term>
       <listitem>

chapter08/chapter08.xml

@@ -65 +65 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wheel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ninja.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="meson.xml"/>

chapter08/python.xml

@@ -92 +92 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
+
+    <para>In serveral places we use the <command>pip3</command> command to
+    install Python 3 programs and modules for all users as root. This conflicts
+    with the Python developers recommendation to build packages in a virtual
+    environment as a regular user. To this end, a multi-line warning is
+    written when using <command>pip3</command> as the root user.  If desired,
+    supress this warning by running the following command:</para>
+
+<screen><userinput remap="install">sed -e '/def warn_if_run_as_root/a\    return' \
+    -i /usr/lib/python3.10/site-packages/pip/_internal/cli/req_command.py
+</userinput></screen>
+
 
     <para>If desired, install the preformatted documentation:</para>

packages.ent

@@ -741 +741 @@
 <!ENTITY vim-fin-sbu "2.4 SBU">
 
+<!-- From https://files.pythonhosted.org/packages/c0/6c/9f840c2e55b67b90745af06a540964b73589256cb10cc10057c87ac78fc2/wheel-0.37.1.tar.gz -->
+<!ENTITY wheel-version "0.37.1">
+<!ENTITY wheel-size "65 KB">
+<!ENTITY wheel-url "&anduin-sources;/wheel-&wheel-version;.tar.gz">
+<!ENTITY wheel-md5 "f490f1399e5903706cb1d4fbed9ecb28">
+<!ENTITY wheel-home "https://pypi.org/project/wheel/">
+<!ENTITY wheel-fin-du "268 KB">
+<!ENTITY wheel-fin-sbu "less than 0.1 SBU">
+
 <!ENTITY xml-parser-version "2.46">
 <!ENTITY xml-parser-size "249 KB">

prologue/why.xml

@@ -594 +594 @@
 
       <listitem>
+        <para>Wheel</para>
+
+        <para>This package contains a Python module that is the 
+        reference implementation of the Python wheel packaging standard.
+        </para>
+      </listitem>
+
+      <listitem>
         <para>Vim</para>