1 |
commit: 2ced56cbde6e937a80c58559122660e8b5c64d17 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 23 19:27:51 2020 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 24 21:41:07 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ced56cb |
7 |
|
8 |
app-portage/g-sorcery: Add py 3.7, 3.8 |
9 |
|
10 |
Fix test fails due to class variables inheritence change. |
11 |
|
12 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
13 |
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> |
14 |
|
15 |
.../files/g-sorcery-0.2.1-py3.7.tests-fix.patch | 140 +++++++++++++++++++++ |
16 |
app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild | 8 +- |
17 |
2 files changed, 146 insertions(+), 2 deletions(-) |
18 |
|
19 |
diff --git a/app-portage/g-sorcery/files/g-sorcery-0.2.1-py3.7.tests-fix.patch b/app-portage/g-sorcery/files/g-sorcery-0.2.1-py3.7.tests-fix.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..84a702413ac |
22 |
--- /dev/null |
23 |
+++ b/app-portage/g-sorcery/files/g-sorcery-0.2.1-py3.7.tests-fix.patch |
24 |
@@ -0,0 +1,140 @@ |
25 |
+diff --git a/README.md b/README.md |
26 |
+index 9bdd5b7..c2eb5ad 100644 |
27 |
+--- a/README.md |
28 |
++++ b/README.md |
29 |
+@@ -26,3 +26,5 @@ This project is aimed to create a framework for ebuild-generators for |
30 |
+ 3rd party software providers. |
31 |
+ |
32 |
+ If you want to develop a new backend see [developer's instructions](https://github.com/jauhien/g-sorcery/blob/master/docs/developer_instructions.rst). |
33 |
++ |
34 |
++[TODO list](https://trello.com/b/8WdY2ZIs/framework-for-automated-ebuild-generators). |
35 |
+diff --git a/scripts/all_pythons.sh b/scripts/all_pythons.sh |
36 |
+index af4c1f1..3c85974 100755 |
37 |
+--- a/scripts/all_pythons.sh |
38 |
++++ b/scripts/all_pythons.sh |
39 |
+@@ -2,7 +2,7 @@ |
40 |
+ |
41 |
+ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" |
42 |
+ |
43 |
+-for VER in 2.7 3.3 3.4 |
44 |
++for VER in 2.7 3.6 3.7 3.8 |
45 |
+ do |
46 |
+ echo |
47 |
+ echo "testing python${VER}" |
48 |
+diff --git a/tests/server.py b/tests/server.py |
49 |
+index 51d49b7..aa895ea 100644 |
50 |
+--- a/tests/server.py |
51 |
++++ b/tests/server.py |
52 |
+@@ -4,20 +4,21 @@ |
53 |
+ """ |
54 |
+ server.py |
55 |
+ ~~~~~~~~~ |
56 |
+- |
57 |
++ |
58 |
+ test server |
59 |
+- |
60 |
++ |
61 |
+ :copyright: (c) 2013 by Jauhien Piatlicki |
62 |
+ :license: GPL-2, see LICENSE for more details. |
63 |
+ """ |
64 |
+ |
65 |
+ import os |
66 |
+ import threading |
67 |
++import time |
68 |
+ |
69 |
+ from g_sorcery.compatibility import py2k |
70 |
+ |
71 |
+ if py2k: |
72 |
+- from SocketServer import TCPServer as HTTPServer |
73 |
++ from SocketServer import TCPServer as HTTPServer |
74 |
+ from SimpleHTTPServer import SimpleHTTPRequestHandler |
75 |
+ else: |
76 |
+ from http.server import HTTPServer |
77 |
+@@ -26,26 +27,27 @@ else: |
78 |
+ def HTTPRequestHandlerGenerator(direct): |
79 |
+ |
80 |
+ class HTTPRequestHandler(SimpleHTTPRequestHandler, object): |
81 |
+- directory = direct |
82 |
+ |
83 |
+ def __init__(self, request, client_address, server): |
84 |
++ self.direct = direct |
85 |
+ super(HTTPRequestHandler, self).__init__(request, client_address, server) |
86 |
+ |
87 |
+ def translate_path(self, path): |
88 |
+- return os.path.join(self.directory, path[1:]) |
89 |
++ return os.path.join(self.direct, path[1:]) |
90 |
+ |
91 |
+ return HTTPRequestHandler |
92 |
+ |
93 |
+- |
94 |
++ |
95 |
+ class Server(threading.Thread): |
96 |
+ def __init__(self, directory, port=8080): |
97 |
+ super(Server, self).__init__() |
98 |
+ HTTPServer.allow_reuse_address = True |
99 |
+ server_address = ('127.0.0.1', port) |
100 |
+ self.httpd = HTTPServer(server_address, HTTPRequestHandlerGenerator(directory)) |
101 |
+- |
102 |
++ |
103 |
+ def run(self): |
104 |
+ self.httpd.serve_forever() |
105 |
+ |
106 |
+ def shutdown(self): |
107 |
+ self.httpd.shutdown() |
108 |
++ time.sleep(0.5) |
109 |
+diff --git a/tests/test_DBGenerator.py b/tests/test_DBGenerator.py |
110 |
+index 9a47c86..3c28278 100644 |
111 |
+--- a/tests/test_DBGenerator.py |
112 |
++++ b/tests/test_DBGenerator.py |
113 |
+@@ -4,9 +4,9 @@ |
114 |
+ """ |
115 |
+ test_DBGenerator.py |
116 |
+ ~~~~~~~~~~~~~~~~~~~ |
117 |
+- |
118 |
++ |
119 |
+ DBGenerator test suite |
120 |
+- |
121 |
++ |
122 |
+ :copyright: (c) 2013 by Jauhien Piatlicki |
123 |
+ :license: GPL-2, see LICENSE for more details. |
124 |
+ """ |
125 |
+@@ -81,11 +81,13 @@ class TestDBGenerator(BaseTest): |
126 |
+ srv = Server(orig_tempdir.name) |
127 |
+ srv.start() |
128 |
+ |
129 |
+- pkg_db = db_generator(self.tempdir.name, "test_repo", |
130 |
++ try: |
131 |
++ pkg_db = db_generator(self.tempdir.name, "test_repo", |
132 |
+ common_config = common_config, config = config) |
133 |
+ |
134 |
+- srv.shutdown() |
135 |
+- srv.join() |
136 |
++ finally: |
137 |
++ srv.shutdown() |
138 |
++ srv.join() |
139 |
+ |
140 |
+ self.assertEqual(set(pkg_db.list_categories()), set(["app-test1", "app-test2"])) |
141 |
+ self.assertTrue(pkg_db.in_category("app-test1", "test")) |
142 |
+diff --git a/tests/test_PackageDB.py b/tests/test_PackageDB.py |
143 |
+index 152c605..8be8f8a 100644 |
144 |
+--- a/tests/test_PackageDB.py |
145 |
++++ b/tests/test_PackageDB.py |
146 |
+@@ -70,11 +70,13 @@ class TestPackageDB(BaseTest): |
147 |
+ |
148 |
+ srv = Server(orig_tempdir.name, port=port) |
149 |
+ srv.start() |
150 |
+- self.assertRaises(IntegrityError, test_db.sync, sync_address) |
151 |
+- os.system("cd " + orig_tempdir.name + " && mv good.tar.gz dummy.tar.gz") |
152 |
+- test_db.sync(sync_address) |
153 |
+- srv.shutdown() |
154 |
+- srv.join() |
155 |
++ try: |
156 |
++ self.assertRaises(IntegrityError, test_db.sync, sync_address) |
157 |
++ os.system("cd " + orig_tempdir.name + " && mv good.tar.gz dummy.tar.gz") |
158 |
++ test_db.sync(sync_address) |
159 |
++ finally: |
160 |
++ srv.shutdown() |
161 |
++ srv.join() |
162 |
+ test_db.read() |
163 |
+ self.assertEqual(orig_db.database, test_db.database) |
164 |
+ self.assertEqual(orig_db.get_common_data("app-test1"), test_db.get_common_data("app-test1")) |
165 |
|
166 |
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild |
167 |
index 6bb6f3199cc..7a60508035b 100644 |
168 |
--- a/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild |
169 |
+++ b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild |
170 |
@@ -3,7 +3,7 @@ |
171 |
|
172 |
EAPI=6 |
173 |
|
174 |
-PYTHON_COMPAT=(python3_6) |
175 |
+PYTHON_COMPAT=( python{3_6,3_7,3_8} ) |
176 |
|
177 |
inherit distutils-r1 prefix |
178 |
|
179 |
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jauhien/g-sorcery/archive/${PV}.tar.gz -> ${P}.tar.g |
180 |
|
181 |
LICENSE="GPL-2" |
182 |
SLOT="0" |
183 |
-IUSE="bson git" |
184 |
+IUSE="bson git test" |
185 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
186 |
|
187 |
DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
188 |
@@ -22,6 +22,10 @@ DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
189 |
RDEPEND="${DEPEND}" |
190 |
PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]" |
191 |
|
192 |
+PATCHES=( |
193 |
+ "${FILESDIR}/g-sorcery-0.2.1-py3.7.tests-fix.patch" |
194 |
+) |
195 |
+ |
196 |
src_prepare() { |
197 |
hprefixify setup.py |
198 |
default |