Commit 9cc3f70e authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

python-setuptools: bump to version 5.8 



A refresh of the existing patch is needed, and the patch is also
renamed to use the correct patch file naming convention.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent fad1e232

package/python-setuptools/python-setuptools-add-executable.patch→package/python-setuptools/python-setuptools-0001-add-executable.patch

+55 −0
Original line number Diff line number Diff line 
Add a new --executable option to distribute so that we can

force the shebang line in installed python scripts.



[Thomas: refresh for setuptools 5.8.]



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>



diff -Nura distribute-0.6.36.orig/setuptools/command/install.py distribute-0.6.36/setuptools/command/install.py

--- distribute-0.6.36.orig/setuptools/command/install.py	2013-04-13 09:46:23.160823598 -0300

+++ distribute-0.6.36/setuptools/command/install.py	2013-04-13 11:17:28.418841986 -0300

@@ -6,6 +6,7 @@

Index: b/setuptools/command/install.py

===================================================================

--- a/setuptools/command/install.py

+++ b/setuptools/command/install.py

@@ -16,6 +16,7 @@

     """Use easy_install to install the package, w/dependencies"""

 

     user_options = _install.user_options + [

     user_options = orig.install.user_options + [

+        ('executable=', 'e', "specify final destination interpreter path"),

         ('old-and-unmanageable', None, "Try not to use this!"),

         ('single-version-externally-managed', None,

          "used by system package builders to create 'flat' eggs"),

@@ -21,6 +22,7 @@

@@ -31,6 +32,7 @@

 

     def initialize_options(self):

         _install.initialize_options(self)

         orig.install.initialize_options(self)

+        self.executable = None

         self.old_and_unmanageable = None

         self.single_version_externally_managed = None

         self.no_compile = None  # make DISTUTILS_DEBUG work right!

diff -Nura distribute-0.6.36.orig/setuptools/command/install_scripts.py distribute-0.6.36/setuptools/command/install_scripts.py

--- distribute-0.6.36.orig/setuptools/command/install_scripts.py	2013-04-13 09:46:23.160823598 -0300

+++ distribute-0.6.36/setuptools/command/install_scripts.py	2013-04-13 11:24:32.305416400 -0300

@@ -10,6 +10,13 @@

 

Index: b/setuptools/command/install_scripts.py

===================================================================

--- a/setuptools/command/install_scripts.py

+++ b/setuptools/command/install_scripts.py

@@ -11,6 +11,13 @@

     def initialize_options(self):

         _install_scripts.initialize_options(self)

         orig.install_scripts.initialize_options(self)

         self.no_ep = False

+        self.executable = None

+

+    def finalize_options(self):

+        _install_scripts.finalize_options(self)

+        orig.install_scripts.finalize_options(self)

+        self.set_undefined_options('install',

+                ('executable','executable')

+        )

 

     def run(self):

         from setuptools.command.easy_install import get_script_args

@@ -31,6 +38,8 @@

@@ -32,6 +39,8 @@

         )

         bs_cmd = self.get_finalized_command('build_scripts')

         executable = getattr(bs_cmd, 'executable', sys_executable)

package/python-setuptools/python-setuptools.mk

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

################################################################################



PYTHON_SETUPTOOLS_VERSION = 2.1.2

PYTHON_SETUPTOOLS_VERSION = 5.8

PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz

PYTHON_SETUPTOOLS_SITE = http://pypi.python.org/packages/source/s/setuptools

PYTHON_SETUPTOOLS_LICENSE = Python Software Foundation or Zope Public License