Skip to contentSkip to conversation

package/python-argon2-cffi: bump to version 21.3.0

PATCH In review James Hilliard 2 participants 3 messages Mar 11, 2022 – Mar 13, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/python-argon2-cffi: bump to version 21.3.0

Migrate to new flit based build.

---
 package/python-argon2-cffi/Config.in               |  8 +++-----
 package/python-argon2-cffi/python-argon2-cffi.hash |  4 ++--
 package/python-argon2-cffi/python-argon2-cffi.mk   | 14 +++-----------
 3 files changed, 8 insertions(+), 18 deletions(-)
package/python-argon2-cffi/Config.in +3 -5
index 5cddb3314e..5940d1c910 100644
@@ -1,10 +1,8 @@
 config BR2_PACKAGE_PYTHON_ARGON2_CFFI
 	bool "python-argon2-cffi"
-	depends on BR2_USE_MMU # libargon2
-	depends on !BR2_STATIC_LIBS # libargon2
-	select BR2_PACKAGE_PYTHON_CFFI # runtime
-	select BR2_PACKAGE_PYTHON_SIX # runtime
-	select BR2_PACKAGE_LIBARGON2
+	depends on BR2_USE_MMU # python-argon2-cffi-bindings -> libargon2
+	depends on !BR2_STATIC_LIBS # python-argon2-cffi-bindings -> libargon2
+	select BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS # runtime
 	help
 	  The secure Argon2 password hashing algorithm.
 
package/python-argon2-cffi/python-argon2-cffi.hash +2 -2
index 6c416ffd88..09da5855a3 100644
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/argon2-cffi/json
-md5  f33bc18f2c2438f685ba1f0bbd2b86a4  argon2-cffi-21.1.0.tar.gz
-sha256  f710b61103d1a1f692ca3ecbd1373e28aa5e545ac625ba067ff2feca1b2bb870  argon2-cffi-21.1.0.tar.gz
+md5  b7843e8690c790f8e743d37bb75c25a8  argon2-cffi-21.3.0.tar.gz
+sha256  d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b  argon2-cffi-21.3.0.tar.gz
 # Locally computed sha256 checksums
 sha256  bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863  LICENSE
package/python-argon2-cffi/python-argon2-cffi.mk +3 -11
index f01c940589..0fb3e50ff3 100644
@@ -4,19 +4,11 @@
 #
 ################################################################################
 
-PYTHON_ARGON2_CFFI_VERSION = 21.1.0
+PYTHON_ARGON2_CFFI_VERSION = 21.3.0
 PYTHON_ARGON2_CFFI_SOURCE = argon2-cffi-$(PYTHON_ARGON2_CFFI_VERSION).tar.gz
-PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/7b/39/a26aaef5c3f0c6cfd67c80599b5b40a794fdab46f4ee3be925d71e2f9596
-PYTHON_ARGON2_CFFI_SETUP_TYPE = setuptools
+PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/3f/18/20bb5b6bf55e55d14558b57afc3d4476349ab90e0c43e60f27a7c2187289
+PYTHON_ARGON2_CFFI_SETUP_TYPE = flit
 PYTHON_ARGON2_CFFI_LICENSE = MIT
 PYTHON_ARGON2_CFFI_LICENSE_FILES = LICENSE
-PYTHON_ARGON2_CFFI_DEPENDENCIES = host-python-cffi libargon2
-PYTHON_ARGON2_CFFI_ENV = ARGON2_CFFI_USE_SYSTEM=1
-
-ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
-PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=1
-else
-PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=0
-endif
 
 $(eval $(python-package))
Signature · 6 lines
2.25.1

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

James, All,

On 2022-03-11 12:44 -0700, James Hilliard spake thusly:

Quoted 14 lines

Migrate to new flit based build.

---
 package/python-argon2-cffi/Config.in               |  8 +++-----
 package/python-argon2-cffi/python-argon2-cffi.hash |  4 ++--
 package/python-argon2-cffi/python-argon2-cffi.mk   | 14 +++-----------
 3 files changed, 8 insertions(+), 18 deletions(-)
package/python-argon2-cffi/Config.in +0 -0
index 5cddb3314e..5940d1c910 100644

package/python-argon2-cffi/Config.in line 4

Quoted 9 lines
package/python-argon2-cffi/Config.in +2 -5
@@ -1,10 +1,8 @@
 config BR2_PACKAGE_PYTHON_ARGON2_CFFI
 	bool "python-argon2-cffi"
-	depends on BR2_USE_MMU # libargon2
-	depends on !BR2_STATIC_LIBS # libargon2
-	select BR2_PACKAGE_PYTHON_CFFI # runtime
-	select BR2_PACKAGE_PYTHON_SIX # runtime
-	select BR2_PACKAGE_LIBARGON2
+	depends on BR2_USE_MMU # python-argon2-cffi-bindings -> libargon2
+	depends on !BR2_STATIC_LIBS # python-argon2-cffi-bindings -> libargon2

So, here, you are referencing libargon2, but you do not depend on it, neither do you select it. If your dependency is just on python-argon2-cffi-bindings, then that's all you need to document, not why it needs it.

And so, why is the dependency to libargon2 dropped? Given the name of the two packages, python-argon2-cffi and libargon2, they really look like they are related, so dropping the dependency on libargon2 would really need a little explanation, maybe just to state that since upstream commit cb0248d29ab2 (Extract CFFI bindings into argon2-cffi-bindings), the dependency is carried by argon2-cffi-bindings which is already enforced in Buildroot.

Applied with a blurb added to that effect.

Regards,
Yann E. MORIN.

Quoted 50 lines
package/python-argon2-cffi/Config.in +1 -0
+	select BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS # runtime
 	help
 	  The secure Argon2 password hashing algorithm.
 
package/python-argon2-cffi/python-argon2-cffi.hash +2 -2
index 6c416ffd88..09da5855a3 100644
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/argon2-cffi/json
-md5  f33bc18f2c2438f685ba1f0bbd2b86a4  argon2-cffi-21.1.0.tar.gz
-sha256  f710b61103d1a1f692ca3ecbd1373e28aa5e545ac625ba067ff2feca1b2bb870  argon2-cffi-21.1.0.tar.gz
+md5  b7843e8690c790f8e743d37bb75c25a8  argon2-cffi-21.3.0.tar.gz
+sha256  d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b  argon2-cffi-21.3.0.tar.gz
 # Locally computed sha256 checksums
 sha256  bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863  LICENSE
package/python-argon2-cffi/python-argon2-cffi.mk +3 -11
index f01c940589..0fb3e50ff3 100644
@@ -4,19 +4,11 @@
 #
 ################################################################################
 
-PYTHON_ARGON2_CFFI_VERSION = 21.1.0
+PYTHON_ARGON2_CFFI_VERSION = 21.3.0
 PYTHON_ARGON2_CFFI_SOURCE = argon2-cffi-$(PYTHON_ARGON2_CFFI_VERSION).tar.gz
-PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/7b/39/a26aaef5c3f0c6cfd67c80599b5b40a794fdab46f4ee3be925d71e2f9596
-PYTHON_ARGON2_CFFI_SETUP_TYPE = setuptools
+PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/3f/18/20bb5b6bf55e55d14558b57afc3d4476349ab90e0c43e60f27a7c2187289
+PYTHON_ARGON2_CFFI_SETUP_TYPE = flit
 PYTHON_ARGON2_CFFI_LICENSE = MIT
 PYTHON_ARGON2_CFFI_LICENSE_FILES = LICENSE
-PYTHON_ARGON2_CFFI_DEPENDENCIES = host-python-cffi libargon2
-PYTHON_ARGON2_CFFI_ENV = ARGON2_CFFI_USE_SYSTEM=1
-
-ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
-PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=1
-else
-PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=0
-endif
 
 $(eval $(python-package))
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw
Quoted 24 lines · Yann E. MORIN

James, All,

On 2022-03-11 12:44 -0700, James Hilliard spake thusly:

Quoted 20 lines

Migrate to new flit based build.

---
 package/python-argon2-cffi/Config.in               |  8 +++-----
 package/python-argon2-cffi/python-argon2-cffi.hash |  4 ++--
 package/python-argon2-cffi/python-argon2-cffi.mk   | 14 +++-----------
 3 files changed, 8 insertions(+), 18 deletions(-)
package/python-argon2-cffi/Config.in +0 -4
index 5cddb3314e..5940d1c910 100644
@@ -1,10 +1,8 @@
 config BR2_PACKAGE_PYTHON_ARGON2_CFFI
      bool "python-argon2-cffi"
-     depends on BR2_USE_MMU # libargon2
-     depends on !BR2_STATIC_LIBS # libargon2
-     select BR2_PACKAGE_PYTHON_CFFI # runtime
-     select BR2_PACKAGE_PYTHON_SIX # runtime
Quoted 8 lines

package/python-argon2-cffi/Config.in line 4

Quoted 3 lines
package/python-argon2-cffi/Config.in +2 -1
-     select BR2_PACKAGE_LIBARGON2
+     depends on BR2_USE_MMU # python-argon2-cffi-bindings -> libargon2
+     depends on !BR2_STATIC_LIBS # python-argon2-cffi-bindings -> libargon2

So, here, you are referencing libargon2, but you do not depend on it, neither do you select it. If your dependency is just on python-argon2-cffi-bindings, then that's all you need to document, not why it needs it.

Yeah, thought I was supposed to indicate the source of those dependencies using the "# python-argon2-cffi-bindings -> libargon2" comment style in these cases.

Quoted 8 lines

And so, why is the dependency to libargon2 dropped? Given the name of the two packages, python-argon2-cffi and libargon2, they really look like they are related, so dropping the dependency on libargon2 would really need a little explanation, maybe just to state that since upstream commit cb0248d29ab2 (Extract CFFI bindings into argon2-cffi-bindings), the dependency is carried by argon2-cffi-bindings which is already enforced in Buildroot.

Yep, libargon2 dep was moved to a separate bindings package that is now transient to python-argon2-cffi instead of direct.

Quoted 59 lines

Applied with a blurb added to that effect.

Regards,
Yann E. MORIN.

Quoted 46 lines
package/python-argon2-cffi/Config.in +1 -0
+     select BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS # runtime
      help
        The secure Argon2 password hashing algorithm.
 
package/python-argon2-cffi/python-argon2-cffi.hash +2 -2
index 6c416ffd88..09da5855a3 100644
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/argon2-cffi/json
-md5  f33bc18f2c2438f685ba1f0bbd2b86a4  argon2-cffi-21.1.0.tar.gz
-sha256  f710b61103d1a1f692ca3ecbd1373e28aa5e545ac625ba067ff2feca1b2bb870  argon2-cffi-21.1.0.tar.gz
+md5  b7843e8690c790f8e743d37bb75c25a8  argon2-cffi-21.3.0.tar.gz
+sha256  d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b  argon2-cffi-21.3.0.tar.gz
 # Locally computed sha256 checksums
 sha256  bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863  LICENSE
package/python-argon2-cffi/python-argon2-cffi.mk +3 -12
index f01c940589..0fb3e50ff3 100644
@@ -4,19 +4,11 @@
 #
 ################################################################################
 
-PYTHON_ARGON2_CFFI_VERSION = 21.1.0
+PYTHON_ARGON2_CFFI_VERSION = 21.3.0
 PYTHON_ARGON2_CFFI_SOURCE = argon2-cffi-$(PYTHON_ARGON2_CFFI_VERSION).tar.gz
-PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/7b/39/a26aaef5c3f0c6cfd67c80599b5b40a794fdab46f4ee3be925d71e2f9596
-PYTHON_ARGON2_CFFI_SETUP_TYPE = setuptools
+PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/3f/18/20bb5b6bf55e55d14558b57afc3d4476349ab90e0c43e60f27a7c2187289
+PYTHON_ARGON2_CFFI_SETUP_TYPE = flit
 PYTHON_ARGON2_CFFI_LICENSE = MIT
 PYTHON_ARGON2_CFFI_LICENSE_FILES = LICENSE
-PYTHON_ARGON2_CFFI_DEPENDENCIES = host-python-cffi libargon2
-PYTHON_ARGON2_CFFI_ENV = ARGON2_CFFI_USE_SYSTEM=1
-
-ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
-PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=1
-else
-PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=0
-endif
 
 $(eval $(python-package))
--

2.25.1

Quoted 4 lines

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

--
.-----------------.--------------------.------------------.--------------------.

Quoted 5 lines
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |

'------------------------------^-------^------------------^--------------------'

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot