Changeset ab3ae35a

Timestamp:

12/12/2022 11:09:06 PM (17 months ago)

Author:

Ken Moffat <ken@…>

Branches:

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, xry111/llvm18, xry111/xf86-video-removal

Children:

3bdc4eb

Parents:

89a8d9a

Message:

python-modules: patch Requests to be able to use system certs.

Files:

• general/prog/python-dependencies.xml (modified) (1 diff)
• general/prog/python-dependencies/pythonhosted.xml (modified) (1 diff)
• general/prog/python-modules/requests.xml (modified) (3 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general/prog/python-dependencies.xml

@@ -74 +74 @@
       <listitem>
         <para>
-          <xref linkend="certifi"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
           <xref linkend="charset-normalizer"/>
         </para>

general/prog/python-dependencies/pythonhosted.xml

@@ -110 +110 @@
     <screen><userinput>cat &gt; pythonhosted-files.md5 &lt;&lt; "EOF"
 <literal>3591827fde96d1dd23970fb05410ed04  alabaster-0.7.12.tar.gz
-ff9c8d5c7e7fb083de6b874609c5ca68  certifi-2022.9.24.tar.gz
 4332ddc7bbee0f344a03915b2ad59a54  snowballstemmer-2.2.0.tar.gz
 b1d2ed6592bbdf6002ef52b4ab8e2efe  pytz-2022.4.tar.gz

general/prog/python-modules/requests.xml

@@ -66 +66 @@
       </itemizedlist>
 
+    <bridgehead renderas="sect3">Recommended Additional Download</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Recommended patch: <ulink
+          url="&patch-root;/requests-&requests-version;-use_system_certs-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
       <bridgehead renderas="sect4">Requests Dependencies</bridgehead>
 
       <bridgehead renderas="sect5">Required</bridgehead>
       <para role="required">
-        <xref linkend="certifi"/>,
         <xref linkend="charset-normalizer"/>,
         <xref linkend="idna"/>, and
         <xref linkend="urllib3"/>
+      </para>
+
+      <bridgehead renderas="sect5">Recommended</bridgehead>
+      <para role="recommended">
+        <xref linkend="make-ca"/>, with
+        <xref linkend="p11-kit"/> (both needed to use system https: certificates,
+        removing an unnecessary dependency on the <application>Certifi</application>
+        module).
       </para>
 
@@ -97 +113 @@
     <sect3 role="installation">
       <title>Installation of Requests</title>
+
+    <para>
+      First apply a patch so that the same environment variable already used to
+      point to system certificates in <application>Python3</application> following
+      the installation of <application>make-ca</application> can also be used by
+      this module:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../requests-&requests-version;-use_system_certs-1.patch</userinput></screen>
 
     <para> Build the module: </para>
@@ -126 +151 @@
 deactivate</userinput></screen>
 
+    <note>
+      <para>
+        See <xref linkend="make-ca"/> for how to set the environment variable,
+        and for how local copies of the Certifi and Requests modules installed
+        in a virtual environment <emphasis>will</emphasis> override the system
+        certificates.
+      </para>
+    </note>
+
     </sect3>
 

introduction/welcome/changelog.xml

@@ -40 +40 @@
     -->
     <listitem>
+      <para>December 12th, 2022</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Patch python module Requests to use the same
+          environment variable as Pip to access system certificates,
+          therefore remove the unneeded dependency of Certifi.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 11th, 2022</para>
       <itemizedlist>