From patchwork Thu Feb 13 04:07:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1237246 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=i0C6e7va; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48J2zZ5478z9s29 for ; Thu, 13 Feb 2020 15:07:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id ACABB86AB6; Thu, 13 Feb 2020 04:07:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HSN+4dq9hhYb; Thu, 13 Feb 2020 04:07:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 34056831F5; Thu, 13 Feb 2020 04:07:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 753FE1BF865 for ; Thu, 13 Feb 2020 04:07:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6FC8B20BF8 for ; Thu, 13 Feb 2020 04:07:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id J0Cl1SglyXQn for ; Thu, 13 Feb 2020 04:07:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) by silver.osuosl.org (Postfix) with ESMTPS id 39D8020487 for ; Thu, 13 Feb 2020 04:07:48 +0000 (UTC) Received: by mail-io1-f46.google.com with SMTP id z8so4949425ioh.0 for ; Wed, 12 Feb 2020 20:07:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AvFHCUk61aQvu4O65ulNqdCBJJHtyztmAJj3dvJOOC4=; b=i0C6e7vafWd0M7WRsAQ2aYd5azBB+529lH7oOgb+s42L3KRL0Srw31rD2YeQ9hAdbL FPswwZsNmDj0ZAqKSeDwDZG7/bm4TkNIy6wOkmNSCFXOKfHhNHglLyMF1X1YeDhU11I8 9M6XyPL6Pkg6Y8L8gWgcuYUuhtkXN7IoLSTJIqs4JLrBbmzEjNvOPCi7+kwTE8T0hKNB +h1TAC22f3NnBw/pDCKCRZcYOVtFJwzd6QxJV4ECxJHWbd7UBtfDBzPGhzQ2J9M1crGZ oA12F9irzfvoVjCSnZVdoYDEac5dXpNzwc+AyNPxbcSGqPTRMLsCmTdMPstaCXPpi2qz 7qjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AvFHCUk61aQvu4O65ulNqdCBJJHtyztmAJj3dvJOOC4=; b=IQKO9j5a6ZFfmoRI4e83Mox1A/DekUia5qNR9X28mIezFgi2j6MyNM6r/NcOSRIACL DPHc2ccvjkk9JLeydcr48rr7AYp2s/FT2oywipyOm/QHkdAC9R9S4Ea5Dplfj8MUkGNN /iEgCyUDyE6TNcIpKiW6qoc3t8+egH6kdp+CxxJfWkRN3znBWMsrgeTH9zunW6j+tsck oO6gDjAmyCdEYDbvNFbYd+6MduylIPGeGhByM2NDZDT0lw0tEPEyfg0wfL+ROnpjKKNF QVFFyF9zcwUkSrDnbGPTqddw7dN+U+QxUv/JyE/rbG4ITdpc6SI2kBG3s6Xa1yKe2ba4 1IzA== X-Gm-Message-State: APjAAAWFoxU5zTuWmx0O4ptDnihFM+ETE33bwiqmmYadZDdJ+Xyj2Eh7 A67rmdb+IjZNgcJb9ePW/LHcDRen X-Google-Smtp-Source: APXvYqxetfFwxQAJAVk//PGCOU9KxHdjeoUNQvUZnMXrhQ2zUPZNz8RX5a/eFQiozInqanKgyGjCYg== X-Received: by 2002:a5d:905a:: with SMTP id v26mr21233285ioq.77.1581566866850; Wed, 12 Feb 2020 20:07:46 -0800 (PST) Received: from james-x399.localdomain (71-33-129-6.hlrn.qwest.net. [71.33.129.6]) by smtp.gmail.com with ESMTPSA id g4sm395181iln.81.2020.02.12.20.07.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2020 20:07:46 -0800 (PST) From: James Hilliard To: buildroot@buildroot.org Date: Wed, 12 Feb 2020 21:07:41 -0700 Message-Id: <20200213040741.119382-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/python3-setuptools: bump to version 45.2.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: James Hilliard , Asaf Kahlon Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Rebased add executable patch. We can no longer keep the python3 and python2 versions in sync as python2 support was dropped in setuptools version 45.0.0. Signed-off-by: James Hilliard --- .../python-setuptools/python-setuptools.mk | 2 - .../0001-add-executable.patch | 75 ++++++++++++++++++- .../python3-setuptools.hash | 4 +- .../python3-setuptools/python3-setuptools.mk | 6 +- 4 files changed, 79 insertions(+), 8 deletions(-) mode change 120000 => 100644 package/python3-setuptools/0001-add-executable.patch mode change 120000 => 100644 package/python3-setuptools/python3-setuptools.hash diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 163ba869ca..d1e724e6ca 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,8 +4,6 @@ # ################################################################################ -# Please keep in sync with -# package/python3-setuptools/python3-setuptools.mk PYTHON_SETUPTOOLS_VERSION = 41.4.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/f4/d5/a6c19dcbcbc267aca376558797f036d9bcdff344c9f785fe7d0fe9a5f2a7 diff --git a/package/python3-setuptools/0001-add-executable.patch b/package/python3-setuptools/0001-add-executable.patch deleted file mode 120000 index 5bab3d96a1..0000000000 --- a/package/python3-setuptools/0001-add-executable.patch +++ /dev/null @@ -1 +0,0 @@ -../python-setuptools/0001-add-executable.patch \ No newline at end of file diff --git a/package/python3-setuptools/0001-add-executable.patch b/package/python3-setuptools/0001-add-executable.patch new file mode 100644 index 0000000000..56d9a7a0a3 --- /dev/null +++ b/package/python3-setuptools/0001-add-executable.patch @@ -0,0 +1,74 @@ +From 3c0f7caa8fed97f8211419adbf6bd64cf6123774 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Mon, 7 Dec 2015 01:14:33 +0100 +Subject: [PATCH] add executable +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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.] +[Jörg: refresh for setuptools 18.7.1] +[James: refresh for setuptools 45.2.0] + +Signed-off-by: Gustavo Zacarias +Signed-off-by: Thomas Petazzoni +Signed-off-by: Jörg Krause +Signed-off-by: James Hilliard +--- + setuptools/command/install.py | 2 ++ + setuptools/command/install_scripts.py | 9 +++++++++ + 2 files changed, 11 insertions(+) + +diff --git a/setuptools/command/install.py b/setuptools/command/install.py +index 72b9a3e4..6781d2bc 100644 +--- a/setuptools/command/install.py ++++ b/setuptools/command/install.py +@@ -16,6 +16,7 @@ class install(orig.install): + """Use easy_install to install the package, w/dependencies""" + + 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"), +@@ -31,6 +32,7 @@ class install(orig.install): + + def initialize_options(self): + orig.install.initialize_options(self) ++ self.executable = None + self.old_and_unmanageable = None + self.single_version_externally_managed = None + +diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py +index 8c9a15e2..bf0417b6 100644 +--- a/setuptools/command/install_scripts.py ++++ b/setuptools/command/install_scripts.py +@@ -12,6 +12,13 @@ class install_scripts(orig.install_scripts): + def initialize_options(self): + orig.install_scripts.initialize_options(self) + self.no_ep = False ++ self.executable = None ++ ++ def finalize_options(self): ++ orig.install_scripts.finalize_options(self) ++ self.set_undefined_options('install', ++ ('executable','executable') ++ ) + + def run(self): + import setuptools.command.easy_install as ei +@@ -32,6 +39,8 @@ class install_scripts(orig.install_scripts): + ) + bs_cmd = self.get_finalized_command('build_scripts') + exec_param = getattr(bs_cmd, 'executable', None) ++ if self.executable is not None: ++ exec_param = self.executable + try: + bw_cmd = self.get_finalized_command("bdist_wininst") + is_wininst = getattr(bw_cmd, '_is_running', False) +-- +2.20.1 + diff --git a/package/python3-setuptools/python3-setuptools.hash b/package/python3-setuptools/python3-setuptools.hash deleted file mode 120000 index a3af7f0fb1..0000000000 --- a/package/python3-setuptools/python3-setuptools.hash +++ /dev/null @@ -1 +0,0 @@ -../python-setuptools/python-setuptools.hash \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.hash b/package/python3-setuptools/python3-setuptools.hash new file mode 100644 index 0000000000..a3049a4a7f --- /dev/null +++ b/package/python3-setuptools/python3-setuptools.hash @@ -0,0 +1,3 @@ +# From https://pypi.org/pypi/setuptools/json +md5 0c956eea142af9c2b02d72e3c042af30 setuptools-45.2.0.zip +sha256 89c6e6011ec2f6d57d43a3f9296c4ef022c2cbf49bab26b407fe67992ae3397f setuptools-45.2.0.zip diff --git a/package/python3-setuptools/python3-setuptools.mk b/package/python3-setuptools/python3-setuptools.mk index 078cd9b072..1b7c7488b1 100644 --- a/package/python3-setuptools/python3-setuptools.mk +++ b/package/python3-setuptools/python3-setuptools.mk @@ -4,11 +4,9 @@ # ################################################################################ -# Please keep in sync with -# package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 41.4.0 +PYTHON3_SETUPTOOLS_VERSION = 45.2.0 PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).zip -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/f4/d5/a6c19dcbcbc267aca376558797f036d9bcdff344c9f785fe7d0fe9a5f2a7 +PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/68/75/d1d7b7340b9eb6e0388bf95729e63c410b381eb71fe8875cdfd949d8f9ce PYTHON3_SETUPTOOLS_LICENSE = MIT PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON3_SETUPTOOLS_SETUP_TYPE = setuptools