meta-virtualization/recipes-containers/docker-compose/files/0001-setup.py-remove-maximum-version-requirements.patch
Bruce Ashfield b63523eeac docker-compose: update to 1.29.1
The following changes are part of this version bump:

1.29.1 (2021-04-13)
-------------------

Bugs
  Fix for invalid handler warning on Windows builds
  Fix config hash to trigger container recreation on IPC mode updates
  Fix conversion map for placement.max_replicas_per_node
  Remove extra scan suggestion on build

1.29.0 (2021-04-06)
-------------------

Features
  Add profile filter to docker-compose config
  Add a depends_on condition to wait for successful service completion

Miscellaneous
  Add image scan message on build
  Update warning message for --no-ansi to mention --ansi never as alternative

  Bump docker-py to 5.0.0
  Bump PyYAML to 5.4.1
  Bump python-dotenv to 0.17.0

1.28.6 (2021-03-23)
-------------------

Bugs
  Make --env-file relative to the current working directory and error out
  for invalid paths. Environment file paths set with --env-file are
  relative to the current working directory while the default .env file is
  located in the project directory which by default is the base directory
  of the Compose file.

  Fix missing service property storage_opt by updating the compose schema

  Fix build extra_hosts list format

  Remove extra error message on exec

Miscellaneous
  Add compose.yml and compose.yaml to default filename list

1.28.5 (2021-02-25)
-------------------

Bugs
  Fix OpenSSL version mismatch error when shelling out to the ssh client
  (via bump to docker-py 4.4.4 which contains the fix)

  Add missing build flags to the native builder: platform, isolation and extra_hosts

  Remove info message on native build

  Avoid fetching logs when service logging driver is set to 'none'

1.28.4 (2021-02-18)
--------------------

Bugs
  Fix SSH port parsing by bumping docker-py to 4.4.3
Miscellaneous
  Bump Python to 3.7.10

1.28.3 (2021-02-17)
-------------------

Bugs
  Fix SSH hostname parsing when it contains leading s/h, and remove the
  quiet option that was hiding the error (via docker-py bump to 4.4.2)

  Fix key error for '--no-log-prefix' option

  Fix incorrect CLI environment variable name for service profiles:
  COMPOSE_PROFILES instead of COMPOSE_PROFILE

  Fix fish completion

Miscellaneous
  Bump cryptography to 3.3.2

  Remove log driver filter

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
2021-04-15 10:40:01 -04:00

58 lines
1.7 KiB
Diff

From e3aca6421e003d03d119e69bf3d6b30bb5c662c9 Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Fri, 22 Nov 2019 09:24:58 +0800
Subject: [PATCH] setup.py: remove maximum version requirements
Remove maximum version requirements so that docker-compose will not
require old version recipes.
Upstream-Status: Inappropriate [OE Specific]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
---
setup.py | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
Index: docker-compose-1.29.1/setup.py
===================================================================
--- docker-compose-1.29.1.orig/setup.py
+++ docker-compose-1.29.1/setup.py
@@ -25,16 +25,21 @@
install_requires = [
- 'docopt >= 0.6.1, < 1',
- 'PyYAML >= 3.10, < 6',
- 'requests >= 2.20.0, < 3',
- 'texttable >= 0.9.0, < 2',
+ 'docopt >= 0.6.1',
+ 'PyYAML >= 3.10',
+ 'requests >= 2.20.0',
+ 'texttable >= 0.9.0',
'websocket-client >= 0.32.0, < 1',
'distro >= 1.5.0, < 2',
- 'docker[ssh] >= 5',
+ 'docker[ssh] >= 4.4.0, < 5',
'dockerpty >= 0.4.1, < 1',
'jsonschema >= 2.5.1, < 4',
- 'python-dotenv >= 0.13.0, < 1',
+ 'websocket-client >= 0.32.0',
+ 'distro >= 1.5.0',
+ 'docker[ssh] >= 5',
+ 'dockerpty >= 0.4.1',
+ 'jsonschema >= 2.5.1',
+ 'python-dotenv >= 0.13.0',
]
@@ -51,7 +56,7 @@
':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
':python_version < "3.8"': ['cached-property >= 1.2.0, < 2'],
':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
+ 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
'tests': tests_require,
}