All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] package/python-charset-normalizer: new package
@ 2021-10-25  2:42 James Hilliard
  2021-10-25  2:42 ` [Buildroot] [PATCH 2/2] package/python-requests: bump to version 2.26.0 James Hilliard
  2021-10-27 20:28 ` [Buildroot] [PATCH 1/2] package/python-charset-normalizer: new package Arnout Vandecappelle
  0 siblings, 2 replies; 3+ messages in thread
From: James Hilliard @ 2021-10-25  2:42 UTC (permalink / raw)
  To: buildroot
  Cc: Gwenhael Goavec-Merou, Asaf Kahlon, James Hilliard,
	Thomas Petazzoni, Fabrice Fontaine

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/Config.in                                  |  1 +
 package/python-charset-normalizer/Config.in        |  8 ++++++++
 .../python-charset-normalizer.hash                 |  5 +++++
 .../python-charset-normalizer.mk                   | 14 ++++++++++++++
 4 files changed, 28 insertions(+)
 create mode 100644 package/python-charset-normalizer/Config.in
 create mode 100644 package/python-charset-normalizer/python-charset-normalizer.hash
 create mode 100644 package/python-charset-normalizer/python-charset-normalizer.mk

diff --git a/package/Config.in b/package/Config.in
index d40eb9dabc..e23feb49aa 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -950,6 +950,7 @@ menu "External python modules"
 	source "package/python-channels-redis/Config.in"
 	source "package/python-characteristic/Config.in"
 	source "package/python-chardet/Config.in"
+	source "package/python-charset-normalizer/Config.in"
 	source "package/python-cheetah/Config.in"
 	source "package/python-cheroot/Config.in"
 	source "package/python-cherrypy/Config.in"
diff --git a/package/python-charset-normalizer/Config.in b/package/python-charset-normalizer/Config.in
new file mode 100644
index 0000000000..c4c40fc99b
--- /dev/null
+++ b/package/python-charset-normalizer/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_CHARSET_NORMALIZER
+	bool "python-charset-normalizer"
+	depends on BR2_PACKAGE_PYTHON3
+	help
+	  The Real First Universal Charset Detector. Open, modern and
+	  actively maintained alternative to Chardet.
+
+	  https://github.com/ousret/charset_normalizer
diff --git a/package/python-charset-normalizer/python-charset-normalizer.hash b/package/python-charset-normalizer/python-charset-normalizer.hash
new file mode 100644
index 0000000000..f506fa85ed
--- /dev/null
+++ b/package/python-charset-normalizer/python-charset-normalizer.hash
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/charset-normalizer/json
+md5  b28e4463613ff3911d5a2dc62b96233f  charset-normalizer-2.0.7.tar.gz
+sha256  e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0  charset-normalizer-2.0.7.tar.gz
+# Locally computed sha256 checksums
+sha256  eb31a0c5a4fb09b8a4e32055d25c1e5f9c358a2752fef3cd720213d1ccfee241  LICENSE
diff --git a/package/python-charset-normalizer/python-charset-normalizer.mk b/package/python-charset-normalizer/python-charset-normalizer.mk
new file mode 100644
index 0000000000..e1b805fbfb
--- /dev/null
+++ b/package/python-charset-normalizer/python-charset-normalizer.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-charset-normalizer
+#
+################################################################################
+
+PYTHON_CHARSET_NORMALIZER_VERSION = 2.0.7
+PYTHON_CHARSET_NORMALIZER_SOURCE = charset-normalizer-$(PYTHON_CHARSET_NORMALIZER_VERSION).tar.gz
+PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/9f/c5/334c019f92c26e59637bb42bd14a190428874b2b2de75a355da394cf16c1
+PYTHON_CHARSET_NORMALIZER_SETUP_TYPE = setuptools
+PYTHON_CHARSET_NORMALIZER_LICENSE = MIT
+PYTHON_CHARSET_NORMALIZER_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 2/2] package/python-requests: bump to version 2.26.0
  2021-10-25  2:42 [Buildroot] [PATCH 1/2] package/python-charset-normalizer: new package James Hilliard
@ 2021-10-25  2:42 ` James Hilliard
  2021-10-27 20:28 ` [Buildroot] [PATCH 1/2] package/python-charset-normalizer: new package Arnout Vandecappelle
  1 sibling, 0 replies; 3+ messages in thread
From: James Hilliard @ 2021-10-25  2:42 UTC (permalink / raw)
  To: buildroot
  Cc: Gwenhael Goavec-Merou, Asaf Kahlon, James Hilliard,
	Thomas Petazzoni, Fabrice Fontaine

Remove python3-requests host package and combine with python-requests.

Make packages depending on host-python3-requests depend on
host-python-requests instead.

Drop idna patch that is now upstream.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/mongodb/mongodb.mk                    |  2 +-
 ...na-3.x-to-be-installed-on-Python-3.x.patch | 33 -------------------
 package/python-requests/Config.in             |  2 +-
 package/python-requests/python-requests.hash  |  4 +--
 package/python-requests/python-requests.mk    |  7 ++--
 ...na-3.x-to-be-installed-on-Python-3.x.patch | 33 -------------------
 .../python3-requests/python3-requests.hash    |  1 -
 package/python3-requests/python3-requests.mk  | 19 -----------
 package/uhd/uhd.mk                            |  2 +-
 9 files changed, 9 insertions(+), 94 deletions(-)
 delete mode 100644 package/python-requests/0001-Allow-idna-3.x-to-be-installed-on-Python-3.x.patch
 delete mode 100644 package/python3-requests/0001-Allow-idna-3.x-to-be-installed-on-Python-3.x.patch
 delete mode 120000 package/python3-requests/python3-requests.hash
 delete mode 100644 package/python3-requests/python3-requests.mk

diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk
index 6a22acd12a..ede03e44d6 100644
--- a/package/mongodb/mongodb.mk
+++ b/package/mongodb/mongodb.mk
@@ -20,7 +20,7 @@ MONGODB_DEPENDENCIES = \
 	host-python3-psutil \
 	host-python3-pyyaml \
 	host-python3-regex \
-	host-python3-requests \
+	host-python-requests \
 	host-scons \
 	pcre \
 	snappy \
diff --git a/package/python-requests/0001-Allow-idna-3.x-to-be-installed-on-Python-3.x.patch b/package/python-requests/0001-Allow-idna-3.x-to-be-installed-on-Python-3.x.patch
deleted file mode 100644
index ea9ad15df2..0000000000
--- a/package/python-requests/0001-Allow-idna-3.x-to-be-installed-on-Python-3.x.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d747c4753484aa9b90a094d6bf7ec45e5acfb623 Mon Sep 17 00:00:00 2001
-From: Naor Livne <naorlivne@gmail.com>
-Date: Wed, 7 Jul 2021 16:25:20 +0300
-Subject: [PATCH] Allow idna 3.x to be installed on Python 3.x
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Co-authored-by: Mickaël Schoentgen <contact@tiger-222.fr>
-Co-authored-by: Seth Michael Larson <sethmichaellarson@gmail.com>
-(cherry picked from commit 33cf965f7271ab4978ed551754db37865c4085db)
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 7ba4b2a2..83d78665 100755
---- a/setup.py
-+++ b/setup.py
-@@ -43,7 +43,8 @@ packages = ['requests']
- 
- requires = [
-     'chardet>=3.0.2,<5',
--    'idna>=2.5,<3',
-+    'idna>=2.5,<3; python_version < "3"',
-+    'idna>=2.5,<4; python_version >= "3"',
-     'urllib3>=1.21.1,<1.27',
-     'certifi>=2017.4.17'
- 
--- 
-2.31.1
-
diff --git a/package/python-requests/Config.in b/package/python-requests/Config.in
index c798156613..9b04c07fc9 100644
--- a/package/python-requests/Config.in
+++ b/package/python-requests/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_PYTHON_REQUESTS
 	bool "python-requests"
 	depends on BR2_PACKAGE_PYTHON3 # python-idna
 	select BR2_PACKAGE_PYTHON_CERTIFI # runtime
-	select BR2_PACKAGE_PYTHON_CHARDET # runtime
+	select BR2_PACKAGE_PYTHON_CHARSET_NORMALIZER # runtime
 	select BR2_PACKAGE_PYTHON_IDNA # runtime
 	select BR2_PACKAGE_PYTHON_URLLIB3 # runtime
 	select BR2_PACKAGE_PYTHON3_SSL # runtime
diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash
index e07c7bf5cc..53503a3668 100644
--- a/package/python-requests/python-requests.hash
+++ b/package/python-requests/python-requests.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/requests/json
-md5  514d6f7eba77ada0b8c98ec7818828db  requests-2.25.1.tar.gz
-sha256  27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804  requests-2.25.1.tar.gz
+md5  8c745949ad3e9ae83d9927fed213db8a  requests-2.26.0.tar.gz
+sha256  b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7  requests-2.26.0.tar.gz
 # Locally computed sha256 checksums
 sha256  09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b  LICENSE
diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk
index 5d0f545ffb..474d2033ac 100644
--- a/package/python-requests/python-requests.mk
+++ b/package/python-requests/python-requests.mk
@@ -4,14 +4,15 @@
 #
 ################################################################################
 
-# Please keep in sync with package/python3-requests/python3-requests.mk
-PYTHON_REQUESTS_VERSION = 2.25.1
+PYTHON_REQUESTS_VERSION = 2.26.0
 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz
-PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/6b/47/c14abc08432ab22dc18b9892252efaf005ab44066de871e72a38d6af464b
+PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/e7/01/3569e0b535fb2e4a6c384bdbed00c55b9d78b5084e0fb7f4d0bf523d7670
 PYTHON_REQUESTS_SETUP_TYPE = setuptools
 PYTHON_REQUESTS_LICENSE = Apache-2.0
 PYTHON_REQUESTS_LICENSE_FILES = LICENSE
 PYTHON_REQUESTS_CPE_ID_VENDOR = python
 PYTHON_REQUESTS_CPE_ID_PRODUCT = requests
+HOST_PYTHON_REQUESTS_NEEDS_HOST_PYTHON = python3
 
 $(eval $(python-package))
+$(eval $(host-python-package))
diff --git a/package/python3-requests/0001-Allow-idna-3.x-to-be-installed-on-Python-3.x.patch b/package/python3-requests/0001-Allow-idna-3.x-to-be-installed-on-Python-3.x.patch
deleted file mode 100644
index ea9ad15df2..0000000000
--- a/package/python3-requests/0001-Allow-idna-3.x-to-be-installed-on-Python-3.x.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d747c4753484aa9b90a094d6bf7ec45e5acfb623 Mon Sep 17 00:00:00 2001
-From: Naor Livne <naorlivne@gmail.com>
-Date: Wed, 7 Jul 2021 16:25:20 +0300
-Subject: [PATCH] Allow idna 3.x to be installed on Python 3.x
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Co-authored-by: Mickaël Schoentgen <contact@tiger-222.fr>
-Co-authored-by: Seth Michael Larson <sethmichaellarson@gmail.com>
-(cherry picked from commit 33cf965f7271ab4978ed551754db37865c4085db)
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 7ba4b2a2..83d78665 100755
---- a/setup.py
-+++ b/setup.py
-@@ -43,7 +43,8 @@ packages = ['requests']
- 
- requires = [
-     'chardet>=3.0.2,<5',
--    'idna>=2.5,<3',
-+    'idna>=2.5,<3; python_version < "3"',
-+    'idna>=2.5,<4; python_version >= "3"',
-     'urllib3>=1.21.1,<1.27',
-     'certifi>=2017.4.17'
- 
--- 
-2.31.1
-
diff --git a/package/python3-requests/python3-requests.hash b/package/python3-requests/python3-requests.hash
deleted file mode 120000
index 19e182d4a6..0000000000
--- a/package/python3-requests/python3-requests.hash
+++ /dev/null
@@ -1 +0,0 @@
-../python-requests/python-requests.hash
\ No newline at end of file
diff --git a/package/python3-requests/python3-requests.mk b/package/python3-requests/python3-requests.mk
deleted file mode 100644
index dbb3f21490..0000000000
--- a/package/python3-requests/python3-requests.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-################################################################################
-#
-# python3-requests
-#
-################################################################################
-
-# Please keep in sync with package/python-requests/python-requests.mk
-PYTHON3_REQUESTS_VERSION = 2.25.1
-PYTHON3_REQUESTS_SOURCE = requests-$(PYTHON3_REQUESTS_VERSION).tar.gz
-PYTHON3_REQUESTS_SITE = https://files.pythonhosted.org/packages/6b/47/c14abc08432ab22dc18b9892252efaf005ab44066de871e72a38d6af464b
-PYTHON3_REQUESTS_SETUP_TYPE = setuptools
-PYTHON3_REQUESTS_LICENSE = Apache-2.0
-PYTHON3_REQUESTS_LICENSE_FILES = LICENSE
-PYTHON3_REQUESTS_CPE_ID_VENDOR = python
-PYTHON3_REQUESTS_CPE_ID_PRODUCT = requests
-HOST_PYTHON3_REQUESTS_DL_SUBDIR = python-requests
-HOST_PYTHON3_REQUESTS_NEEDS_HOST_PYTHON = python3
-
-$(eval $(host-python-package))
diff --git a/package/uhd/uhd.mk b/package/uhd/uhd.mk
index a8001dfd74..125eb05121 100644
--- a/package/uhd/uhd.mk
+++ b/package/uhd/uhd.mk
@@ -111,7 +111,7 @@ UHD_CONF_OPTS += -DENABLE_RFNOC=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_UHD_PYTHON),y)
-UHD_DEPENDENCIES += host-python-numpy host-python3-requests \
+UHD_DEPENDENCIES += host-python-numpy host-python-requests \
 	python-numpy python-requests
 UHD_CONF_OPTS += -DENABLE_PYTHON_API=ON
 else
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/python-charset-normalizer: new package
  2021-10-25  2:42 [Buildroot] [PATCH 1/2] package/python-charset-normalizer: new package James Hilliard
  2021-10-25  2:42 ` [Buildroot] [PATCH 2/2] package/python-requests: bump to version 2.26.0 James Hilliard
@ 2021-10-27 20:28 ` Arnout Vandecappelle
  1 sibling, 0 replies; 3+ messages in thread
From: Arnout Vandecappelle @ 2021-10-27 20:28 UTC (permalink / raw)
  To: James Hilliard, buildroot
  Cc: Gwenhael Goavec-Merou, Thomas Petazzoni, Asaf Kahlon, Fabrice Fontaine



On 25/10/2021 04:42, James Hilliard wrote:
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>   package/Config.in                                  |  1 +
>   package/python-charset-normalizer/Config.in        |  8 ++++++++
>   .../python-charset-normalizer.hash                 |  5 +++++
>   .../python-charset-normalizer.mk                   | 14 ++++++++++++++
>   4 files changed, 28 insertions(+)
>   create mode 100644 package/python-charset-normalizer/Config.in
>   create mode 100644 package/python-charset-normalizer/python-charset-normalizer.hash
>   create mode 100644 package/python-charset-normalizer/python-charset-normalizer.mk

  I've taken the liberty of adding this to your set in DEVELOPERS as well, and 
applied both to master, thanks.

  Regards,
  Arnout

> 
> diff --git a/package/Config.in b/package/Config.in
> index d40eb9dabc..e23feb49aa 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -950,6 +950,7 @@ menu "External python modules"
>   	source "package/python-channels-redis/Config.in"
>   	source "package/python-characteristic/Config.in"
>   	source "package/python-chardet/Config.in"
> +	source "package/python-charset-normalizer/Config.in"
>   	source "package/python-cheetah/Config.in"
>   	source "package/python-cheroot/Config.in"
>   	source "package/python-cherrypy/Config.in"
> diff --git a/package/python-charset-normalizer/Config.in b/package/python-charset-normalizer/Config.in
> new file mode 100644
> index 0000000000..c4c40fc99b
> --- /dev/null
> +++ b/package/python-charset-normalizer/Config.in
> @@ -0,0 +1,8 @@
> +config BR2_PACKAGE_PYTHON_CHARSET_NORMALIZER
> +	bool "python-charset-normalizer"
> +	depends on BR2_PACKAGE_PYTHON3
> +	help
> +	  The Real First Universal Charset Detector. Open, modern and
> +	  actively maintained alternative to Chardet.
> +
> +	  https://github.com/ousret/charset_normalizer
> diff --git a/package/python-charset-normalizer/python-charset-normalizer.hash b/package/python-charset-normalizer/python-charset-normalizer.hash
> new file mode 100644
> index 0000000000..f506fa85ed
> --- /dev/null
> +++ b/package/python-charset-normalizer/python-charset-normalizer.hash
> @@ -0,0 +1,5 @@
> +# md5, sha256 from https://pypi.org/pypi/charset-normalizer/json
> +md5  b28e4463613ff3911d5a2dc62b96233f  charset-normalizer-2.0.7.tar.gz
> +sha256  e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0  charset-normalizer-2.0.7.tar.gz
> +# Locally computed sha256 checksums
> +sha256  eb31a0c5a4fb09b8a4e32055d25c1e5f9c358a2752fef3cd720213d1ccfee241  LICENSE
> diff --git a/package/python-charset-normalizer/python-charset-normalizer.mk b/package/python-charset-normalizer/python-charset-normalizer.mk
> new file mode 100644
> index 0000000000..e1b805fbfb
> --- /dev/null
> +++ b/package/python-charset-normalizer/python-charset-normalizer.mk
> @@ -0,0 +1,14 @@
> +################################################################################
> +#
> +# python-charset-normalizer
> +#
> +################################################################################
> +
> +PYTHON_CHARSET_NORMALIZER_VERSION = 2.0.7
> +PYTHON_CHARSET_NORMALIZER_SOURCE = charset-normalizer-$(PYTHON_CHARSET_NORMALIZER_VERSION).tar.gz
> +PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/9f/c5/334c019f92c26e59637bb42bd14a190428874b2b2de75a355da394cf16c1
> +PYTHON_CHARSET_NORMALIZER_SETUP_TYPE = setuptools
> +PYTHON_CHARSET_NORMALIZER_LICENSE = MIT
> +PYTHON_CHARSET_NORMALIZER_LICENSE_FILES = LICENSE
> +
> +$(eval $(python-package))
> 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-27 20:29 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-25  2:42 [Buildroot] [PATCH 1/2] package/python-charset-normalizer: new package James Hilliard
2021-10-25  2:42 ` [Buildroot] [PATCH 2/2] package/python-requests: bump to version 2.26.0 James Hilliard
2021-10-27 20:28 ` [Buildroot] [PATCH 1/2] package/python-charset-normalizer: new package Arnout Vandecappelle

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.