about summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2015-11-21 22:16:49 +0100
committerDomen Kožar <domen@dev.si>2015-11-21 22:16:49 +0100
commit2e605199a77af3c094d9ec330dc0c70678113184 (patch)
tree00c55c442e91335146009408cdc77463108fbf4c /doc
parent925300726ddc7471cc400f1ba8561d7560e4f64a (diff)
buildPythonPacakage: update docs
Diffstat (limited to 'doc')
-rw-r--r--doc/language-support.xml41
1 files changed, 15 insertions, 26 deletions
diff --git a/doc/language-support.xml b/doc/language-support.xml
index b4f3276265ade..386db74904158 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -196,12 +196,12 @@ you need it.</para>
 
 <para>
   Currently supported interpreters are <varname>python26</varname>, <varname>python27</varname>,
-  <varname>python32</varname>, <varname>python33</varname>, <varname>python34</varname>
+  <varname>python33</varname>, <varname>python34</varname>, <varname>python35</varname>
   and <varname>pypy</varname>.
 </para>
 
 <para>
-  <varname>python</varname> is an alias of <varname>python27</varname> and <varname>python3</varname> is an alias of <varname>python34</varname>.
+  <varname>python</varname> is an alias to <varname>python27</varname> and <varname>python3</varname> is an alias to <varname>python34</varname>.
 </para>
 
 <para>
@@ -231,7 +231,7 @@ are provided with all modules included.</para>
 </para>
 
 <para>
- All packages depending on any Python interpreter get appended <varname>$out/${python.libPrefix}/site-packages</varname>
+ All packages depending on any Python interpreter get appended <varname>$out/${python.sitePackages}</varname>
  to <literal>$PYTHONPATH</literal> if such directory exists.
 </para>
 
@@ -306,7 +306,7 @@ twisted = buildPythonPackage {
   Most of Python packages that use <varname>buildPythonPackage</varname> are defined
   in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/python-packages.nix"><filename>pkgs/top-level/python-packages.nix</filename></link>
   and generated for each python interpreter separately into attribute sets <varname>python26Packages</varname>,
-  <varname>python27Packages</varname>, <varname>python32Packages</varname>, <varname>python33Packages</varname>,
+  <varname>python27Packages</varname>, <varname>python35Packages</varname>, <varname>python33Packages</varname>,
   <varname>python34Packages</varname> and <varname>pypyPackages</varname>.
   </para>
 
@@ -315,19 +315,13 @@ twisted = buildPythonPackage {
 
     <orderedlist>
       <listitem><para>
-        In the <varname>configurePhase</varname>, it patches
-        <literal>setup.py</literal> to always include setuptools before
-        distutils for monkeypatching machinery to take place.
-      </para></listitem>
-
-      <listitem><para>
         In the <varname>buildPhase</varname>, it calls
-        <literal>${python.interpreter} setup.py build ...</literal>
+        <literal>${python.interpreter} setup.py bdist_wheel</literal> to build a wheel binary zipfile.
       </para></listitem>
 
       <listitem><para>
-        In the <varname>installPhase</varname>, it calls
-        <literal>${python.interpreter} setup.py install ...</literal>
+        In the <varname>installPhase</varname>, it installs the wheel file using
+        <literal>pip install *.whl</literal>.
       </para></listitem>
 
       <listitem><para>
@@ -336,11 +330,15 @@ twisted = buildPythonPackage {
         directory to include <literal>$PYTHONPATH</literal> and <literal>$PATH</literal>
         environment variables.
       </para></listitem>
+
+      <listitem><para>
+        In the <varname>installCheck/varname> phase, <literal>${python.interpreter} setup.py test</literal>
+        is ran.
+      </para></listitem>
     </orderedlist>
   </para>
 
-  <para>By default <varname>doCheck = true</varname> is set and tests are run with
-  <literal>${python.interpreter} setup.py test</literal> command in <varname>checkPhase</varname>.</para>
+  <para>By default <varname>doCheck = true</varname> is set</para>
 
   <para>
     As in Perl, dependencies on other Python packages can be specified in the
@@ -385,7 +383,7 @@ twisted = buildPythonPackage {
     <varlistentry>
       <term><varname>setupPyBuildFlags</varname></term>
       <listitem><para>
-        List of flags passed to <command>setup.py build</command> command.
+        List of flags passed to <command>setup.py build_ext</command> command.
       </para></listitem>
     </varlistentry>
 
@@ -393,7 +391,7 @@ twisted = buildPythonPackage {
       <term><varname>pythonPath</varname></term>
       <listitem><para>
         List of packages to be added into <literal>$PYTHONPATH</literal>.
-        Packages in <varname>pythonPath</varname> are not propagated into user environment
+        Packages in <varname>pythonPath</varname> are not propagated
         (contrary to <varname>propagatedBuildInputs</varname>).
       </para></listitem>
     </varlistentry>
@@ -413,15 +411,6 @@ twisted = buildPythonPackage {
     </varlistentry>
 
     <varlistentry>
-      <term><varname>distutilsExtraCfg</varname></term>
-      <listitem><para>
-        Extra lines passed to <varname>[easy_install]</varname> section of
-        <filename>distutils.cfg</filename> (acts as global setup.cfg
-        configuration).
-      </para></listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term><varname>makeWrapperArgs</varname></term>
       <listitem><para>
         A list of strings. Arguments to be passed to