From patchwork Sun Dec 5 00:11:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1563700 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=ZtZ9DAuR; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J66SS5nj3z9sCD for ; Sun, 5 Dec 2021 11:12:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 355316077A; Sun, 5 Dec 2021 00:12:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WdntckALub0P; Sun, 5 Dec 2021 00:12:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 81B0460749; Sun, 5 Dec 2021 00:12:04 +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 C3B7D1BF95D for ; Sun, 5 Dec 2021 00:12:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id B818B401E4 for ; Sun, 5 Dec 2021 00:12:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com 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 lDYgfbxf1imf for ; Sun, 5 Dec 2021 00:12:01 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) by smtp2.osuosl.org (Postfix) with ESMTPS id 87AFD400E9 for ; Sun, 5 Dec 2021 00:12:01 +0000 (UTC) Received: by mail-io1-xd30.google.com with SMTP id k21so8549133ioh.4 for ; Sat, 04 Dec 2021 16:12:01 -0800 (PST) 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=+BP29zWN1QNuJ4z8TXUDCQOZsjgDbiwarxBTsutDl0Y=; b=ZtZ9DAuRDMc0NYJ+quDGcekdtMOM7SHYxfZ4FTYB4spmDrITIADy8O+ZoPfm8hst48 xQLKxmfZTPYIYKv5Q9QNB2iljij1qTfHW85vJ/bm+Anat/jIa1xMR6sdCAHm4MswNWl1 Nt3EivqI3QE2gTkfJoXgmdaYTBtJE0sDpd/Wk91qHOJ4IZ6Epmf49/9CYfMn6D5Cgmgt dtwBTXenQi5w+DXzPEkpo+9UnKdJk7JbJxXYjyAAvXzrV5ZxqLo6g8hlHOikRLj0C0Po 50EYUFWVXquM62FhlGJm+9Fp34VbF8h2pCaW2gUg5uqnlCxeXOaLVCHpPZYOaKXv+poE 7VAA== 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=+BP29zWN1QNuJ4z8TXUDCQOZsjgDbiwarxBTsutDl0Y=; b=Ulxstljn3sEl3Y9nyg6zvRvUbbyMkdBImhSKbu+qzypJo0LLoi7gsVc8wMkEfsKFj/ WWUZwr2f1G863U+fVZFms2Ah/i+qOaRUwHQciBvy5C/yTAM2Fk3YpEph89tjyngb5wWe 7qA7bKkk2TWZ7mZ4DVeyeWE/3x2ZiO07RkAjP8I+heBPArVIFa6p2ztk2cqLaChv5jk4 MrS/Py9/SsM4NKPI0vz8lTWUkgj+NjiCylZO2UY/xQykG877LzmD9bG+A2A2yBPPrFSf pAXyxIb8TiOUkIjSSUS98TTdzuwk6Mm57wTxly+crUf15qu6YJW3Si2RPvzr355Mc8yq 51zw== X-Gm-Message-State: AOAM533VNK+kN7mJK66atMmn1vCODJgI5PGvDx/qM6rGaAGs3qa7IA9y YXEICGAl3hV24EgL3dkW1wsg57m2zq8= X-Google-Smtp-Source: ABdhPJyBuapCUvyWsAPHIJ3gIY/NSF19/I+B5vWxQkrbHXFt9CfiD/247xSM0DgbdT4HBeFJv7PLzg== X-Received: by 2002:a05:6638:150d:: with SMTP id b13mr31849044jat.101.1638663120370; Sat, 04 Dec 2021 16:12:00 -0800 (PST) Received: from james-x399.localdomain (71-218-107-26.hlrn.qwest.net. [71.218.107.26]) by smtp.gmail.com with ESMTPSA id b8sm4333309ilj.0.2021.12.04.16.11.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Dec 2021 16:12:00 -0800 (PST) From: James Hilliard To: buildroot@buildroot.org Date: Sat, 4 Dec 2021 17:11:53 -0700 Message-Id: <20211205001156.2402104-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/4] package/python-tomli: new package 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: James Hilliard , Asaf Kahlon , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: James Hilliard --- package/Config.in | 1 + package/python-tomli/Config.in | 7 +++++++ package/python-tomli/python-tomli.hash | 5 +++++ package/python-tomli/python-tomli.mk | 16 ++++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/python-tomli/Config.in create mode 100644 package/python-tomli/python-tomli.hash create mode 100644 package/python-tomli/python-tomli.mk diff --git a/package/Config.in b/package/Config.in index 006d3cf284..2089fc4ea6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1248,6 +1248,7 @@ menu "External python modules" source "package/python-tinyrpc/Config.in" source "package/python-tomako/Config.in" source "package/python-toml/Config.in" + source "package/python-tomli/Config.in" source "package/python-tornado/Config.in" source "package/python-tqdm/Config.in" source "package/python-traitlets/Config.in" diff --git a/package/python-tomli/Config.in b/package/python-tomli/Config.in new file mode 100644 index 0000000000..e1cecaaa36 --- /dev/null +++ b/package/python-tomli/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_TOMLI + bool "python-tomli" + depends on BR2_PACKAGE_PYTHON3 + help + A lil' TOML parser. + + https://github.com/hukkin/tomli diff --git a/package/python-tomli/python-tomli.hash b/package/python-tomli/python-tomli.hash new file mode 100644 index 0000000000..1a274c8a40 --- /dev/null +++ b/package/python-tomli/python-tomli.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/tomli/json +md5 2ecbc7a23b8c8dc2fe96f588f88463d9 tomli-1.2.0.tar.gz +sha256 d60e681734099207a6add7a10326bc2ddd1fdc36c1b0f547d00ef73ac63739c2 tomli-1.2.0.tar.gz +# Locally computed sha256 checksums +sha256 b80816b0d530b8accb4c2211783790984a6e3b61922c2b5ee92f3372ab2742fe LICENSE diff --git a/package/python-tomli/python-tomli.mk b/package/python-tomli/python-tomli.mk new file mode 100644 index 0000000000..4e6b023ef7 --- /dev/null +++ b/package/python-tomli/python-tomli.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-tomli +# +################################################################################ + +PYTHON_TOMLI_VERSION = 1.2.0 +PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz +PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61aed187d5f5b168c18b1d2de3827976c3691e4da8be7375aa +PYTHON_TOMLI_SETUP_TYPE = distutils +PYTHON_TOMLI_LICENSE = MIT +PYTHON_TOMLI_LICENSE_FILES = LICENSE +HOST_PYTHON_TOMLI_NEEDS_HOST_PYTHON = python3 + +$(eval $(python-package)) +$(eval $(host-python-package)) From patchwork Sun Dec 5 00:11:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1563703 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=JUOFdizc; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J66TC2W5dz9sCD for ; Sun, 5 Dec 2021 11:12:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 5856882EDB; Sun, 5 Dec 2021 00:12:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4SJLYsUPLyEM; Sun, 5 Dec 2021 00:12:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id BF03D82CFD; Sun, 5 Dec 2021 00:12:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 86C2F1BF95D for ; Sun, 5 Dec 2021 00:12:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 76F9582CFD for ; Sun, 5 Dec 2021 00:12:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EdpdIQvp0-BT for ; Sun, 5 Dec 2021 00:12:02 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by smtp1.osuosl.org (Postfix) with ESMTPS id 80A2282C91 for ; Sun, 5 Dec 2021 00:12:02 +0000 (UTC) Received: by mail-io1-xd34.google.com with SMTP id b187so8501164iof.11 for ; Sat, 04 Dec 2021 16:12:02 -0800 (PST) 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=6WeppuKYbMxC8f4wpm7P9WHuim8fqZsmhF3v0Mv6djg=; b=JUOFdizci6wBcJfkw9Nk7b9z92f7zwiZT+GZKdGdB6ZYAAxMgsZnzGgH9eg5rxEJmx Q2oAnSO5se4dgWmY/uotkJvxb4+YWfuLiwUgh0XWhId/8eQR5+psX8j5lEMYJlTI39U7 psPLSCMtS7qQfMzbuSjEu2vq5N2FoJrUAobxpxohx2mbrniZK+iSPLnA6rAwZcMIbX2+ BZxvFKHdvNwd43H1DyAMNisXvOMP2r4517zYFfnayuTE23/Vf3YUoFLV3p6yTZB8QqzV tsk4H9dvGcMEXjYyBfMPE0M8F8+4PdZGtF2YzGGX0whH+0RW6lGnLiAzPVHtAb3VC/qM EG5w== 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=6WeppuKYbMxC8f4wpm7P9WHuim8fqZsmhF3v0Mv6djg=; b=RFNScM2yRejcWhpbesaz/Oz5qZK6w9rz1DSGhLqLX2Xm8qEjPVWOxwvxsbDA3GI1Gc DwNNo2F2n+b/L7WiF3TvzHf7vjKrjfoLkJyRbO4IJzzTMPoeiJ05eWcGKFC0vZ5HotNb WHPqm7dAckSJASXQaQVn+AVSYMljgv5GX8VjtjFsSSDD6GkZQQMKPzjOZvVjeWgscPhI UvrKijx7LraSHy+oBGZBGLrjn8kprzK7+OVN/P7LfMVXhER8eCECzkMPb/iR++8aM2Un MUlwO2xu/w7S8BAVcbe9MuyhYAW414I78xuMncwAFJgJS/bWRWLopEI6IOhB00FmwUQ0 uPAA== X-Gm-Message-State: AOAM531TIrI/+l5tNldZXKrPtUdfvcyCmlsaOPO0czj4QoondgrcuYGr Hs3c0DaOKILa9Sz7Anq7Bp5Q4jaNhlw= X-Google-Smtp-Source: ABdhPJxbA56TKiqOuDH1dTq3gbX574mOQ4DaFS1iCyVllQ1udSfMQR3dFKheiy9RjkM70QUisH/N1Q== X-Received: by 2002:a05:6638:1115:: with SMTP id n21mr32739784jal.143.1638663121385; Sat, 04 Dec 2021 16:12:01 -0800 (PST) Received: from james-x399.localdomain (71-218-107-26.hlrn.qwest.net. [71.218.107.26]) by smtp.gmail.com with ESMTPSA id b8sm4333309ilj.0.2021.12.04.16.12.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Dec 2021 16:12:01 -0800 (PST) From: James Hilliard To: buildroot@buildroot.org Date: Sat, 4 Dec 2021 17:11:54 -0700 Message-Id: <20211205001156.2402104-2-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211205001156.2402104-1-james.hilliard1@gmail.com> References: <20211205001156.2402104-1-james.hilliard1@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 2/4] package/pkg-python: add flit package infrastructure 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: James Hilliard , Asaf Kahlon , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Due to flit removing the setup.py generation from the default sdist releases we need to add a hook that generates them before we can do a build and install using distutils. Installing flit/flit-core is also a bit tricky since we also need to generate setup.py's for them as well, we can do this by adding their build directories to path and calling the internal methods required to do the setup.py generation. Signed-off-by: James Hilliard --- package/pkg-python.mk | 30 ++++++- ...sion-parser-for-multiple-assignments.patch | 80 +++++++++++++++++++ .../python-flit-core/python-flit-core.hash | 3 + package/python-flit-core/python-flit-core.mk | 34 ++++++++ package/python-flit/python-flit.hash | 5 ++ package/python-flit/python-flit.mk | 17 ++++ 6 files changed, 166 insertions(+), 3 deletions(-) create mode 100644 package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch create mode 100644 package/python-flit-core/python-flit-core.hash create mode 100644 package/python-flit-core/python-flit-core.mk create mode 100644 package/python-flit/python-flit.hash create mode 100644 package/python-flit/python-flit.mk diff --git a/package/pkg-python.mk b/package/pkg-python.mk index e6b81bdfd3..f50c33a89a 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -120,8 +120,8 @@ ifndef $(2)_SETUP_TYPE endif endif -# Distutils -ifeq ($$($(2)_SETUP_TYPE),distutils) +# Distutils/flit +ifneq ($$(filter distutils flit,$$($(2)_SETUP_TYPE)),) ifeq ($(4),target) $(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) $(2)_BASE_BUILD_TGT = build @@ -149,7 +149,7 @@ $(2)_BASE_BUILD_OPTS = $(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif else -$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'") +$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools' or 'flit") endif # Target packages need both the python interpreter on the target (for @@ -212,6 +212,10 @@ $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-s endif endif # SETUP_TYPE +ifeq ($$($(2)_SETUP_TYPE),flit) +$(2)_DEPENDENCIES += $$(if $$(filter host-python-flit host-python-flit-core,$(1)),,host-python-flit-core) +endif # SETUP_TYPE + # Python interpreter to use for building the package. # # We may want to specify the python interpreter to be used for building a @@ -236,12 +240,32 @@ $(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/$$($(2)_NEEDS_HOST_PYTHON) endif endif +ifeq ($$($(2)_SETUP_TYPE),flit) +ifndef $(2)_FLIT_GENERATE_SETUP +define $(2)_FLIT_GENERATE_SETUP + (cd $$($$(PKG)_BUILDDIR)/; \ + $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$($(2)_PYTHON_INTERPRETER) -c \ + "import sys; \ + sys.modules['requests'] = False; \ + from flit.sdist import SdistBuilder; \ + from pathlib import Path; \ + cwd=Path.cwd(); \ + setup=cwd.joinpath('setup.py').open('wb'); \ + pyproject=cwd.joinpath('pyproject.toml'); \ + builder=SdistBuilder.from_ini_path(pyproject); \ + setup.write(builder.make_setup_py())") +endef +endif +endif + # # Build step. Only define it if not already defined by the package .mk # file. # ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS + $$($$(PKG)_FLIT_GENERATE_SETUP) (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ $$($(2)_PYTHON_INTERPRETER) setup.py \ diff --git a/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch b/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch new file mode 100644 index 0000000000..5a94e1dcab --- /dev/null +++ b/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch @@ -0,0 +1,80 @@ +From 2cd8b5708be88b90ea2fa0fb35407a5ec2038c8e Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Sat, 27 Nov 2021 02:36:15 -0700 +Subject: [PATCH] Fix ast version parser for multiple assignments + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/takluyver/flit/pull/474] +--- + flit_core/common.py | 21 +++++++++++-------- + .../tests/samples/moduleunimportabledouble.py | 8 +++++++ + flit_core/tests/test_common.py | 5 +++++ + 3 files changed, 25 insertions(+), 9 deletions(-) + create mode 100644 flit_core/tests/samples/moduleunimportabledouble.py + +diff --git a/flit_core/common.py b/flit_core/common.py +index f1f378f..86bcf4b 100644 +--- a/flit_core/common.py ++++ b/flit_core/common.py +@@ -132,15 +132,18 @@ def get_docstring_and_version_via_ast(target): + for child in node.body: + # Only use the version from the given module if it's a simple + # string assignment to __version__ +- is_version_str = ( +- isinstance(child, ast.Assign) +- and len(child.targets) == 1 +- and isinstance(child.targets[0], ast.Name) +- and child.targets[0].id == "__version__" +- and isinstance(child.value, ast.Str) +- ) +- if is_version_str: +- version = child.value.s ++ if isinstance(child, ast.Assign): ++ for target in child.targets: ++ is_version_str = ( ++ isinstance(target, ast.Name) ++ and target.id == "__version__" ++ and isinstance(child.value, ast.Str) ++ ) ++ if is_version_str: ++ version = child.value.s ++ break ++ else: ++ continue + break + else: + version = None +diff --git a/flit_core/tests/samples/moduleunimportabledouble.py b/flit_core/tests/samples/moduleunimportabledouble.py +new file mode 100644 +index 0000000..42d51f3 +--- /dev/null ++++ b/flit_core/tests/samples/moduleunimportabledouble.py +@@ -0,0 +1,8 @@ ++ ++""" ++A sample unimportable module with double assignment ++""" ++ ++raise ImportError() ++ ++VERSION = __version__ = "0.1" +diff --git a/flit_core/tests/test_common.py b/flit_core/tests/test_common.py +index 02cfab7..42e230b 100644 +--- a/flit_core/tests/test_common.py ++++ b/flit_core/tests/test_common.py +@@ -70,6 +70,11 @@ class ModuleTests(TestCase): + 'version': '0.1'} + ) + ++ info = get_info_from_module(Module('moduleunimportabledouble', samples_dir)) ++ self.assertEqual(info, {'summary': 'A sample unimportable module with double assignment', ++ 'version': '0.1'} ++ ) ++ + info = get_info_from_module(Module('module1', samples_dir / 'constructed_version')) + self.assertEqual(info, {'summary': 'This module has a __version__ that requires runtime interpretation', + 'version': '1.2.3'} +-- +2.33.1 + diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash new file mode 100644 index 0000000000..e32a05365b --- /dev/null +++ b/package/python-flit-core/python-flit-core.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/flit_core/json +md5 cf656ea7dac7cfa0f714e24bbadfb013 flit_core-3.5.1.tar.gz +sha256 3083720351a6cb00e0634a1ec0e26eae7b273174c3c6c03d5b597a14203b282e flit_core-3.5.1.tar.gz diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk new file mode 100644 index 0000000000..95a215bd39 --- /dev/null +++ b/package/python-flit-core/python-flit-core.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# python-flit-core +# +################################################################################ + +PYTHON_FLIT_CORE_VERSION = 3.5.1 +PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz +PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/7e/1e/15198966abf00e590ec95fb8aa4ba3d274897fe7b182fce2867f672f6a91 +PYTHON_FLIT_CORE_SETUP_TYPE = flit +PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause +HOST_PYTHON_FLIT_CORE_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_FLIT_CORE_DEPENDENCIES = host-python-flit +HOST_PYTHON_FLIT_CORE_ENV = PYTHONPATH="$(PYTHON3_PATH):$(@D)" + +define HOST_PYTHON_FLIT_CORE_FLIT_GENERATE_SETUP + cd $(HOST_PYTHON_FLIT_CORE_BUILDDIR)/; \ + $(HOST_PYTHON_FLIT_CORE_BASE_ENV) $(HOST_PYTHON_FLIT_CORE_ENV) \ + $(HOST_PYTHON_FLIT_CORE_PYTHON_INTERPRETER) -c \ + "import sys; \ + sys.modules['requests'] = False; \ + from flit.sdist import SdistBuilder; \ + from flit_core.build_thyself import metadata, Module; \ + from pathlib import Path; \ + cwd=Path.cwd(); \ + module=Module('flit_core', cwd); \ + reqs_by_extra={'.none': metadata.requires}; \ + extra_files=['pyproject.toml', 'build_dists.py']; \ + setup=cwd.joinpath('setup.py').open('wb'); \ + builder=SdistBuilder(module, metadata, cwd, reqs_by_extra, {}, extra_files); \ + setup.write(builder.make_setup_py())" +endef + +$(eval $(host-python-package)) diff --git a/package/python-flit/python-flit.hash b/package/python-flit/python-flit.hash new file mode 100644 index 0000000000..e676b85090 --- /dev/null +++ b/package/python-flit/python-flit.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/flit/json +md5 1ff1eb6e71cac6d873808fa12328a8c5 flit-3.5.1.tar.gz +sha256 2e3b7377714483ecc54b236330d7bf3467b9f5b909b22333b50b6b4324162510 flit-3.5.1.tar.gz +# Locally computed sha256 checksums +sha256 35b4f1dec512e617077fd6980dbb43ef8c2887adc5d0185edb4c04da175dd816 LICENSE diff --git a/package/python-flit/python-flit.mk b/package/python-flit/python-flit.mk new file mode 100644 index 0000000000..557ee7d8d9 --- /dev/null +++ b/package/python-flit/python-flit.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# python-flit +# +################################################################################ + +PYTHON_FLIT_VERSION = 3.5.1 +PYTHON_FLIT_SOURCE = flit-$(PYTHON_FLIT_VERSION).tar.gz +PYTHON_FLIT_SITE = https://files.pythonhosted.org/packages/a8/bc/4bbb98f1ce0ae4e778f3486c39c487a066d69f5ffe4e762c79664dfd5df8 +PYTHON_FLIT_SETUP_TYPE = flit +PYTHON_FLIT_LICENSE = BSD-3-Clause +PYTHON_FLIT_LICENSE_FILES = LICENSE +HOST_PYTHON_FLIT_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_FLIT_DEPENDENCIES = host-python-docutils host-python-tomli +HOST_PYTHON_FLIT_ENV = PYTHONPATH="$(PYTHON3_PATH):$(@D):$(@D)/flit_core" + +$(eval $(host-python-package)) From patchwork Sun Dec 5 00:11:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1563701 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=m8/kMF2L; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J66Sh0LMYz9sCD for ; Sun, 5 Dec 2021 11:12:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 018DF60749; Sun, 5 Dec 2021 00:12:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id crLhdVvREJoG; Sun, 5 Dec 2021 00:12:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 39F4760A8D; Sun, 5 Dec 2021 00:12:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0EE241BF95D for ; Sun, 5 Dec 2021 00:12:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 0C38382D0F for ; Sun, 5 Dec 2021 00:12:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id siubKl1hso4q for ; Sun, 5 Dec 2021 00:12:03 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by smtp1.osuosl.org (Postfix) with ESMTPS id 55DF982CFD for ; Sun, 5 Dec 2021 00:12:03 +0000 (UTC) Received: by mail-io1-xd34.google.com with SMTP id z26so8496359iod.10 for ; Sat, 04 Dec 2021 16:12:03 -0800 (PST) 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=LgoVMrRSX/w9HFOIH0PslMuSWFkXe8CnXYFGjdJRaxQ=; b=m8/kMF2LyPM9qqkIVvHaLmlLw6rACIPC4ltHTLiRW9+JXurLUD4Y5wLdSSHHnYpV/K 3KMkXqgmet9Bbc/DTUQfpbHFRFQFKeXlYp7JgK2KnAlkuJBMeuHArhyRaGWr5nRj8erl bvJnVkF3IuFBn72WXw01hFE/GBac61UuOijq1X7eR/pKpu7w647TSUSJ7IG6+5IisykK j6zVo9J5U4hUUmVFrLyHiqRCH2gHSlaCPRwcwp5XculDdcdRGcTryVq2sgu8jbSKx2tt /4p8IB7c1hbyjJD0EgH8Y5wBsK7uwLgNbv8dhp3ErWR1o2c+miHzDza45ynWx0qqEsYm Tzlg== 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=LgoVMrRSX/w9HFOIH0PslMuSWFkXe8CnXYFGjdJRaxQ=; b=gEwUGahM2kCry6wf08iQnpTi+j/hKuI7WixgsfwUTgKRVW+zS04c/+dHe9fJW6HXWS 0QF5eWLaaokTdMi+NRU4V9TuOFSgCqDvZkc6Gt+9hKyvaEBhPDF55A8Nan2vH5y5WS0O CZzNDU8nhK3KW88nUCQbRkExfsitQk9E/nNQAehxTYQukNKtI2GgH22CPISMmbca+arm Wx1aEDXy5EjJBeMhREy/eryU1GVdOO8+sBT68C8xHz7h/koKjTSyzg/n1b0toQsFYRtw JUENl9bDcGV7tEpD6uA71NRa1ConOAieMjhr7byhRxyhXNtOf1/VGd5EqjWf9X384ICE pdhw== X-Gm-Message-State: AOAM532TMbkHPmCA/4ohW3AuzN5Jex2pY+TaP33WmHvU96MXXtthK/ld f82b3hkzPUsefzAV/BRUQ02y1S4mSII= X-Google-Smtp-Source: ABdhPJz+QY2WXZxBrAyYVGwoDf1ftd/UrWzIK5xFP3ZMMmaIU7ZIa/KSVx+idrN6v4y6nZ8QAk3uSA== X-Received: by 2002:a05:6638:224d:: with SMTP id m13mr33207018jas.86.1638663122393; Sat, 04 Dec 2021 16:12:02 -0800 (PST) Received: from james-x399.localdomain (71-218-107-26.hlrn.qwest.net. [71.218.107.26]) by smtp.gmail.com with ESMTPSA id b8sm4333309ilj.0.2021.12.04.16.12.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Dec 2021 16:12:02 -0800 (PST) From: James Hilliard To: buildroot@buildroot.org Date: Sat, 4 Dec 2021 17:11:55 -0700 Message-Id: <20211205001156.2402104-3-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211205001156.2402104-1-james.hilliard1@gmail.com> References: <20211205001156.2402104-1-james.hilliard1@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 3/4] utils/scanpypi: add flit package 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: James Hilliard , Asaf Kahlon , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" These packages don't have a setup.py so we instead need to parse their pyproject.toml file. Signed-off-by: James Hilliard --- utils/scanpypi | 81 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 65 insertions(+), 16 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 1f3326cf4d..4164a52db3 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -296,21 +296,67 @@ class BuildrootPackage(): current_dir = os.getcwd() os.chdir(self.tmp_extract) sys.path.insert(0, self.tmp_extract) - s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) - imp.load_module('__main__', s_file, s_path, s_desc) - if self.metadata_name in self.setup_args: - pass - elif self.metadata_name.replace('_', '-') in self.setup_args: - self.metadata_name = self.metadata_name.replace('_', '-') - elif self.metadata_name.replace('-', '_') in self.setup_args: - self.metadata_name = self.metadata_name.replace('-', '_') try: - self.setup_metadata = self.setup_args[self.metadata_name] - except KeyError: - # This means setup was not called - print('ERROR: Could not determine package metadata for {pkg}.\n' - .format(pkg=self.real_name)) + s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) + imp.load_module('__main__', s_file, s_path, s_desc) + if self.metadata_name in self.setup_args: + pass + elif self.metadata_name.replace('_', '-') in self.setup_args: + self.metadata_name = self.metadata_name.replace('_', '-') + elif self.metadata_name.replace('-', '_') in self.setup_args: + self.metadata_name = self.metadata_name.replace('-', '_') + try: + self.setup_metadata = self.setup_args[self.metadata_name] + except KeyError: + # This means setup was not called + print('ERROR: Could not determine package metadata for {pkg}.\n' + .format(pkg=self.real_name)) + raise + finally: + os.chdir(current_dir) + sys.path.remove(self.tmp_extract) + + def load_pyproject(self): + """ + Loads the corresponding pyproject.toml and store its metadata + """ + from pprint import pprint + current_dir = os.getcwd() + os.chdir(self.tmp_extract) + sys.path.insert(0, self.tmp_extract) + try: + pyproject = open('pyproject.toml') + except FileNotFoundError: raise + else: + try: + from pip._vendor.tomli import load as toml_load + except ImportError: + try: + from toml import load as _toml_load # noqa: F401 + def toml_load(f): + w = io.TextIOWrapper(f, encoding="utf8", newline="") + try: + return _toml_load(w) + finally: + w.detach() + except ImportError: + print('This package needs toml') + raise + with pyproject: + pyproject_data = toml_load(pyproject) + try: + self.setup_metadata = pyproject_data.get('project', {}) + self.metadata_name = self.setup_metadata.get('name', self.real_name) + build_backend = pyproject_data.get('build-system', {}).get('build-backend', None) + if build_backend is not None: + if build_backend == 'flit_core.buildapi': + self.setup_metadata['method'] = 'flit' + except KeyError: + # This means setup was not called + print('ERROR: Could not determine package metadata for {pkg}.\n' + .format(pkg=self.real_name)) + raise os.chdir(current_dir) sys.path.remove(self.tmp_extract) @@ -690,11 +736,14 @@ def main(): try: package.load_setup() except ImportError as err: - if 'buildutils' in err.message: + if 'buildutils' in str(err): print('This package needs buildutils') + continue else: - raise - continue + try: + package.load_pyproject() + except Exception as e: + raise except (AttributeError, KeyError) as error: print('Error: Could not install package {pkg}: {error}'.format( pkg=package.real_name, error=error)) From patchwork Sun Dec 5 00:11:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1563702 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=CmufnPY4; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J66Sv3jPMz9sCD for ; Sun, 5 Dec 2021 11:12:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id D7FB16077A; Sun, 5 Dec 2021 00:12:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wp95zq9ZQDSj; Sun, 5 Dec 2021 00:12:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 033E760A93; Sun, 5 Dec 2021 00:12:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 26F891BF95D for ; Sun, 5 Dec 2021 00:12:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 2449182D0F for ; Sun, 5 Dec 2021 00:12:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id O9qvYKDGavTB for ; Sun, 5 Dec 2021 00:12:04 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) by smtp1.osuosl.org (Postfix) with ESMTPS id 38D5C82CFD for ; Sun, 5 Dec 2021 00:12:04 +0000 (UTC) Received: by mail-io1-xd30.google.com with SMTP id x6so8440093iol.13 for ; Sat, 04 Dec 2021 16:12:04 -0800 (PST) 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=epw+aKjYX5SPVZHTzj7JHcdVHVkuFf5bP9wUzPntS0M=; b=CmufnPY4GUjocfjyGmg57k7kkuNyEq6oouR2RZyNBmMYgin1uw1GgVvN7co6fGhWvH Qr7b1M2pObi9ocJVAbaCWx3a38HaUcia3PFR7JLoNOvL7yoaNvHEUpif/Tni6xhc0prY tlEsWFfrtFAC3HEptEGUDvxPHARMJJDiTb0undQ0dkqPdzceQXmGjCFCHh/4Vdf1sEMs OGRhTDs9q4nz8qmoCU4k6s1BFrmXm2VHd+anGDC9LMZNnpAMqaeDjtTIkr5/dKsjzhle 5hURqGlxOt0AHFLG/FeK7QY6nFc8FpB9s7kzjn9rHiaP9HxHxTjTiSu1efg/X7Sa+nzA NfSA== 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=epw+aKjYX5SPVZHTzj7JHcdVHVkuFf5bP9wUzPntS0M=; b=rGn3QqmubyaPrv8dZtJElVfZa6xtkG2GGOYHpU0OCcCtrLf5a3Tln+pOpCXwg5UeS/ JGGCoFUZmpmkRBlZ1IrRqbs4Xjkye2QtOMMn+DwAglDCQFAUrTVFX9QlFjQAfhnAQy1k wrpZM8FpjZLLVEXhjaNwG04yD7nUF7FTIalggFobVsAir40ZWikZA9RpP4JQEj2R/XgJ Zi7yeFiLxjTQU0gK0hv6TZWwOx2lQkb+F19UUnzhCC3oO9/LhwR7qxYViQ+SPXhcDQch 389Spd78U+DfniUD7yDoWDxL6zH5SJFPEkM9lMa3KGsUAEjIHb5Z1pYPgPTLln6jPVJn wYVQ== X-Gm-Message-State: AOAM532sd3yDYCr+7ImRhcFJdu5atnkCq6iwlDdpIvQrGjINIs3DU0k+ XZ2h9FMLUvV7dutmkf+KBDJ5/LR3Hf0= X-Google-Smtp-Source: ABdhPJzOl7a1rzyCM1aq7xsJBdOeO2wvbek3GXp2jZqdCeaUdjO0Z3D8fEJ/upQCt8pOqFFcus9Bqw== X-Received: by 2002:a05:6638:d0e:: with SMTP id q14mr32286241jaj.12.1638663123255; Sat, 04 Dec 2021 16:12:03 -0800 (PST) Received: from james-x399.localdomain (71-218-107-26.hlrn.qwest.net. [71.218.107.26]) by smtp.gmail.com with ESMTPSA id b8sm4333309ilj.0.2021.12.04.16.12.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Dec 2021 16:12:03 -0800 (PST) From: James Hilliard To: buildroot@buildroot.org Date: Sat, 4 Dec 2021 17:11:56 -0700 Message-Id: <20211205001156.2402104-4-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211205001156.2402104-1-james.hilliard1@gmail.com> References: <20211205001156.2402104-1-james.hilliard1@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 4/4] package/python-tinycss2: bump to version 1.1.1 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: James Hilliard , Asaf Kahlon , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This version now requires flit package infrastructure. Signed-off-by: James Hilliard --- Changes v1 -> v2: - rebased on next - bump version instead of add package --- package/python-tinycss2/Config.in | 2 ++ package/python-tinycss2/python-tinycss2.hash | 4 ++-- package/python-tinycss2/python-tinycss2.mk | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/python-tinycss2/Config.in b/package/python-tinycss2/Config.in index e6c992b8c5..e7a5bb3659 100644 --- a/package/python-tinycss2/Config.in +++ b/package/python-tinycss2/Config.in @@ -4,3 +4,5 @@ config BR2_PACKAGE_PYTHON_TINYCSS2 select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime help A tiny CSS parser. + + https://www.courtbouillon.org/tinycss2 diff --git a/package/python-tinycss2/python-tinycss2.hash b/package/python-tinycss2/python-tinycss2.hash index eeb3754752..e8e1d93f83 100644 --- a/package/python-tinycss2/python-tinycss2.hash +++ b/package/python-tinycss2/python-tinycss2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tinycss2/json -md5 7caf513c4e87fc2449dcfbf407a8416f tinycss2-1.1.0.tar.gz -sha256 fbdcac3044d60eb85fdb2aa840ece43cf7dbe798e373e6ee0be545d4d134e18a tinycss2-1.1.0.tar.gz +md5 60272f58f8d5834b2e09ffbc9bd5de53 tinycss2-1.1.1.tar.gz +sha256 b2e44dd8883c360c35dd0d1b5aad0b610e5156c2cb3b33434634e539ead9d8bf tinycss2-1.1.1.tar.gz # Locally computed sha256 checksums sha256 6b94acee20ec9f2709333134f3ba70322535fb420af0ce8c1455d9cbe297f1d5 LICENSE diff --git a/package/python-tinycss2/python-tinycss2.mk b/package/python-tinycss2/python-tinycss2.mk index 4bf5b97766..e4fc5dc9c5 100644 --- a/package/python-tinycss2/python-tinycss2.mk +++ b/package/python-tinycss2/python-tinycss2.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_TINYCSS2_VERSION = 1.1.0 +PYTHON_TINYCSS2_VERSION = 1.1.1 PYTHON_TINYCSS2_SOURCE = tinycss2-$(PYTHON_TINYCSS2_VERSION).tar.gz -PYTHON_TINYCSS2_SITE = https://files.pythonhosted.org/packages/ce/d3/ece7a98d5826bd134e269a3a3030153d30482194fca71d95a3041812aab8 -PYTHON_TINYCSS2_SETUP_TYPE = distutils +PYTHON_TINYCSS2_SITE = https://files.pythonhosted.org/packages/1e/5a/576828164b5486f319c4323915b915a8af3fa4a654bbb6f8fc8e87b5cb17 +PYTHON_TINYCSS2_SETUP_TYPE = flit PYTHON_TINYCSS2_LICENSE = BSD-3-Clause PYTHON_TINYCSS2_LICENSE_FILES = LICENSE