Merge pull request #12483 from jmarcet/docker-compose-fixes

docker-compose: fix depends after merge in master and move to utils

lang/python/python-distro/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-distro
 PKG_VERSION:=1.5.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=distro
 PKG_HASH:=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
@@ -21,7 +21,7 @@ define Package/python3-distro
   SUBMENU:=Python
   TITLE:=Distro - an OS platform information API
   URL:=https://github.com/nir0s/distro
-  DEPENDS:=+python3-light
+  DEPENDS:=+python3-light +python3-logging
   VARIANT:=python3
 endef
 

lang/python/python-dockerpty/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-dockerpty
 PKG_VERSION:=0.4.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=dockerpty
 PKG_HASH:=69a9d69d573a0daa31bcd1c0774eeed5c15c295fe719c61aca550ed1393156ce
@@ -23,7 +23,7 @@ define Package/python3-dockerpty
   SUBMENU:=Python
   TITLE:=Python library to use the pseudo-tty of a docker container
   URL:=https://github.com/d11wtq/dockerpty
-  DEPENDS:=+python3-light +python3-docker +python3-six
+  DEPENDS:=+python3-light +python3-openssl +python3-six
   VARIANT:=python3
 endef
 

lang/python/python-dotenv/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-dotenv
 PKG_VERSION:=0.13.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=python-dotenv
 PKG_HASH:=3b9909bc96b0edc6b01586e1eed05e71174ef4e04c71da5786370cebea53ad74
@@ -21,7 +21,7 @@ define Package/python3-dotenv
   SUBMENU:=Python
   TITLE:=Add .env support to your django/flask apps in development and deployments
   URL:=http://github.com/theskumar/python-dotenv
-  DEPENDS:=+python3-light +python3-click
+  DEPENDS:=+python3-light +python3-logging
   VARIANT:=python3
 endef
 

lang/python/python-jsonschema/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-jsonschema
 PKG_VERSION:=3.2.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=jsonschema
 PKG_HASH:=c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a
@@ -11,6 +11,8 @@ PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
 
+HOST_PYTHON3_PACKAGE_BUILD_DEPENDS=setuptools_scm
+
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
@@ -21,7 +23,8 @@ define Package/python3-jsonschema
   SUBMENU:=Python
   TITLE:=An implementation of JSON Schema validation
   URL:=https://github.com/Julian/jsonschema
-  DEPENDS:=+python3-light +python3-attrs +python3-six +python3-pyrsistent
+  DEPENDS:=+python3-light +python3-attrs +python3-urllib \
+	  +python3-six +python3-pyrsistent +python3-setuptools
   VARIANT:=python3
 endef
 

utils/docker-compose/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=docker-compose
 PKG_VERSION:=1.26.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=docker-compose
 PKG_HASH:=7e836102d139aca667d6af53f0f4d942c9459ec24d6dd4f0203d74359b0fd311
@@ -11,11 +11,9 @@ PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
-include ../pypi.mk
+include ../../lang/python/pypi.mk
 include $(INCLUDE_DIR)/package.mk
-include ../python3-package.mk
-
-PKG_USE_MIPS16:=0
+include ../../lang/python/python3-package.mk
 
 PYTHON3_PKG_SETUP_ARGS:=
 
@@ -26,9 +24,8 @@ define Package/docker-compose
   TITLE:=Docker Compose
   URL:=https://github.com/docker/compose
   DEPENDS+=+docker-ce \
-      +python3 \
+      +python3-light \
       +python3-cached-property \
-      +python3-colorama \
       +python3-distro \
       +python3-distutils \
       +python3-docopt \
@@ -36,9 +33,10 @@ define Package/docker-compose
       +python3-dockerpty \
       +python3-dotenv \
       +python3-jsonschema \
+      +python3-logging \
+      +python3-openssl \
       +python3-pkg-resources \
       +python3-requests \
-      +python3-setuptools \
       +python3-six \
       +python3-texttable \
       +python3-websocket-client \