Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/files/
Date: Fri, 10 May 2019 22:27:14
Message-Id: 1557527187.7d776dec03d457f8c799c98cc2b4695901bd8330.sping@gentoo
1 commit: 7d776dec03d457f8c799c98cc2b4695901bd8330
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 10 22:25:36 2019 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Fri May 10 22:26:27 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d776dec
7
8 app-emulation/docker-compose: Remove unused patches
9
10 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
11 Package-Manager: Portage-2.3.65, Repoman-2.3.12
12
13 .../files/docker-compose-1.22.0-setup-py.patch | 58 ---------------------
14 .../files/docker-compose-1.23.0-setup-py.patch | 59 ----------------------
15 2 files changed, 117 deletions(-)
16
17 diff --git a/app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch
18 deleted file mode 100644
19 index 191e96d6396..00000000000
20 --- a/app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch
21 +++ /dev/null
22 @@ -1,58 +0,0 @@
23 -From 950506efebe97cb76f6cd3a558bab724452a51e9 Mon Sep 17 00:00:00 2001
24 -From: Sebastian Pipping <sebastian@×××××××.org>
25 -Date: Mon, 24 Sep 2018 17:35:22 +0200
26 -Subject: [PATCH] setup.py: Drop generic upper version boundaries
27 -
28 ----
29 - setup.py | 24 +++++++++++++-------------
30 - 1 file changed, 13 insertions(+), 13 deletions(-)
31 -
32 -diff --git a/setup.py b/setup.py
33 -index e0a26b0..1f9fb7f 100644
34 ---- a/setup.py
35 -+++ b/setup.py
36 -@@ -30,16 +30,16 @@ def find_version(*file_paths):
37 -
38 -
39 - install_requires = [
40 -- 'cached-property >= 1.2.0, < 2',
41 -- 'docopt >= 0.6.1, < 0.7',
42 -- 'PyYAML >= 3.10, < 4',
43 -- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19',
44 -- 'texttable >= 0.9.0, < 0.10',
45 -- 'websocket-client >= 0.32.0, < 1.0',
46 -- 'docker >= 3.4.1, < 4.0',
47 -- 'dockerpty >= 0.4.1, < 0.5',
48 -- 'six >= 1.3.0, < 2',
49 -- 'jsonschema >= 2.5.1, < 3',
50 -+ 'cached-property >= 1.2.0',
51 -+ 'docopt >= 0.6.1',
52 -+ 'PyYAML >= 3.10',
53 -+ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
54 -+ 'texttable >= 0.9.0',
55 -+ 'websocket-client >= 0.32.0',
56 -+ 'docker >= 3.4.1',
57 -+ 'dockerpty >= 0.4.1',
58 -+ 'six >= 1.3.0',
59 -+ 'jsonschema >= 2.5.1',
60 - ]
61 -
62 -
63 -@@ -52,11 +52,11 @@ if sys.version_info[:2] < (3, 4):
64 - tests_require.append('mock >= 1.0.1')
65 -
66 - extras_require = {
67 -- ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
68 -+ ':python_version < "3.4"': ['enum34 >= 1.0.4'],
69 - ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
70 - ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
71 -- ':sys_platform == "win32"': ['colorama >= 0.3.9, < 0.4'],
72 -- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
73 -+ ':sys_platform == "win32"': ['colorama >= 0.3.9'],
74 -+ 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
75 - }
76 -
77 -
78 ---
79 -2.19.0.rc2
80 -
81
82 diff --git a/app-emulation/docker-compose/files/docker-compose-1.23.0-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.23.0-setup-py.patch
83 deleted file mode 100644
84 index c95c776b2c3..00000000000
85 --- a/app-emulation/docker-compose/files/docker-compose-1.23.0-setup-py.patch
86 +++ /dev/null
87 @@ -1,59 +0,0 @@
88 -From c481f53ff75d015b4db37b294c5a2142d0272f32 Mon Sep 17 00:00:00 2001
89 -From: Sebastian Pipping <sebastian@×××××××.org>
90 -Date: Wed, 31 Oct 2018 18:45:59 +0100
91 -Subject: [PATCH] setup.py: Drop generic upper version boundaries
92 -
93 ----
94 - setup.py | 28 ++++++++++++++--------------
95 - 1 file changed, 14 insertions(+), 14 deletions(-)
96 -
97 -diff --git a/setup.py b/setup.py
98 -index 8260ebc..7f76abb 100644
99 ---- a/setup.py
100 -+++ b/setup.py
101 -@@ -30,16 +30,16 @@ def find_version(*file_paths):
102 -
103 -
104 - install_requires = [
105 -- 'cached-property >= 1.2.0, < 2',
106 -- 'docopt >= 0.6.1, < 0.7',
107 -- 'PyYAML >= 3.10, < 4',
108 -- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21',
109 -- 'texttable >= 0.9.0, < 0.10',
110 -- 'websocket-client >= 0.32.0, < 1.0',
111 -- 'docker >= 3.5.0, < 4.0',
112 -- 'dockerpty >= 0.4.1, < 0.5',
113 -- 'six >= 1.3.0, < 2',
114 -- 'jsonschema >= 2.5.1, < 3',
115 -+ 'cached-property >= 1.2.0',
116 -+ 'docopt >= 0.6.1',
117 -+ 'PyYAML >= 3.10',
118 -+ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
119 -+ 'texttable >= 0.9.0',
120 -+ 'websocket-client >= 0.32.0',
121 -+ 'docker >= 3.5.0',
122 -+ 'dockerpty >= 0.4.1',
123 -+ 'six >= 1.3.0',
124 -+ 'jsonschema >= 2.5.1',
125 - ]
126 -
127 -
128 -@@ -52,11 +52,11 @@ if sys.version_info[:2] < (3, 4):
129 - tests_require.append('mock >= 1.0.1')
130 -
131 - extras_require = {
132 -- ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
133 -+ ':python_version < "3.4"': ['enum34 >= 1.0.4'],
134 - ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
135 -- ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
136 -- ':sys_platform == "win32"': ['colorama >= 0.4, < 0.5'],
137 -- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
138 -+ ':python_version < "3.3"': ['ipaddress'],
139 -+ ':sys_platform == "win32"': ['colorama >= 0.4'],
140 -+ 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
141 - }
142 -
143 -
144 ---
145 -2.19.1
146 -