summaryrefslogtreecommitdiff
path: root/dev-python/distlib/files
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/distlib/files')
-rw-r--r--dev-python/distlib/files/distlib-0.3.9-system-pypiserver.patch25
-rw-r--r--dev-python/distlib/files/distlib-0.4.0-py314-test.patch28
-rw-r--r--dev-python/distlib/files/distlib-0.4.0-py315.patch51
3 files changed, 0 insertions, 104 deletions
diff --git a/dev-python/distlib/files/distlib-0.3.9-system-pypiserver.patch b/dev-python/distlib/files/distlib-0.3.9-system-pypiserver.patch
deleted file mode 100644
index 42c3557a778c..000000000000
--- a/dev-python/distlib/files/distlib-0.3.9-system-pypiserver.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/tests/test_index.py b/tests/test_index.py
-index 95b1f05..984e241 100644
---- a/tests/test_index.py
-+++ b/tests/test_index.py
-@@ -60,11 +60,6 @@ class PackageIndexTestCase(DistlibTestCase):
- 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:
-@@ -76,7 +71,7 @@ class PackageIndexTestCase(DistlibTestCase):
- os.close(fd)
- cls.sink = sink = open(cls.sinkfile, 'w')
- cmd = [
-- sys.executable, 'pypi-server-standalone.py', '--interface', '127.0.0.1', '--port', TEST_SERVER_PORT,
-+ 'pypi-server', '--interface', '127.0.0.1', '--port', TEST_SERVER_PORT,
- '-P', 'passwords', 'packages'
- ]
- cls.server = subprocess.Popen(cmd, stdout=sink, stderr=sink, cwd=HERE)
diff --git a/dev-python/distlib/files/distlib-0.4.0-py314-test.patch b/dev-python/distlib/files/distlib-0.4.0-py314-test.patch
deleted file mode 100644
index cf08838092a4..000000000000
--- a/dev-python/distlib/files/distlib-0.4.0-py314-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6286442857de9f734686d08f0e59ca8048ee357a Mon Sep 17 00:00:00 2001
-From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
-Date: Fri, 18 Jul 2025 07:59:29 +0100
-Subject: [PATCH] Fix #251: Use more appropriate function in test.
-
---- a/tests/test_scripts.py
-+++ b/tests/test_scripts.py
-@@ -341,10 +341,8 @@ def test_dry_run(self):
- def test_script_run(self):
- if sys.version_info[:2] < (3, 13):
- target = 'cgi:print_directory'
-- elif os.name != 'nt':
-- target = 'test.support.interpreters:list_all'
- else:
-- raise unittest.SkipTest('test not available on Windows for Python >= 3.13')
-+ target = 'logging:getHandlerNames'
- files = self.maker.make('test = %s' % target)
- self.assertEqual(len(files), 2)
- p = subprocess.Popen([sys.executable, files[0]], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-@@ -353,7 +351,7 @@ def test_script_run(self):
- self.assertIn(b'<H3>Current Working Directory:</H3>', stdout)
- self.assertIn(os.getcwd().encode('utf-8'), stdout)
- else:
-- self.assertIn(b'[Interpreter(0)]', stderr)
-+ self.assertIn(b'frozenset(', stderr)
- self.assertEqual(p.returncode, 1)
-
- @unittest.skipUnless(os.name == 'posix', 'Test only valid for POSIX')
diff --git a/dev-python/distlib/files/distlib-0.4.0-py315.patch b/dev-python/distlib/files/distlib-0.4.0-py315.patch
deleted file mode 100644
index 4a27f0203705..000000000000
--- a/dev-python/distlib/files/distlib-0.4.0-py315.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 53a497ae37b3220662ac177e9477e9551e4e37b0 Mon Sep 17 00:00:00 2001
-From: Victor Stinner <vstinner@python.org>
-Date: Wed, 14 Jan 2026 14:32:40 +0100
-Subject: [PATCH] Update cache_from_source() for Python 3.15
-
-The debug_override parameter of cache_from_source() is deprecated in
-Python 3.14. The function docstring says:
-
- The debug_override parameter is deprecated. If debug_override
- is not None, a True value is the same as setting 'optimization'
- to the empty string while a False value is equivalent to setting
- 'optimization' to '1'.
-
-The parameter has been removed in Python 3.15.
-
-Fixes #255
----
- distlib/util.py | 6 +++++-
- tests/test_util.py | 2 +-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/distlib/util.py b/distlib/util.py
-index 0d5bd7a..b700384 100644
---- a/distlib/util.py
-+++ b/distlib/util.py
-@@ -589,7 +589,11 @@ def ensure_dir(self, path):
- self.dirs_created.add(path)
-
- def byte_compile(self, path, optimize=False, force=False, prefix=None, hashed_invalidation=False):
-- dpath = cache_from_source(path, not optimize)
-+ if not optimize:
-+ optimization = ''
-+ else:
-+ optimization = '1'
-+ dpath = cache_from_source(path, optimization=optimization)
- logger.info('Byte-compiling %s to %s', path, dpath)
- if not self.dry_run:
- if force or self.newer(path, dpath):
-diff --git a/tests/test_util.py b/tests/test_util.py
-index d8694a9..d4bb572 100644
---- a/tests/test_util.py
-+++ b/tests/test_util.py
-@@ -652,7 +652,7 @@ def test_is_writable(self):
-
- def test_byte_compile(self):
- path = os.path.join(self.workdir, 'hello.py')
-- dpath = cache_from_source(path, True)
-+ dpath = cache_from_source(path, optimization='')
- self.fileop.write_text_file(path, 'print("Hello, world!")', 'utf-8')
- self.fileop.byte_compile(path, optimize=False)
- self.assertTrue(os.path.exists(dpath))