瀏覽代碼

package/python-{smmap2, gitdb2}: bump versions to 4.0.0 and 4.0.7

This commit bumps the python-smmap2 and python-gitdb2 packages in
lockstep, as the new version of gitdb2 requires a newer version of
smmap2, but the current version of gitdb2 cannot work with the newer
version of smmap2 (sigh).

Also, upstream the projects have been renamed: gitdb2 is now named
gitdb on PyPi (see https://pypi.org/project/gitdb2/) and smmap2 is now
named smmap (https://pypi.org/project/smmap2/). However, to avoid
needless churn, we don't rename the Buildroot packages, but that
rename is visible in the name of the tarballs being downloaded.

Also, since version 4.0.0, smmap supports only Python 3.x, so we add a
dependency on Python 3.x and drop the test case of gitdb2 on Python
2.x.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Thomas Petazzoni 3 年之前
父節點
當前提交
8bc8f4c416

+ 2 - 2
package/python-gitdb2/Config.in

@@ -1,8 +1,8 @@
 config BR2_PACKAGE_PYTHON_GITDB2
 	bool "python-gitdb2"
+	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_PYTHON_SMMAP2 # runtime
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON  # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3  # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB
 	help
 	  GitDB allows you to access bare git repositories for reading
 	  and writing. It aims at allowing full access to loose objects

+ 3 - 3
package/python-gitdb2/python-gitdb2.hash

@@ -1,5 +1,5 @@
-# md5, sha256 from https://pypi.org/pypi/gitdb2/json
-md5	1a7ea3362e405f8a5634f7ee53636094  gitdb2-2.0.6.tar.gz
-sha256	1b6df1433567a51a4a9c1a5a0de977aa351a405cc56d7d35f3388bad1f630350  gitdb2-2.0.6.tar.gz
+# md5, sha256 from https://pypi.org/pypi/gitdb/json
+md5	3f52187435ab0b6e64a15782ffaf29ab  gitdb-4.0.7.tar.gz
+sha256	96bf5c08b157a666fec41129e6d327235284cca4c81e92109260f353ba138005  gitdb-4.0.7.tar.gz
 # Locally computed sha256 checksums
 sha256	efd29f596a08e8857e68e7694a50bcda72839792da7c3f041bcbff5f18009239  LICENSE

+ 3 - 3
package/python-gitdb2/python-gitdb2.mk

@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_GITDB2_VERSION = 2.0.6
-PYTHON_GITDB2_SOURCE = gitdb2-$(PYTHON_GITDB2_VERSION).tar.gz
-PYTHON_GITDB2_SITE = https://files.pythonhosted.org/packages/c5/62/ed7205331e8d7cc377e2512cb32f8f8f075c0defce767551d0a76e102ce2
+PYTHON_GITDB2_VERSION = 4.0.7
+PYTHON_GITDB2_SOURCE = gitdb-$(PYTHON_GITDB2_VERSION).tar.gz
+PYTHON_GITDB2_SITE = https://files.pythonhosted.org/packages/34/fe/9265459642ab6e29afe734479f94385870e8702e7f892270ed6e52dd15bf
 PYTHON_GITDB2_SETUP_TYPE = setuptools
 PYTHON_GITDB2_LICENSE = BSD-3-Clause
 PYTHON_GITDB2_LICENSE_FILES = LICENSE

+ 1 - 0
package/python-smmap2/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_SMMAP2
 	bool "python-smmap2"
+	depends on BR2_PACKAGE_PYTHON3
 	help
 	  Smmap wraps an interface around mmap and tracks the mapped
 	  files as well as the amount of clients who use it. If the

+ 3 - 3
package/python-smmap2/python-smmap2.hash

@@ -1,5 +1,5 @@
-# md5, sha256 from https://pypi.org/pypi/smmap2/json
-md5	1c59a985be5aa645c4c5a4e063a40dd5  smmap2-2.0.5.tar.gz
-sha256	29a9ffa0497e7f2be94ca0ed1ca1aa3cd4cf25a1f6b4f5f87f74b46ed91d609a  smmap2-2.0.5.tar.gz
+# md5, sha256 from https://pypi.org/pypi/smmap/json
+md5	61882572be57023980c36f5493523077  smmap-4.0.0.tar.gz
+sha256	7e65386bd122d45405ddf795637b7f7d2b532e7e401d46bbe3fb49b9986d5182  smmap-4.0.0.tar.gz
 # Locally computed sha256 checksums
 sha256	88e9d93f708d110b328a834302dd1d5c6afbda530e7721d15d80b3511d86f235  LICENSE

+ 3 - 3
package/python-smmap2/python-smmap2.mk

@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_SMMAP2_VERSION = 2.0.5
-PYTHON_SMMAP2_SOURCE = smmap2-$(PYTHON_SMMAP2_VERSION).tar.gz
-PYTHON_SMMAP2_SITE = https://files.pythonhosted.org/packages/3b/ba/e49102b3e8ffff644edded25394b2d22ebe3e645f3f6a8139129c4842ffe
+PYTHON_SMMAP2_VERSION = 4.0.0
+PYTHON_SMMAP2_SOURCE = smmap-$(PYTHON_SMMAP2_VERSION).tar.gz
+PYTHON_SMMAP2_SITE = https://files.pythonhosted.org/packages/dd/d4/2b4f196171674109f0fbb3951b8beab06cd0453c1b247ec0c4556d06648d
 PYTHON_SMMAP2_SETUP_TYPE = setuptools
 PYTHON_SMMAP2_LICENSE = BSD-3-Clause
 PYTHON_SMMAP2_LICENSE_FILES = LICENSE

+ 0 - 10
support/testing/tests/package/test_python_gitdb2.py

@@ -1,16 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Gitdb2(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_GITDB2=y
-        """
-    sample_scripts = ["tests/package/sample_python_gitdb2.py"]
-
-
 class TestPythonPy3Gitdb2(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \

+ 0 - 10
support/testing/tests/package/test_python_smmap2.py

@@ -1,16 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Smmap2(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_SMMAP2=y
-        """
-    sample_scripts = ["tests/package/sample_python_smmap2.py"]
-
-
 class TestPythonPy3Smmap2(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \