package/python-idna: bump to version 3.2

- Python 2 is not supported since version 3.0 so update all reverse
  dependencies and remove python-coherence
- License file name and its hash is updated due to:
  https://github.com/kjd/idna/commit/e7338bce90683246c480ddebd55b7682371389ed
  https://github.com/kjd/idna/commit/537aa99d4440b0f8a6178818350f27fcaab046ee

https://github.com/kjd/idna/blob/v3.2/HISTORY.rst

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --git a/Config.in.legacy b/Config.in.legacy
index 1beaa664d7177de69dceb8a19a7fcf5d6e7c9441..9c8c64717c6161320018e4a8847302ea960b99c0 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -154,6 +154,13 @@ config BR2_PACKAGE_KODI_LIBVA
          the kodi-specific dependencies limiting libva support to non-
          OPENGLES platforms were removed including this option.
 
+config BR2_PACKAGE_PYTHON_COHERENCE
+       bool "python-coherence package removed"
+       select BR2_LEGACY
+       help
+         This package has been removed as it can't be built anymore due
+         to python-twisted being now incompatible with python 2.
+
 config BR2_PACKAGE_PHP_EXT_XMLRPC
        bool "PHP XMLRPC extension removed"
        select BR2_LEGACY

diff --git a/package/Config.in b/package/Config.in
index 1a3b91304cdc40cdebf10fbdfa9b17f8699e50c8..d4150f3cd6708863b364afa6f2dfc0df48263889 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -948,7 +948,6 @@ menu "External python modules"
        source "package/python-cheroot/Config.in"
        source "package/python-cherrypy/Config.in"
        source "package/python-click/Config.in"
-       source "package/python-coherence/Config.in"
        source "package/python-colorama/Config.in"
        source "package/python-colorlog/Config.in"
        source "package/python-colorzero/Config.in"

diff --git a/package/python-coherence/0001-Fix-twisted-detection.patch b/package/python-coherence/0001-Fix-twisted-detection.patch
deleted file mode 100644 (file)
index c0e51b9..0000000
--- a/package/python-coherence/0001-Fix-twisted-detection.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3cf8d89cbb44b5c7a0693d0b5d665e68acc3927c Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <wiz@NetBSD.org>
-Date: Tue, 10 May 2016 00:14:33 +0200
-Subject: [PATCH] Fix twisted detection.
-
-Addresses https://github.com/coherence-project/Coherence/issues/25
-
-Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
-Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
----
- coherence/__init__.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/coherence/__init__.py b/coherence/__init__.py
-index 2e4e8f1..4c4d73d 100644
---- a/coherence/__init__.py
-+++ b/coherence/__init__.py
-@@ -24,8 +24,6 @@ try:
-     if twisted_version < Version("twisted", 2, 5, 0):
-         raise ImportError("Twisted >= 2.5 is required. Please install it.")
- 
--    if twisted_web_version < Version("twisted.web", 2, 5, 0):
--        raise ImportError("Twisted.Web >= 2.5 is required. Please install it")
- except ImportError, exc:
-     # log error to stderr, might be useful for debugging purpose
-     for arg in exc.args:
--- 
-2.8.1
-

diff --git a/package/python-coherence/Config.in b/package/python-coherence/Config.in
deleted file mode 100644 (file)
index 0f50080..0000000
--- a/package/python-coherence/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_PYTHON_COHERENCE
-       bool "python-coherence"
-       depends on BR2_PACKAGE_PYTHON
-       select BR2_PACKAGE_PYTHON_TWISTED
-       select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE
-       select BR2_PACKAGE_PYTHON_PYASN1
-       help
-         A DLNA/UPnP Media Server and Framework for the Digital Living.
-
-         https://github.com/coherence-project/Coherence

diff --git a/package/python-coherence/python-coherence.hash b/package/python-coherence/python-coherence.hash
deleted file mode 100644 (file)
index 3c2d45b..0000000
--- a/package/python-coherence/python-coherence.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# Locally computed:
-sha256  97c8b700b3fe73d48eacb259008f410d6567e5d7d1b8e96386f8cc2422135ca5  python-coherence-b7856985fd496689ca1f9024925ae737297c00d1.tar.gz
-sha256  7713ed8484b4d3364c7f6f2c02aed427b06a0159b1f77aecf907d47016812e81  LICENCE

diff --git a/package/python-coherence/python-coherence.mk b/package/python-coherence/python-coherence.mk
deleted file mode 100644 (file)
index 24da7f7..0000000
--- a/package/python-coherence/python-coherence.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# python-coherence
-#
-################################################################################
-
-PYTHON_COHERENCE_VERSION = b7856985fd496689ca1f9024925ae737297c00d1
-PYTHON_COHERENCE_SITE = $(call github,coherence-project,Coherence,$(PYTHON_COHERENCE_VERSION))
-PYTHON_COHERENCE_SETUP_TYPE = setuptools
-PYTHON_COHERENCE_LICENSE = MIT
-PYTHON_COHERENCE_LICENSE_FILES = LICENCE
-
-$(eval $(python-package))

diff --git a/package/python-cryptography/Config.in b/package/python-cryptography/Config.in
index d1c2917ea9dcb9dcaba9cafaaa5582f5c090b014..5a2e6da9007807a96d31df8e9e266e2af7e236b6 100644 (file)
--- a/package/python-cryptography/Config.in
+++ b/package/python-cryptography/Config.in
@@ -1,19 +1,15 @@
 config BR2_PACKAGE_PYTHON_CRYPTOGRAPHY
        bool "python-cryptography"
+       depends on BR2_PACKAGE_PYTHON3 # python-idna
        depends on BR2_INSTALL_LIBSTDCPP # python-pyasn
        select BR2_PACKAGE_OPENSSL
        select BR2_PACKAGE_PYTHON_CFFI # runtime
-       select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime
-       select BR2_PACKAGE_PYTHON_HASHLIB if BR2_PACKAGE_PYTHON # runtime
        select BR2_PACKAGE_PYTHON_IDNA # runtime
-       select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime
        select BR2_PACKAGE_PYTHON_ASN1CRYPTO # runtime
-       select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
-       select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
+       select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
        select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
        select BR2_PACKAGE_PYTHON_SIX # runtime
-       select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime
-       select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime
+       select BR2_PACKAGE_PYTHON3_SSL # runtime
        help
          cryptography is a package designed to expose cryptographic
          primitives and recipes to Python developers.

diff --git a/package/python-docker/Config.in b/package/python-docker/Config.in
index df5e4887f4e318263b928a2f29783da05d1328e3..41b4aacd5e432514dac18247fd7431f6fa4fb374 100644 (file)
--- a/package/python-docker/Config.in
+++ b/package/python-docker/Config.in
@@ -1,10 +1,8 @@
 config BR2_PACKAGE_PYTHON_DOCKER
        bool "python-docker"
-       # docker-engine may be running on another host, so no dependency
-       select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime
-       select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime
-       select BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME \
-              if BR2_PACKAGE_PYTHON # runtime
+       depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna
+       # docker-engine may be running on another host, so no other dependency
+       select BR2_PACKAGE_PYTHON3_SSL # runtime
        select BR2_PACKAGE_PYTHON_REQUESTS # runtime
        select BR2_PACKAGE_PYTHON_SIX # runtime
        select BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT # runtime

diff --git a/package/python-hyperlink/Config.in b/package/python-hyperlink/Config.in
index 8dad0af19ac589e1f1cebc8e81a47a81a6d03d2a..3a85e6f4611c68ec6674e27ac4a6274362375f33 100644 (file)
--- a/package/python-hyperlink/Config.in
+++ b/package/python-hyperlink/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_HYPERLINK
        bool "python-hyperlink"
+       depends on BR2_PACKAGE_PYTHON3 # python-idna
        select BR2_PACKAGE_PYTHON_IDNA # runtime
        help
          A featureful, correct URL for Python.

diff --git a/package/python-ibmiotf/Config.in b/package/python-ibmiotf/Config.in
index 0f5f75be5e5c2cb99f3c20ca12a9fa82085a2c50..3f3f7e196550ca8520c706f4a44847e8d3f34698 100644 (file)
--- a/package/python-ibmiotf/Config.in
+++ b/package/python-ibmiotf/Config.in
@@ -1,12 +1,12 @@
 config BR2_PACKAGE_PYTHON_IBMIOTF
        bool "python-ibmiotf"
+       depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna
        select BR2_PACKAGE_PYTHON_ISO8601 # runtime
        select BR2_PACKAGE_PYTHON_PAHO_MQTT # runtime
        select BR2_PACKAGE_PYTHON_PYTZ # runtime
        select BR2_PACKAGE_PYTHON_REQUESTS # runtime
        select BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT # runtime
-       select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime
-       select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime
+       select BR2_PACKAGE_PYTHON3_SSL # runtime
        help
          Python Client for IBM Watson IoT Platform.
 

diff --git a/package/python-idna/Config.in b/package/python-idna/Config.in
index e3e548d493be0b692f84fdf85f0e3a20b46d7f71..3df634f9bf80c6bcafafeef3010e9527c6abd3e2 100644 (file)
--- a/package/python-idna/Config.in
+++ b/package/python-idna/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_PYTHON_IDNA
        bool "python-idna"
-       select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON
-       select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3
+       depends on BR2_PACKAGE_PYTHON3
+       select BR2_PACKAGE_PYTHON3_UNICODEDATA
        help
          A library to support the Internationalised Domain Names in
          Applications (IDNA) protocol as specified in RFC 5891. This

diff --git a/package/python-idna/python-idna.hash b/package/python-idna/python-idna.hash
index c5f7378fdaba5e053599d3385f9727a419bb7620..08a7be9d567bdaa1b6f21dd0be5b57bd40e77e4a 100644 (file)
--- a/package/python-idna/python-idna.hash
+++ b/package/python-idna/python-idna.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/idna/json
-md5  7a910c706db30d758f377db2762c0f9a  idna-2.10.tar.gz
-sha256  b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6  idna-2.10.tar.gz
+md5  08ea8e2ce09e522424e872409c221138  idna-3.2.tar.gz
+sha256  467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3  idna-3.2.tar.gz
 # Locally computed sha256 checksums
-sha256  412014420d2473dba06117c3d4d9e0eecaa6dde0ca30cd951f4ec2be39426f32  LICENSE.rst
+sha256  a2d6e4d940bd24dbe7b9645cde19a9792cc51db7ae0d5acd301ac860caa3e836  LICENSE.md

diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk
index b4d9839e2925b7f545fa2f11cf955390dfcd0d55..7314d85493e07ab02add0b13c7c8298fbebe0816 100644 (file)
--- a/package/python-idna/python-idna.mk
+++ b/package/python-idna/python-idna.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_IDNA_VERSION = 2.10
+PYTHON_IDNA_VERSION = 3.2
 PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz
-PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/ea/b7/e0e3c1c467636186c39925827be42f16fee389dc404ac29e930e9136be70
+PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/cb/38/4c4d00ddfa48abe616d7e572e02a04273603db446975ab46bbcd36552005
 PYTHON_IDNA_LICENSE = BSD-3-Clause
-PYTHON_IDNA_LICENSE_FILES = LICENSE.rst
+PYTHON_IDNA_LICENSE_FILES = LICENSE.md
 PYTHON_IDNA_SETUP_TYPE = setuptools
 
 $(eval $(python-package))

diff --git a/package/python-influxdb/Config.in b/package/python-influxdb/Config.in
index 6ebbd4aa9c123a26a0979a47a0710b3dbe492155..48c300f90d6a9791fd4daa18f498267e295733f6 100644 (file)
--- a/package/python-influxdb/Config.in
+++ b/package/python-influxdb/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_INFLUXDB
        bool "python-influxdb"
+       depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna
        select BR2_PACKAGE_PYTHON_DATEUTIL # runtime
        select BR2_PACKAGE_PYTHON_MSGPACK # runtime
        select BR2_PACKAGE_PYTHON_PYTZ # runtime

diff --git a/package/python-mwclient/Config.in b/package/python-mwclient/Config.in
index dc93e6c0dffeea538d3eaafb0a14d55454a487a7..1af60fdcd088b360a9e0b69e9ed38a3395a968e6 100644 (file)
--- a/package/python-mwclient/Config.in
+++ b/package/python-mwclient/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_MWCLIENT
        bool "python-mwclient"
+       depends on BR2_PACKAGE_PYTHON3 # python-requests-oauthlib -> python-requests -> python-idna
        select BR2_PACKAGE_PYTHON_REQUESTS_OAUTHLIB # runtime
        select BR2_PACKAGE_PYTHON_SIX # runtime
        help

diff --git a/package/python-pyopenssl/Config.in b/package/python-pyopenssl/Config.in
index c32e211e179c550769ee6aa5fd30ca379cc8b241..95630f2461208c4284ac69a61031c77b6b65e22f 100644 (file)
--- a/package/python-pyopenssl/Config.in
+++ b/package/python-pyopenssl/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_PYOPENSSL
        bool "python-pyopenssl"
+       depends on BR2_PACKAGE_PYTHON3 # python-cryptography -> python-idna
        depends on BR2_INSTALL_LIBSTDCPP # python-cryptography
        select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime
        select BR2_PACKAGE_PYTHON_SIX # runtime

diff --git a/package/python-requests-oauthlib/Config.in b/package/python-requests-oauthlib/Config.in
index 85283b209c419dfe005402ac8d6ff6d482bae9d1..2510644bd15e5fea6b9f78c26b7ba9e494d8edb1 100644 (file)
--- a/package/python-requests-oauthlib/Config.in
+++ b/package/python-requests-oauthlib/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_REQUESTS_OAUTHLIB
        bool "python-requests-oauthlib"
+       depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna
        select BR2_PACKAGE_PYTHON_OAUTHLIB # runtime
        select BR2_PACKAGE_PYTHON_REQUESTS # runtime
        help

diff --git a/package/python-requests-toolbelt/Config.in b/package/python-requests-toolbelt/Config.in
index ba2b95152e0c24c16ac6aa547f627e9e273c7a99..47141c2c8a0dbe63e52e8ed64e6c0df5b117f8ad 100644 (file)
--- a/package/python-requests-toolbelt/Config.in
+++ b/package/python-requests-toolbelt/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT
        bool "python-requests-toolbelt"
+       depends on BR2_PACKAGE_PYTHON3 # python-requests -> python-idna
        select BR2_PACKAGE_PYTHON_REQUESTS # runtime
        help
          A utility belt for advanced users of python-requests.

diff --git a/package/python-requests/Config.in b/package/python-requests/Config.in
index 30158b8d2543f13e9c4cc94477c496ff09c95318..c79815661331c3fbb4a155b123f9dd2e69332c91 100644 (file)
--- a/package/python-requests/Config.in
+++ b/package/python-requests/Config.in
@@ -1,14 +1,12 @@
 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_IDNA # runtime
        select BR2_PACKAGE_PYTHON_URLLIB3 # runtime
-       select BR2_PACKAGE_PYTHON_HASHLIB if BR2_PACKAGE_PYTHON # runtime
-       select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime
-       select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # 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_SSL # runtime
+       select BR2_PACKAGE_PYTHON3_ZLIB # runtime
        help
          Requests is an Apache2 Licensed HTTP library, written in
          Python, for human beings.

diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in
index 0260ab40106b98f964f5b3aeacaa81cb8756dca9..cac1c069122289dc397c5f7fed22d4641ec185e1 100644 (file)
--- a/package/python-service-identity/Config.in
+++ b/package/python-service-identity/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY
        bool "python-service-identity"
+       depends on BR2_PACKAGE_PYTHON3 # python-pyopenssl -> python-cryptography -> python-idna
        depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl
        select BR2_PACKAGE_PYTHON_ATTRS # runtime
        select BR2_PACKAGE_PYTHON_CHARACTERISTIC # runtime
-       select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime
        select BR2_PACKAGE_PYTHON_PYASN1 # runtime
        select BR2_PACKAGE_PYTHON_PYASN1_MODULES # runtime
        select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime

diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in
index 23056e72d2288e5b0fe07b3adf9df5e9fd2c22e4..47719f92bfaba53d77e4cb6afd5f0aefbfdbee0e 100644 (file)
--- a/package/python-treq/Config.in
+++ b/package/python-treq/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_TREQ
        bool "python-treq"
+       depends on BR2_PACKAGE_PYTHON3 # python-idna
        depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl
        select BR2_PACKAGE_PYTHON_ATTRS # runtime
        select BR2_PACKAGE_PYTHON_IDNA # runtime

diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in
index 4e24a3f71af8000909fadf621aee5bf72558ea91..805a1aa345d3aee05719733edf872059041af11d 100644 (file)
--- a/package/python-twisted/Config.in
+++ b/package/python-twisted/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_TWISTED
        bool "python-twisted"
+       depends on BR2_PACKAGE_PYTHON3 # python-hyperlink -> python-idna
        select BR2_PACKAGE_PYTHON_INCREMENTAL
        select BR2_PACKAGE_PYTHON_ATTRS # runtime
        select BR2_PACKAGE_PYTHON_AUTOMAT # runtime

diff --git a/package/python-txdbus/Config.in b/package/python-txdbus/Config.in
index f38bbf93f037f1deabb89bfdffb844941c949160..c7de322f918d1824fe6177ebd6352f25dd22742e 100644 (file)
--- a/package/python-txdbus/Config.in
+++ b/package/python-txdbus/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_TXDBUS
        bool "python-txdbus"
+       depends on BR2_PACKAGE_PYTHON3 # python-twisted -> python-cryptography -> python-idna
        select BR2_PACKAGE_PYTHON_TWISTED # runtime
        select BR2_PACKAGE_PYTHON_SIX # runtime
        help

diff --git a/package/python-txtorcon/Config.in b/package/python-txtorcon/Config.in
index 4f91e7b048d24db87cc05b3e861cfb3f36aad1f3..9677eb4da8fe124c3ee38434dec1473bde9d3cd9 100644 (file)
--- a/package/python-txtorcon/Config.in
+++ b/package/python-txtorcon/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_PYTHON_TXTORCON
        bool "python-txtorcon"
+       depends on BR2_PACKAGE_PYTHON3 # python-idna
        depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl, python-service-identity
        select BR2_PACKAGE_PYTHON_AUTOMAT # runtime
        select BR2_PACKAGE_PYTHON_IDNA # runtime
        select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime
-       select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime
        select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime
        select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime
        select BR2_PACKAGE_PYTHON_TWISTED # runtime