mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-25 21:08:35 -07:00
f5718394d6
Call pypi-server as an external executable rather than via 'python -m'. This makes it possible to remove PYTHON_USEDEP, and clean py2 support from pypiserver. Signed-off-by: Michał Górny <mgorny@gentoo.org>
38 lines
1.5 KiB
Python
38 lines
1.5 KiB
Python
From f30a24d3dffee78cf0581218d9cca0e395b75f6a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
|
Date: Wed, 8 Jul 2020 09:24:42 +0200
|
|
Subject: [PATCH] Use system pypiserver
|
|
|
|
---
|
|
tests/test_index.py | 7 +------
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
|
diff --git a/tests/test_index.py b/tests/test_index.py
|
|
index bc24367..4971e3f 100644
|
|
--- a/tests/test_index.py
|
|
+++ b/tests/test_index.py
|
|
@@ -52,11 +52,6 @@ class PackageIndexTestCase(unittest.TestCase):
|
|
def setUpClass(cls):
|
|
if cls.run_test_server:
|
|
cls.server = None
|
|
- server_script = os.path.join(HERE, 'pypi-server-standalone.py')
|
|
- if not os.path.exists(server_script):
|
|
- logger.debug('test server not available - some tests '
|
|
- 'will be skipped.')
|
|
- return
|
|
pwdfn = os.path.join(HERE, 'passwords')
|
|
if not os.path.exists(pwdfn): # pragma: no cover
|
|
with open(pwdfn, 'w') as f:
|
|
@@ -65,7 +60,7 @@ class PackageIndexTestCase(unittest.TestCase):
|
|
if not os.path.isdir(pkgdir): # pragma: no cover
|
|
os.mkdir(pkgdir)
|
|
cls.sink = sink = open(os.devnull, 'w')
|
|
- cmd = [sys.executable, 'pypi-server-standalone.py',
|
|
+ cmd = ['pypi-server',
|
|
'-P', 'passwords', 'packages']
|
|
cls.server = subprocess.Popen(cmd, stdout=sink, stderr=sink,
|
|
cwd=HERE)
|
|
--
|
|
2.27.0
|
|
|