Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/g-sorcery/files/
Date: Sun, 05 Jun 2022 23:03:51
Message-Id: 1654470207.b11278e7657f3dfa58fe490766f2bca445aa9338.conikost@gentoo
1 commit: b11278e7657f3dfa58fe490766f2bca445aa9338
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sat Jun 4 18:43:49 2022 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 5 23:03:27 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b11278e7
7
8 app-portage/g-sorcery: remove unused patch(es)
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Closes: https://github.com/gentoo/gentoo/pull/25752
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 .../files/g-sorcery-0.2.1-py3.7.tests-fix.patch | 140 ---------------------
16 1 file changed, 140 deletions(-)
17
18 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
19 deleted file mode 100644
20 index 84a702413ac8..000000000000
21 --- a/app-portage/g-sorcery/files/g-sorcery-0.2.1-py3.7.tests-fix.patch
22 +++ /dev/null
23 @@ -1,140 +0,0 @@
24 -diff --git a/README.md b/README.md
25 -index 9bdd5b7..c2eb5ad 100644
26 ---- a/README.md
27 -+++ b/README.md
28 -@@ -26,3 +26,5 @@ This project is aimed to create a framework for ebuild-generators for
29 - 3rd party software providers.
30 -
31 - If you want to develop a new backend see [developer's instructions](https://github.com/jauhien/g-sorcery/blob/master/docs/developer_instructions.rst).
32 -+
33 -+[TODO list](https://trello.com/b/8WdY2ZIs/framework-for-automated-ebuild-generators).
34 -diff --git a/scripts/all_pythons.sh b/scripts/all_pythons.sh
35 -index af4c1f1..3c85974 100755
36 ---- a/scripts/all_pythons.sh
37 -+++ b/scripts/all_pythons.sh
38 -@@ -2,7 +2,7 @@
39 -
40 - DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
41 -
42 --for VER in 2.7 3.3 3.4
43 -+for VER in 2.7 3.6 3.7 3.8
44 - do
45 - echo
46 - echo "testing python${VER}"
47 -diff --git a/tests/server.py b/tests/server.py
48 -index 51d49b7..aa895ea 100644
49 ---- a/tests/server.py
50 -+++ b/tests/server.py
51 -@@ -4,20 +4,21 @@
52 - """
53 - server.py
54 - ~~~~~~~~~
55 --
56 -+
57 - test server
58 --
59 -+
60 - :copyright: (c) 2013 by Jauhien Piatlicki
61 - :license: GPL-2, see LICENSE for more details.
62 - """
63 -
64 - import os
65 - import threading
66 -+import time
67 -
68 - from g_sorcery.compatibility import py2k
69 -
70 - if py2k:
71 -- from SocketServer import TCPServer as HTTPServer
72 -+ from SocketServer import TCPServer as HTTPServer
73 - from SimpleHTTPServer import SimpleHTTPRequestHandler
74 - else:
75 - from http.server import HTTPServer
76 -@@ -26,26 +27,27 @@ else:
77 - def HTTPRequestHandlerGenerator(direct):
78 -
79 - class HTTPRequestHandler(SimpleHTTPRequestHandler, object):
80 -- directory = direct
81 -
82 - def __init__(self, request, client_address, server):
83 -+ self.direct = direct
84 - super(HTTPRequestHandler, self).__init__(request, client_address, server)
85 -
86 - def translate_path(self, path):
87 -- return os.path.join(self.directory, path[1:])
88 -+ return os.path.join(self.direct, path[1:])
89 -
90 - return HTTPRequestHandler
91 -
92 --
93 -+
94 - class Server(threading.Thread):
95 - def __init__(self, directory, port=8080):
96 - super(Server, self).__init__()
97 - HTTPServer.allow_reuse_address = True
98 - server_address = ('127.0.0.1', port)
99 - self.httpd = HTTPServer(server_address, HTTPRequestHandlerGenerator(directory))
100 --
101 -+
102 - def run(self):
103 - self.httpd.serve_forever()
104 -
105 - def shutdown(self):
106 - self.httpd.shutdown()
107 -+ time.sleep(0.5)
108 -diff --git a/tests/test_DBGenerator.py b/tests/test_DBGenerator.py
109 -index 9a47c86..3c28278 100644
110 ---- a/tests/test_DBGenerator.py
111 -+++ b/tests/test_DBGenerator.py
112 -@@ -4,9 +4,9 @@
113 - """
114 - test_DBGenerator.py
115 - ~~~~~~~~~~~~~~~~~~~
116 --
117 -+
118 - DBGenerator test suite
119 --
120 -+
121 - :copyright: (c) 2013 by Jauhien Piatlicki
122 - :license: GPL-2, see LICENSE for more details.
123 - """
124 -@@ -81,11 +81,13 @@ class TestDBGenerator(BaseTest):
125 - srv = Server(orig_tempdir.name)
126 - srv.start()
127 -
128 -- pkg_db = db_generator(self.tempdir.name, "test_repo",
129 -+ try:
130 -+ pkg_db = db_generator(self.tempdir.name, "test_repo",
131 - common_config = common_config, config = config)
132 -
133 -- srv.shutdown()
134 -- srv.join()
135 -+ finally:
136 -+ srv.shutdown()
137 -+ srv.join()
138 -
139 - self.assertEqual(set(pkg_db.list_categories()), set(["app-test1", "app-test2"]))
140 - self.assertTrue(pkg_db.in_category("app-test1", "test"))
141 -diff --git a/tests/test_PackageDB.py b/tests/test_PackageDB.py
142 -index 152c605..8be8f8a 100644
143 ---- a/tests/test_PackageDB.py
144 -+++ b/tests/test_PackageDB.py
145 -@@ -70,11 +70,13 @@ class TestPackageDB(BaseTest):
146 -
147 - srv = Server(orig_tempdir.name, port=port)
148 - srv.start()
149 -- self.assertRaises(IntegrityError, test_db.sync, sync_address)
150 -- os.system("cd " + orig_tempdir.name + " && mv good.tar.gz dummy.tar.gz")
151 -- test_db.sync(sync_address)
152 -- srv.shutdown()
153 -- srv.join()
154 -+ try:
155 -+ self.assertRaises(IntegrityError, test_db.sync, sync_address)
156 -+ os.system("cd " + orig_tempdir.name + " && mv good.tar.gz dummy.tar.gz")
157 -+ test_db.sync(sync_address)
158 -+ finally:
159 -+ srv.shutdown()
160 -+ srv.join()
161 - test_db.read()
162 - self.assertEqual(orig_db.database, test_db.database)
163 - self.assertEqual(orig_db.get_common_data("app-test1"), test_db.get_common_data("app-test1"))