[Python-modules-commits] [python-qt4] 04/08: disable elementtree and pyuic4 wrapper

[Dmitry Shachnev]

This is an automated email from the git hooks/post-receive script.

mitya57 pushed a commit to branch master
in repository python-qt4.

commit bba068eeef02ff36b8dd9764740273b375803bce
Author: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
Date:   Thu Oct 8 12:56:34 2015 -0700

    disable elementtree and pyuic4 wrapper
    
    Forwarded: not-needed
    Last-Update: 2014-03-18
    
    Patch-Name: debian_configure_changes.diff
---
 configure.py | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/configure.py b/configure.py
index 6118d39..a537298 100644
--- a/configure.py
+++ b/configure.py
@@ -857,35 +857,6 @@ include(%s)
             makefile.generate()
             tool.append("dbus")
 
-        # Only include ElementTree for older versions of Python.
-        if sipcfg.py_version < 0x020500:
-            sipconfig.inform("Creating elementtree Makefile...")
-
-            makefile = sipconfig.PythonModuleMakefile(
-                configuration=sipcfg,
-                dstdir=os.path.join(pyqt_modroot, "elementtree"),
-                dir="elementtree"
-            )
-
-            makefile.generate()
-            tool.append("elementtree")
-
-        # Create the pyuic4 wrapper.  Use the GUI version on MacOS (so that
-        # previews work properly and normal console use will work anyway), but
-        # not on Windows (so that normal console use will work).
-        sipconfig.inform("Creating pyuic4 wrapper...")
-
-        if sys.platform == 'darwin':
-            gui = True
-
-            if opts.use_arch is None:
-                use_arch = ''
-            else:
-                use_arch = ' '.join(opts.use_arch)
-        else:
-            gui = False
-            use_arch = ''
-
         # The pyuic directory may not exist if we are building away from the
         # source directory.
         try:
@@ -894,7 +865,6 @@ include(%s)
             pass
 
         uicdir=os.path.join(pyqt_modroot, "uic")
-        wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), gui, use_arch)
 
         sipconfig.inform("Creating pyuic4 Makefile...")
 
@@ -903,7 +873,6 @@ include(%s)
             dstdir=uicdir,
             srcdir=os.path.join(src_dir, "pyuic", "uic"),
             dir="pyuic",
-            installs=[[os.path.basename(wrapper), opts.pyqtbindir]]
         )
 
         makefile.generate()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-qt4.git