mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-16 14:29:05 -07:00
app-containers/docker-compose: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mm1ke@gentoo.org>
This commit is contained in:
@@ -1,66 +0,0 @@
|
||||
From 6829b2c1885b3a0ff758751db2c936ef384d00f9 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Pipping <sebastian@pipping.org>
|
||||
Date: Wed, 7 Apr 2021 00:46:38 +0200
|
||||
Subject: [PATCH] setup.py: Drop generic upper version boundaries
|
||||
|
||||
---
|
||||
setup.py | 32 ++++++++++++++++----------------
|
||||
1 file changed, 16 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index aaf33f7..74be464 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -25,33 +25,33 @@ def find_version(*file_paths):
|
||||
|
||||
|
||||
install_requires = [
|
||||
- 'docopt >= 0.6.1, < 1',
|
||||
- 'PyYAML >= 3.10, < 6',
|
||||
- 'requests >= 2.20.0, < 3',
|
||||
- 'texttable >= 0.9.0, < 2',
|
||||
- 'websocket-client >= 0.32.0, < 1',
|
||||
- 'distro >= 1.5.0, < 2',
|
||||
+ 'docopt >= 0.6.1',
|
||||
+ 'PyYAML >= 3.10',
|
||||
+ 'requests >= 2.20.0',
|
||||
+ 'texttable >= 0.9.0',
|
||||
+ 'websocket-client >= 0.32.0',
|
||||
+ 'distro >= 1.5.0',
|
||||
'docker[ssh] >= 5',
|
||||
- 'dockerpty >= 0.4.1, < 1',
|
||||
- 'jsonschema >= 2.5.1, < 4',
|
||||
- 'python-dotenv >= 0.13.0, < 1',
|
||||
+ 'dockerpty >= 0.4.1',
|
||||
+ 'jsonschema >= 2.5.1',
|
||||
+ 'python-dotenv >= 0.13.0',
|
||||
]
|
||||
|
||||
|
||||
tests_require = [
|
||||
- 'ddt >= 1.2.2, < 2',
|
||||
- 'pytest < 6',
|
||||
+ 'ddt >= 1.2.2',
|
||||
+ 'pytest',
|
||||
]
|
||||
|
||||
|
||||
if sys.version_info[:2] < (3, 4):
|
||||
- tests_require.append('mock >= 1.0.1, < 4')
|
||||
+ tests_require.append('mock >= 1.0.1')
|
||||
|
||||
extras_require = {
|
||||
- ':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'],
|
||||
+ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
|
||||
+ ':python_version < "3.8"': ['cached-property >= 1.2.0'],
|
||||
+ ':sys_platform == "win32"': ['colorama >= 0.4'],
|
||||
+ 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
|
||||
'tests': tests_require,
|
||||
}
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
From 1e838052b7ccc2a5bb6b674154450a4411de9e15 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Pipping <sebastian@pipping.org>
|
||||
Date: Mon, 8 Jan 2024 21:28:27 +0100
|
||||
Subject: [PATCH] compose/cli/docker_client.py: Quickfix for
|
||||
>=dev-python/docker-7
|
||||
|
||||
Symptom was:
|
||||
> # docker-compose build
|
||||
> Traceback (most recent call last):
|
||||
> [..]
|
||||
> File "[..]/python3.12/site-packages/compose/cli/docker_client.py", line 124, in docker_client
|
||||
> kwargs = kwargs_from_env(environment=environment, ssl_version=tls_version)
|
||||
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
> TypeError: kwargs_from_env() got an unexpected keyword argument 'ssl_version'
|
||||
|
||||
Related: https://stackoverflow.com/a/77638834/11626624
|
||||
---
|
||||
compose/cli/docker_client.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
|
||||
index e4a0fea..f550e20 100644
|
||||
--- a/compose/cli/docker_client.py
|
||||
+++ b/compose/cli/docker_client.py
|
||||
@@ -121,7 +121,7 @@ def docker_client(environment, version=None, context=None, tls_version=None):
|
||||
according to the same logic as the official Docker client.
|
||||
"""
|
||||
try:
|
||||
- kwargs = kwargs_from_env(environment=environment, ssl_version=tls_version)
|
||||
+ kwargs = kwargs_from_env(environment=environment)
|
||||
except TLSParameterError:
|
||||
raise UserError(
|
||||
"TLS configuration is invalid - make sure your DOCKER_TLS_VERIFY "
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
From e84ec8f7ed416df359b8e26f86232b5c8c1b41d4 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Pipping <sebastian@pipping.org>
|
||||
Date: Fri, 28 Mar 2025 19:42:43 +0100
|
||||
Subject: [PATCH] Replace pipes.quote by shlex.quote for Python 3.13
|
||||
|
||||
---
|
||||
compose/cli/main.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/compose/cli/main.py b/compose/cli/main.py
|
||||
index fabd608..fe6ccc2 100644
|
||||
--- a/compose/cli/main.py
|
||||
+++ b/compose/cli/main.py
|
||||
@@ -2,8 +2,8 @@ import contextlib
|
||||
import functools
|
||||
import json
|
||||
import logging
|
||||
-import pipes
|
||||
import re
|
||||
+import shlex
|
||||
import subprocess
|
||||
import sys
|
||||
from distutils.spawn import find_executable
|
||||
@@ -1579,7 +1579,7 @@ def call_docker(args, dockeropts, environment):
|
||||
)
|
||||
|
||||
args = [executable_path] + tls_options + args
|
||||
- log.debug(" ".join(map(pipes.quote, args)))
|
||||
+ log.debug(" ".join(map(shlex.quote, args)))
|
||||
|
||||
filtered_env = {k: v for k, v in environment.items() if v is not None}
|
||||
|
||||
--
|
||||
2.48.1
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From 988f954a7e185c521e7c0f720684e8a53068b136 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Pipping <sebastian@pipping.org>
|
||||
Date: Thu, 15 Dec 2022 18:11:03 +0100
|
||||
Subject: [PATCH] tests/unit/cli_test.py: Fix access to
|
||||
py._path.local.LocalPath
|
||||
|
||||
.. for test CLITestCase.test_default_project_name:
|
||||
|
||||
> class CLITestCase(unittest.TestCase):
|
||||
>
|
||||
> def test_default_project_name(self):
|
||||
> test_dir = py._path.local.LocalPath('tests/fixtures/simple-composefile')
|
||||
> [..]
|
||||
---
|
||||
tests/unit/cli_test.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
|
||||
index fa6e767..83ecef8 100644
|
||||
--- a/tests/unit/cli_test.py
|
||||
+++ b/tests/unit/cli_test.py
|
||||
@@ -4,7 +4,7 @@ import tempfile
|
||||
from io import StringIO
|
||||
|
||||
import docker
|
||||
-import py
|
||||
+import py._path.local
|
||||
import pytest
|
||||
from docker.constants import DEFAULT_DOCKER_API_VERSION
|
||||
|
||||
--
|
||||
2.39.0
|
||||
|
||||
Reference in New Issue
Block a user