From patchwork Mon May 9 01:09:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1628235 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.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=20210112 header.b=DaKjqhuG; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KxNP70Yccz9sGg for ; Mon, 9 May 2022 11:09:30 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id AC8B340425; Mon, 9 May 2022 01:09:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mh9fqwNM-VJ4; Mon, 9 May 2022 01:09:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 571F9402FB; Mon, 9 May 2022 01:09:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 35C191BF387 for ; Mon, 9 May 2022 01:09:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 3157D402FB for ; Mon, 9 May 2022 01:09:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DQr9sdnljwpd for ; Mon, 9 May 2022 01:09:23 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) by smtp4.osuosl.org (Postfix) with ESMTPS id DF94A402F8 for ; Mon, 9 May 2022 01:09:22 +0000 (UTC) Received: by mail-il1-x130.google.com with SMTP id z12so8341218ilp.8 for ; Sun, 08 May 2022 18:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dbciW8K8m60BIO4ooPIgdVWSYeblORw9YIOJEfHxssY=; b=DaKjqhuGQTiN4a3qrJuHDFfecRZfj66CPu5dsscam31tjcq5KkwLsIOAmz1iTzvqyK LecImGITgDbbGsbcxZK7Id05Qd+QB/2/ANtFeKd/MjLlemnSiPJ/mMqPqmHKRqVLSmGE TrPtp3h/S7eXQn+no1+6Y/PFPQkLTDmuOsW8C63e638upRqCq23ulNw3kZIa9BF0JnUk U2XfA87l8sdOSwhJ0UrqaUF7KbfyppenXCRr0ivbyg/smHZcGBxbKCzs5rS/GJmK0zHl REb6GpL3VXA/AAJj2DKAK2KHTFOp+n4KX6o1fw1JnpYQIsTgzuZoNdVKGTmF/x4VdEFq LySg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dbciW8K8m60BIO4ooPIgdVWSYeblORw9YIOJEfHxssY=; b=6c4nznsPdI8CK8gzJi2jpHQy5l06Tnd3T7QvlBYWVRLfwHNAUHdfSHGKWtZ23JDKTt JxP5KIhk5YLZbaYgFugrWvDOiA0YJgi/I9UYL8DgVUNXE1tJ/pXSSeoRK0lVx1anGNZ6 6fSkaBFP10tJKiwaF89xq5ILrQL5H54jG4c2X3Mvk0Q+oJ9saAslzoZ9bEQVB/7EgEU4 NnfHoRL6R+GIP2QRJKL78fmvgcqp+6OpjeyOK2xC9V1jDzF1Yhk1szAe63sQBqTrlfyL 0pWVuP9eY4iCOMMLZj0J87kct6F1KZyifN/QSpHb4oMrNqSqHBNP3zyLbb2uSa7Qmtdp 0uiA== X-Gm-Message-State: AOAM531hXd38xKzATSZmo3k84JvmAcr+BA6WCIgW8Qtb6LZYq2zbRm8Y mDayd3l9uBAA8qKIazzlPOvd26VU03c= X-Google-Smtp-Source: ABdhPJx3b4TBvv9fUKTMFjU51Pz1xoAHmYj7l/gR77xVXzvxmkznWVlnoxTytQhVsfL8RfGMTg2znw== X-Received: by 2002:a05:6e02:18c8:b0:2cf:5266:ccf2 with SMTP id s8-20020a056e0218c800b002cf5266ccf2mr5614308ilu.207.1652058561750; Sun, 08 May 2022 18:09:21 -0700 (PDT) Received: from james-x399.localdomain (97-118-252-238.hlrn.qwest.net. [97.118.252.238]) by smtp.gmail.com with ESMTPSA id bp13-20020a056638440d00b0032b3a781755sm3213847jab.25.2022.05.08.18.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 May 2022 18:09:21 -0700 (PDT) From: James Hilliard To: buildroot@buildroot.org Date: Sun, 8 May 2022 19:09:16 -0600 Message-Id: <20220509010917.1485280-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/pkg-python: add setup.cfg-only setuptools project support X-BeenThere: buildroot@buildroot.org 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: Bernd Kuhls , James Hilliard , Thomas Petazzoni , Asaf Kahlon Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Some projects have been removing their setup.py shims under the assumption that they are not needed due to setuptools being usable via pep517, however this is not actually the case as it is not possible to bootstrap setuptools without setup.py style builds as setuptools has a dependency on wheel when being used via pep517 which is itself not installable via pep517 as that would create a dependency cycle between wheel and setuptools(which means wheel itself must use a legacy setup.py build/installation for itself). In addition our pep517 toolchain itself requires setuptools for building/installing dependencies, although it would appear these dependencies will eventually move to flit. Until this is resolved we must use setup.py style builds for setuptools packages. Since it is not yet possible to convert setup.py based setuptools builds to pep517 based setuptools builds we simply need to execute the setuptools shim code directly if the setup.py file is missing. See: https://setuptools.pypa.io/en/latest/setuptools.html#setup-cfg-only-projects Signed-off-by: James Hilliard Tested-by: Yegor Yefremov --- package/pkg-python.mk | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 452fa0d3ea..5794e3a195 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -86,6 +86,9 @@ PKG_PYTHON_SETUPTOOLS_ENV = \ $(PKG_PYTHON_ENV) \ SETUPTOOLS_USE_DISTUTILS=stdlib +PKG_PYTHON_SETUPTOOLS_CMD = \ + $(if $(wildcard $($(PKG)_BUILDDIR)/setup.py),setup.py,-c 'from setuptools import setup;setup()') + PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ @@ -180,13 +183,13 @@ endif else ifeq ($$($(2)_SETUP_TYPE),setuptools) ifeq ($(4),target) $(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV) -$(2)_BASE_BUILD_CMD = setup.py build -$(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) +$(2)_BASE_BUILD_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) build +$(2)_BASE_INSTALL_TARGET_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install --no-compile $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) else $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) -$(2)_BASE_BUILD_CMD = setup.py build -$(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) +$(2)_BASE_BUILD_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) build +$(2)_BASE_INSTALL_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) ifeq ($(4),target) From patchwork Mon May 9 01:09:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1628236 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.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=20210112 header.b=YYIT8Dej; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KxNPL4cPvz9sGg for ; Mon, 9 May 2022 11:09:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D4893409DA; Mon, 9 May 2022 01:09:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M-A9buPHHle2; Mon, 9 May 2022 01:09:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id E5B444049A; Mon, 9 May 2022 01:09:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id BFD4D1BF387 for ; Mon, 9 May 2022 01:09:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id BCF91409DA for ; Mon, 9 May 2022 01:09:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dneJGWEVyT5w for ; Mon, 9 May 2022 01:09:23 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) by smtp2.osuosl.org (Postfix) with ESMTPS id CE01D404A9 for ; Mon, 9 May 2022 01:09:23 +0000 (UTC) Received: by mail-io1-xd2f.google.com with SMTP id i20so13815176ion.0 for ; Sun, 08 May 2022 18:09:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uckR8ENqbWN4yUcHmaPX4BeDJJiggpE66a+avPM9E0U=; b=YYIT8Dejs5/MiqWI41ReoHf6ZiVEEuk1k/Oo8KbSxE52rJFWm29jzaRAswo7gSt2q/ 1Nc1TGhK7cZk+IGa76jH3WRYKpYsLaJE/05u+O+wovEmZBOnQ4m+ZGtl3cufl+h4XsKe uFH9+A4NZe2gxrtWuqjFDBmRl0gBJtTRCvemVU6qOGzOe6VaxJf2BSa45w5wzqfasY0v KRmaBlB8HJbNASAVWRyzsg4trhHG7ifTfPcmrMQmwX5BN0kwZqlLxe0pC2oEmJYs86Fy tEQgkLC9dte8txPm8XGLvy0f4Ec5ZHmunA0EuCjX8rTMoN7npYER+nGXytmhARTpE2on Ms1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uckR8ENqbWN4yUcHmaPX4BeDJJiggpE66a+avPM9E0U=; b=FoyLboXw/yIl7Omp8aniSUwtsp75V7oa58llRoJIFaljigqq7/JkqpiJwyjO1MFOGb /P9MdWla1iEM5U9gyNLu66vplyJN2eJDgLQQMq1xZzG6tbE65iwflDX358raBfHv0Av/ rz4VOuXNPYDx4G3dGrk15mdr7gJGeSJksAUmtFkb87R7Ob2Bb1baoQPNMjguUbRm2YVE qoju1/OyZfUM8Pla93GWm23ZDl4S4OIjalU4ureZcEdB9zawnHhxdsGFpCNAzxiLlfSi Kw09WpeJVOh7S/ERaJ3Zb9rObmfGn266b4ERbiSsKOKh8SqW4j4rFwowRz61NKMyNgym yzow== X-Gm-Message-State: AOAM531v/e4nqoNn5zE2lJVJavr1psD1N/tD3GQDwRZCEah0ONReTvQx giI3jQh7XJ2dI32AbWYfac9XE4Q3TRc= X-Google-Smtp-Source: ABdhPJyED8JMy1dcVrmT0ej7tCw1DmZFjc6VJcBdFmmStIlsHb/qqZ359TWRiY7LYvCQtxOOAuJEsg== X-Received: by 2002:a05:6638:52e:b0:32a:e022:5a9e with SMTP id j14-20020a056638052e00b0032ae0225a9emr6455565jar.60.1652058562606; Sun, 08 May 2022 18:09:22 -0700 (PDT) Received: from james-x399.localdomain (97-118-252-238.hlrn.qwest.net. [97.118.252.238]) by smtp.gmail.com with ESMTPSA id bp13-20020a056638440d00b0032b3a781755sm3213847jab.25.2022.05.08.18.09.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 May 2022 18:09:22 -0700 (PDT) From: James Hilliard To: buildroot@buildroot.org Date: Sun, 8 May 2022 19:09:17 -0600 Message-Id: <20220509010917.1485280-2-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509010917.1485280-1-james.hilliard1@gmail.com> References: <20220509010917.1485280-1-james.hilliard1@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/python-cssutils: bump to version 2.4.0 X-BeenThere: buildroot@buildroot.org 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: Bernd Kuhls , James Hilliard , Thomas Petazzoni , Asaf Kahlon Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: James Hilliard --- package/python-cssutils/python-cssutils.hash | 4 ++-- package/python-cssutils/python-cssutils.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-cssutils/python-cssutils.hash b/package/python-cssutils/python-cssutils.hash index e22dde6e56..13459f7270 100644 --- a/package/python-cssutils/python-cssutils.hash +++ b/package/python-cssutils/python-cssutils.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cssutils/json -md5 71955999f595e4b0eb5a218d614652ca cssutils-2.3.0.tar.gz -sha256 b2d3b16047caae82e5c590036935bafa1b621cf45c2f38885af4be4838f0fd00 cssutils-2.3.0.tar.gz +md5 4ae0e6c670483043260363f593e96a69 cssutils-2.4.0.tar.gz +sha256 2d97210a83b0a3fe1e4469f5ff9a6420b078572035188b1bab7103c3a36dc89b cssutils-2.4.0.tar.gz # Locally computed sha256 checksums sha256 03c570a068086ee577dcd795519ea93462b2ed2fcb6dcc4dfce56a71a2fd6e5a COPYING.LESSER diff --git a/package/python-cssutils/python-cssutils.mk b/package/python-cssutils/python-cssutils.mk index 09c2ca44d6..fc65c893ac 100644 --- a/package/python-cssutils/python-cssutils.mk +++ b/package/python-cssutils/python-cssutils.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CSSUTILS_VERSION = 2.3.0 +PYTHON_CSSUTILS_VERSION = 2.4.0 PYTHON_CSSUTILS_SOURCE = cssutils-$(PYTHON_CSSUTILS_VERSION).tar.gz -PYTHON_CSSUTILS_SITE = https://files.pythonhosted.org/packages/f5/c6/878abb7df855938a067b762a688da3fcdfea4e41c2399feaf80369b61ed7 +PYTHON_CSSUTILS_SITE = https://files.pythonhosted.org/packages/f4/ea/d09b04b5cf6ad84f45ca4c523d3e153dd9be1f12650c825d1c92ca0618a2 PYTHON_CSSUTILS_LICENSE = LGPL-3.0+ PYTHON_CSSUTILS_LICENSE_FILES = COPYING.LESSER PYTHON_CSSUTILS_SETUP_TYPE = setuptools