Skip to contentSkip to conversation

python-cffi: add missing runtime dependency

PATCH New yegorslists at googlemail.com 3 participants 4 messages Dec 18, 2017 – Dec 27, 2017

lore
Share & tools
lore

yegorslists at googlemail.com

author
#0 lore raw

PATCH v2 1/2 python-cffi: add missing runtime dependency

From: Yegor Yefremov <[email protected]>

python-pycparser is mentioned in setup.py as install_requires, so select it in Config.in.

As python-cffi will be installed with python-crossbar's dependencies, remove it from python-crossbar's Config.in.

Signed-off-by Yegor Yefremov <[email protected]>

---
Changes v1 -> v2:
- rename patch to just indicate that we are adding missing runtime dependency

 package/python-cffi/Config.in     | 1 +
 package/python-crossbar/Config.in | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
package/python-cffi/Config.in +1 -0
index 3805d3d10a..bc9f6a296d 100644
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_PYTHON_CFFI
 	bool "python-cffi"
 	select BR2_PACKAGE_LIBFFI
+	select BR2_PACKAGE_PYTHON_PYCPARSER # runtime
 	help
 	  This is the Foreign Function Interface for Python calling C
 	  code. The aim of this project is to provide a convenient
package/python-crossbar/Config.in +0 -1
index faec922e50..2a98467bd4 100644
@@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_CROSSBAR
 	select BR2_PACKAGE_PYTHON_AUTOBAHN
 	select BR2_PACKAGE_PYTHON_CBOR
 	select BR2_PACKAGE_PYTHON_CLICK
-	select BR2_PACKAGE_PYTHON_PYCPARSER
 	select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY
 	select BR2_PACKAGE_PYTHON_JINJA2
 	select BR2_PACKAGE_PYTHON_LMDB
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH v2 2/2 python-keyring: bump to version 10.5.0

From: Yegor Yefremov <[email protected]>

Fix licence information and add licence checksum.

Signed-off-by Yegor Yefremov <[email protected]>

---
Changes v1 -> v2:
- no changes

 package/python-keyring/Config.in           |  6 +++++-
 package/python-keyring/python-keyring.hash |  6 ++++--
 package/python-keyring/python-keyring.mk   | 16 ++++++----------
 3 files changed, 15 insertions(+), 13 deletions(-)
package/python-keyring/Config.in +5 -1
index a6eacf52a5..23d86a4822 100644
@@ -1,8 +1,12 @@
 config BR2_PACKAGE_PYTHON_KEYRING
 	bool "python-keyring"
-	depends on BR2_PACKAGE_PYTHON
+	depends on BR2_INSTALL_LIBSTDCPP # python-secretstorage
+	select BR2_PACKAGE_PYTHON_SECRETSTORAGE # runtime
 	help
 	  The Python keyring lib provides a easy way to access the
 	  system keyring service from Python.
 
 	  https://pypi.python.org/pypi/keyring
+
+comment "python-keyring needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
package/python-keyring/python-keyring.hash +4 -2
index cd1683a7d1..a57419039e 100644
@@ -1,2 +1,4 @@
-# locally computed
-sha256  c3f0665ee2d969170dcd6b9e83e76cc7fca2be5a40943700ce2624a0a02f9658  keyring-3.0.5.zip
+# md5 from https://pypi.python.org/pypi/keyring/json, sha256 locally computed
+md5	9c53e4f2427ebaa59d304a826311fbcf  keyring-10.5.0.tar.gz
+sha256	0e6129e8c5bc80da34cc1942d30daad79ed40419fcaaa538278c3b2ff235b313  keyring-10.5.0.tar.gz
+sha256  a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd  LICENSE
package/python-keyring/python-keyring.mk +6 -10
index c1ac15f28b..27db2802ed 100644
@@ -4,16 +4,12 @@
 #
 ################################################################################
 
-PYTHON_KEYRING_VERSION = 3.0.5
-PYTHON_KEYRING_SOURCE = keyring-$(PYTHON_KEYRING_VERSION).zip
-PYTHON_KEYRING_SITE = https://pypi.python.org/packages/source/k/keyring
+PYTHON_KEYRING_VERSION = 10.5.0
+PYTHON_KEYRING_SOURCE = keyring-$(PYTHON_KEYRING_VERSION).tar.gz
+PYTHON_KEYRING_SITE = https://pypi.python.org/packages/42/2e/51bd1739fe335095a2174db3f2f230346762e7e572471059540146a521f6
 PYTHON_KEYRING_SETUP_TYPE = setuptools
-PYTHON_KEYRING_LICENSE = python software foundation license
-
-define PYTHON_KEYRING_EXTRACT_CMDS
-	$(UNZIP) -d $(@D) $(DL_DIR)/$(PYTHON_KEYRING_SOURCE)
-	mv $(@D)/keyring-$(PYTHON_KEYRING_VERSION)/* $(@D)
-	$(RM) -r $(@D)/keyring-$(PYTHON_KEYRING_VERSION)
-endef
+PYTHON_KEYRING_LICENSE = MIT
+PYTHON_KEYRING_LICENSE_FILES = LICENSE
+PYTHON_KEYRING_DEPENDENCIES = host-python-setuptools-scm
 
 $(eval $(python-package))
Signature · 1 line
2.11.0
#2 lore raw

PATCH v2 1/2 python-cffi: add missing runtime dependency

In reply to yegorslists at googlemail.com

Hello,

Quoted 5 lines · yegorslists at googlemail.com

From: Yegor Yefremov <[email protected]>

python-pycparser is mentioned in setup.py as install_requires, so select it in Config.in.

Quoted 7 lines

As python-cffi will be installed with python-crossbar's dependencies, remove it from python-crossbar's Config.in.

Signed-off-by Yegor Yefremov <[email protected]>

---
Changes v1 -> v2:
- rename patch to just indicate that we are adding missing runtime dependency

Both applied; Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH v2 1/2 python-cffi: add missing runtime dependency

In reply to yegorslists at googlemail.com
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"yegorslists" == yegorslists <[email protected]> writes:

From: Yegor Yefremov <[email protected]> python-pycparser is mentioned in setup.py as install_requires, so select it in Config.in.

Quoted 7 lines

As python-cffi will be installed with python-crossbar's dependencies, remove it from python-crossbar's Config.in.

Signed-off-by Yegor Yefremov <[email protected]>

---
Changes v1 -> v2:
- rename patch to just indicate that we are adding missing runtime dependency

Committed to 2017.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard