Skip to contentSkip to conversation

package/python-setuptools-scm: needs python3

PATCH In review Fabrice Fontaine 2 participants 2 messages Jan 9, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/python-setuptools-scm: needs python3

python-setuptools-scm dropped python 2 support since
https://github.com/pypa/setuptools_scm/commit/f0be71fbcf150bfc68e4169226399d6ae4da8f1b
resulting in the following build failure since bump to version 6.3.2 in commit 12e3527fd97df9ae1b60b892c61d10ce291b7a00:

/buildroot/autobuild/instance-2/output-1/host/lib" INTLTOOL_PERL=/usr/bin/perl /home/buildroot/autobuild/instance-2/output-1/host/bin/python setup.py build )
File "setup.py", line 22

    f"{type(self).__name__} is forbidden, "
                                          ^

Fixes:
- http://autobuild.buildroot.org/results/2f6125993de364b4a44d259f16806e6dfd792402

---
 Config.in.legacy                                  |  7 +++++++
 package/Config.in                                 |  1 -
 .../Config.in                                     |  7 -------
 .../python-backports-functools-lru-cache.hash     |  5 -----
 .../python-backports-functools-lru-cache.mk       | 15 ---------------
 package/python-crontab/Config.in                  |  1 +
 package/python-dateutil/Config.in                 |  1 +
 package/python-jaraco-classes/Config.in           |  1 +
 package/python-jsonmodels/Config.in               |  1 +
 package/python-py/Config.in                       |  1 +
 .../python-setuptools-scm-git-archive.mk          |  1 +
 .../python-setuptools-scm.mk                      |  1 +
 package/python-xlib/Config.in                     |  1 +
 13 files changed, 15 insertions(+), 28 deletions(-)
 delete mode 100644 package/python-backports-functools-lru-cache/Config.in
 delete mode 100644 package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash
 delete mode 100644 package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk
Config.in.legacy +7 -0
index 75873ff74b..d36eac3302 100644
@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2022.02"
 
+config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE
+	bool "python-backports-functools-lru-cache package removed"
+	select BR2_LEGACY
+	help
+	  This package has been removed as python-setuptools-scm
+	  dropped support of python 2 since version 6.0.0.
+
 config BR2_PACKAGE_CIVETWEB_WITH_LUA
 	bool "civetweb lua support option removed"
 	select BR2_LEGACY
package/Config.in +0 -1
index 8a7dd446b7..2f6b03841f 100644
@@ -938,7 +938,6 @@ menu "External python modules"
 	source "package/python-babel/Config.in"
 	source "package/python-backcall/Config.in"
 	source "package/python-backports-abc/Config.in"
-	source "package/python-backports-functools-lru-cache/Config.in"
 	source "package/python-backports-shutil-get-terminal-size/Config.in"
 	source "package/python-backports-ssl-match-hostname/Config.in"
 	source "package/python-bcrypt/Config.in"
package/python-backports-functools-lru-cache/Config.in deleted +0 -7
deleted file mode 100644
index a5b7771e4d..0000000000
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE
-	bool "python-backports-functools-lru-cache"
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  Backport of functools.lru_cache from Python 3.3
-
-	  https://github.com/jaraco/backports.functools_lru_cache
package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.hash deleted +0 -5
deleted file mode 100644
index 3db4aec1fb..0000000000
@@ -1,5 +0,0 @@
-# md5, sha256 from https://pypi.org/pypi/backports.functools_lru_cache/json
-md5	20f53f54cd3f04b3346ce75a54959754  backports.functools_lru_cache-1.5.tar.gz
-sha256	9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a  backports.functools_lru_cache-1.5.tar.gz
-# Localy computed sha256 checksumms
-sha256	a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd  LICENSE
package/python-backports-functools-lru-cache/python-backports-functools-lru-cache.mk deleted +0 -15
deleted file mode 100644
index 334d6d8c49..0000000000
@@ -1,15 +0,0 @@
-################################################################################
-#
-# python-backports-functools-lru-cache
-#
-################################################################################
-
-PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_VERSION = 1.5
-PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_SOURCE = backports.functools_lru_cache-$(PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_VERSION).tar.gz
-PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_SITE = https://files.pythonhosted.org/packages/57/d4/156eb5fbb08d2e85ab0a632e2bebdad355798dece07d4752f66a8d02d1ea
-PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_SETUP_TYPE = setuptools
-PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_DEPENDENCIES = host-python-setuptools-scm
-PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_LICENSE = MIT
-PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE_LICENSE_FILES = LICENSE
-
-$(eval $(python-package))
package/python-crontab/Config.in +1 -0
index 102dbbdb6b..7514a3866b 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_CRONTAB
 	bool "python-crontab"
+	depends on BR2_PACKAGE_PYTHON3 # python-dateutil -> host-python-setuptools-scm
 	select BR2_PACKAGE_PYTHON_DATEUTIL # runtime
 	help
 	  Crontab module for reading and writing crontab files and
package/python-dateutil/Config.in +1 -0
index 1a36a150b1..bbf61f6813 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_DATEUTIL
 	bool "python-dateutil"
+	depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm
 	select BR2_PACKAGE_PYTHON_SIX
 	help
 	  Extensions to the standard Python datetime module.
package/python-jaraco-classes/Config.in +1 -0
index 05c11237ab..271e085c6f 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_JARACO_CLASSES
 	bool "python-jaraco-classes"
+	depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm
 	select BR2_PACKAGE_PYTHON_SIX # runtime
 	help
 	  Utility functions for Python class constructs.
package/python-jsonmodels/Config.in +1 -0
index f66982874a..84a269f171 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_JSONMODELS
 	bool "python-jsonmodels"
+	depends on BR2_PACKAGE_PYTHON3 # python-dateutil -> host-python-setuptools-scm
 	select BR2_PACKAGE_PYTHON_DATEUTIL # runtime
 	select BR2_PACKAGE_PYTHON_SIX # runtime
 	help
package/python-py/Config.in +1 -0
index 354372f5b4..0e3c3390a0 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_PY
 	bool "python-py"
+	depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm
 	help
 	  library with cross-python path, ini-parsing, io, code, log
 	  facilities.
package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk +1 -0
index 032e2d3fc9..48ca9c89ae 100644
@@ -11,5 +11,6 @@ PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools
 PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT
 PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE
 HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_DEPENDENCIES = host-python-setuptools-scm
+HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_NEEDS_HOST_PYTHON = python3
 
 $(eval $(host-python-package))
package/python-setuptools-scm/python-setuptools-scm.mk +1 -0
index f7f4e3ef27..b2990a56cb 100644
@@ -11,5 +11,6 @@ PYTHON_SETUPTOOLS_SCM_LICENSE = MIT
 PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE
 PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools
 HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = host-python-packaging host-python-tomli
+HOST_PYTHON_SETUPTOOLS_SCM_NEEDS_HOST_PYTHON = python3
 
 $(eval $(host-python-package))
package/python-xlib/Config.in +1 -0
index 081af6a2fc..20e585db9a 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_XLIB
 	bool "python-xlib"
+	depends on BR2_PACKAGE_PYTHON3 # host-python-setuptools-scm
 	select BR2_PACKAGE_PYTHON_SIX # runtime
 	help
 	  XLib in pure Python (Py2/Py3 compatible)
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

python-setuptools-scm dropped python 2 support since
https://github.com/pypa/setuptools_scm/commit/f0be71fbcf150bfc68e4169226399d6ae4da8f1b
resulting in the following build failure since bump to version 6.3.2 in commit 12e3527fd97df9ae1b60b892c61d10ce291b7a00:

/buildroot/autobuild/instance-2/output-1/host/lib" INTLTOOL_PERL=/usr/bin/perl /home/buildroot/autobuild/instance-2/output-1/host/bin/python setup.py build )
File "setup.py", line 22

Quoted 7 lines
    f"{type(self).__name__} is forbidden, "
                                          ^

Fixes:
- http://autobuild.buildroot.org/results/2f6125993de364b4a44d259f16806e6dfd792402

Committed, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot