From 42ec3cb5bf5a93186bc2e709a5b67981718bb61a Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Sat, 6 Feb 2021 13:01:33 -0500
Subject: docker-compose: update to 1.28.2

Along with the version bump, we refresh our dependency patch to
apply.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 ...up.py-remove-maximum-version-requirements.patch | 19 +++++-----
 .../python3-docker-compose_1.27.4.bb               | 41 ---------------------
 .../python3-docker-compose_1.28.2.bb               | 42 ++++++++++++++++++++++
 3 files changed, 50 insertions(+), 52 deletions(-)
 delete mode 100644 recipes-containers/docker-compose/python3-docker-compose_1.27.4.bb
 create mode 100644 recipes-containers/docker-compose/python3-docker-compose_1.28.2.bb

diff --git a/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch b/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch
index 2c25f69d..2576bb1d 100644
--- a/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch
+++ b/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch
@@ -14,11 +14,11 @@ Signed-off-by: Ming Liu <liu.ming50@gmail.com>
  setup.py | 24 ++++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)
 
-diff --git a/setup.py b/setup.py
-index e0d4340e..80ffefe5 100644
---- a/setup.py
-+++ b/setup.py
-@@ -25,17 +25,17 @@ def find_version(*file_paths):
+Index: docker-compose-1.28.2/setup.py
+===================================================================
+--- docker-compose-1.28.2.orig/setup.py
++++ docker-compose-1.28.2/setup.py
+@@ -25,17 +25,17 @@
  
  
  install_requires = [
@@ -29,7 +29,7 @@ index e0d4340e..80ffefe5 100644
 -    'texttable >= 0.9.0, < 2',
 -    'websocket-client >= 0.32.0, < 1',
 -    'distro >= 1.5.0, < 2',
--    'docker[ssh] >= 4.3.1, < 5',
+-    'docker[ssh] >= 4.4.0, < 5',
 -    'dockerpty >= 0.4.1, < 1',
 -    'jsonschema >= 2.5.1, < 4',
 -    'python-dotenv >= 0.13.0, < 1',
@@ -40,14 +40,14 @@ index e0d4340e..80ffefe5 100644
 +    'texttable >= 0.9.0',
 +    'websocket-client >= 0.32.0',
 +    'distro >= 1.5.0',
-+    'docker[ssh] >= 4.3.1',
++    'docker[ssh] >= 4.4.0',
 +    'dockerpty >= 0.4.1',
 +    'jsonschema >= 2.5.1',
 +    'python-dotenv >= 0.13.0',
  ]
  
  
-@@ -51,7 +51,7 @@ if sys.version_info[:2] < (3, 4):
+@@ -51,7 +51,7 @@
  extras_require = {
      ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
      ':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
@@ -56,6 +56,3 @@ index e0d4340e..80ffefe5 100644
      'tests': tests_require,
  }
  
--- 
-2.28.0
-
diff --git a/recipes-containers/docker-compose/python3-docker-compose_1.27.4.bb b/recipes-containers/docker-compose/python3-docker-compose_1.27.4.bb
deleted file mode 100644
index 1096d31d..00000000
--- a/recipes-containers/docker-compose/python3-docker-compose_1.27.4.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-SUMMARY = "Multi-container orchestration for Docker"
-HOMEPAGE = "https://www.docker.com/"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=435b266b3899aa8a959f17d41c56def8"
-
-inherit pypi setuptools3
-
-SRC_URI[md5sum] = "6c25d3b92596dc529edc337cc837eae1"
-SRC_URI[sha256sum] = "5a5690f24c27d4b43dcbe6b3fae91ba680713208e99ee863352b3bae37bcaa83"
-
-SRC_URI += "file://0001-setup.py-remove-maximum-version-requirements.patch \
-            file://0001-setup.py-import-fastentrypoints.patch \
-           "
-
-DEPENDS += "${PYTHON_PN}-fastentrypoints-native"
-
-RDEPENDS_${PN} = "\
-    ${PYTHON_PN}-cached-property \
-    ${PYTHON_PN}-certifi \
-    ${PYTHON_PN}-chardet \
-    ${PYTHON_PN}-colorama \
-    ${PYTHON_PN}-distro \
-    ${PYTHON_PN}-docker \
-    ${PYTHON_PN}-docker-pycreds \
-    ${PYTHON_PN}-dockerpty \
-    ${PYTHON_PN}-docopt \
-    ${PYTHON_PN}-dotenv \
-    ${PYTHON_PN}-fcntl \
-    ${PYTHON_PN}-idna \
-    ${PYTHON_PN}-jsonschema \
-    ${PYTHON_PN}-misc \
-    ${PYTHON_PN}-paramiko \
-    ${PYTHON_PN}-pyyaml \
-    ${PYTHON_PN}-requests \
-    ${PYTHON_PN}-six \
-    ${PYTHON_PN}-terminal \
-    ${PYTHON_PN}-texttable \
-    ${PYTHON_PN}-urllib3 \
-    ${PYTHON_PN}-wcwidth \
-    ${PYTHON_PN}-websocket-client \
-"
diff --git a/recipes-containers/docker-compose/python3-docker-compose_1.28.2.bb b/recipes-containers/docker-compose/python3-docker-compose_1.28.2.bb
new file mode 100644
index 00000000..1c1aa9bc
--- /dev/null
+++ b/recipes-containers/docker-compose/python3-docker-compose_1.28.2.bb
@@ -0,0 +1,42 @@
+SUMMARY = "Multi-container orchestration for Docker"
+HOMEPAGE = "https://www.docker.com/"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=435b266b3899aa8a959f17d41c56def8"
+
+inherit pypi setuptools3
+
+SRC_URI[md5sum] = "48486752654e04eef6c8a79f0d279b30"
+SRC_URI[sha256sum] = "2f148b590414915d029dad7551f4cdf0b03a774dc9baa674480217236d260cc1"
+
+
+SRC_URI += "file://0001-setup.py-remove-maximum-version-requirements.patch \
+            file://0001-setup.py-import-fastentrypoints.patch \
+           "
+
+DEPENDS += "${PYTHON_PN}-fastentrypoints-native"
+
+RDEPENDS_${PN} = "\
+    ${PYTHON_PN}-cached-property \
+    ${PYTHON_PN}-certifi \
+    ${PYTHON_PN}-chardet \
+    ${PYTHON_PN}-colorama \
+    ${PYTHON_PN}-distro \
+    ${PYTHON_PN}-docker \
+    ${PYTHON_PN}-docker-pycreds \
+    ${PYTHON_PN}-dockerpty \
+    ${PYTHON_PN}-docopt \
+    ${PYTHON_PN}-dotenv \
+    ${PYTHON_PN}-fcntl \
+    ${PYTHON_PN}-idna \
+    ${PYTHON_PN}-jsonschema \
+    ${PYTHON_PN}-misc \
+    ${PYTHON_PN}-paramiko \
+    ${PYTHON_PN}-pyyaml \
+    ${PYTHON_PN}-requests \
+    ${PYTHON_PN}-six \
+    ${PYTHON_PN}-terminal \
+    ${PYTHON_PN}-texttable \
+    ${PYTHON_PN}-urllib3 \
+    ${PYTHON_PN}-wcwidth \
+    ${PYTHON_PN}-websocket-client \
+"
-- 
cgit v1.2.3-54-g00ecf