summaryrefslogtreecommitdiff
path: root/dev-python/virtualenv-clone
diff options
context:
space:
mode:
authorroot <root@alpha.trunkmasters.com>2026-08-01 03:04:37 -0500
committerroot <root@alpha.trunkmasters.com>2026-08-01 03:04:37 -0500
commit6344ec0d45ab5c6dc7f52b9c7ba2a4fdfa37fb17 (patch)
tree782b1dfa8abee9f15c2fff2aca667b4abd32e5f8 /dev-python/virtualenv-clone
parent3f283d6a71e35a9c6d89dc73d76f01aec1c1a6b3 (diff)
downloadbaldeagleos-repo-6344ec0d45ab5c6dc7f52b9c7ba2a4fdfa37fb17.tar.gz
baldeagleos-repo-6344ec0d45ab5c6dc7f52b9c7ba2a4fdfa37fb17.tar.xz
baldeagleos-repo-6344ec0d45ab5c6dc7f52b9c7ba2a4fdfa37fb17.zip
Adding metadata
Diffstat (limited to 'dev-python/virtualenv-clone')
-rw-r--r--dev-python/virtualenv-clone/files/virtualenv-clone-0.5.7-fix-test-virtualenv-20.38.patch68
-rw-r--r--dev-python/virtualenv-clone/virtualenv-clone-0.5.7.ebuild8
2 files changed, 74 insertions, 2 deletions
diff --git a/dev-python/virtualenv-clone/files/virtualenv-clone-0.5.7-fix-test-virtualenv-20.38.patch b/dev-python/virtualenv-clone/files/virtualenv-clone-0.5.7-fix-test-virtualenv-20.38.patch
new file mode 100644
index 000000000000..fdbe3ecb7227
--- /dev/null
+++ b/dev-python/virtualenv-clone/files/virtualenv-clone-0.5.7-fix-test-virtualenv-20.38.patch
@@ -0,0 +1,68 @@
+https://github.com/edwardgeorge/virtualenv-clone/issues/83
+https://github.com/edwardgeorge/virtualenv-clone/pull/84
+
+From d5f6e1fead9bff210a1a1c4f92c80d48db807165 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Fri, 6 Mar 2026 16:24:20 +0100
+Subject: [PATCH] Amend the virtualenv path in pyvenv.cfg command
+
+https://github.com/pypa/virtualenv/commit/44b7bd6d103bdc19860b0ca05c238171c6283008
+
+Without this, test_clone_contents fails with virtualenv 20.38.0+:
+
+ with open(file_in_clone, 'rb') as f:
+ lines = f.read().decode('utf-8')
+ > assert venv_path not in lines,\
+ 'Found source path in cloned file %s' % file_in_clone
+ E AssertionError: Found source path in cloned file /tmp/tmp_lsp66c7/clone_venv/pyvenv.cfg
+ E assert '/tmp/tmp_lsp66c7/srs_venv' not in 'home = /usr/bin\nimplementation = CPython\nversion_info = 3.14.3.final.0\nversion = 3.14.3\nexecutable = /usr/bin/python3.14\ncommand = /.../virtualenv-clone/.tox/py314/bin/python3 -m virtualenv /tmp/tmp_lsp66c7/srs_venv\nvirtualenv = 21.1.0\ninclude-system-site-packages = false\nbase-prefix = /usr\nbase-exec-prefix = /usr\nbase-executable = /usr/bin/python3.14\n'
+ E
+ E '/tmp/tmp_lsp66c7/srs_venv' is contained here:
+ E home = /usr/bin
+ E implementation = CPython
+ E version_info = 3.14.3.final.0
+ E version = 3.14.3
+ E executable = /usr/bin/python3.14
+ E command = /.../virtualenv-clone/.tox/py314/bin/python3 -m virtualenv /tmp/tmp_lsp66c7/srs_venv
+ E ? +++++++++++++++++++++++++
+ E virtualenv = 21.1.0
+ E include-system-site-packages = false
+ E base-prefix = /usr
+ E base-exec-prefix = /usr
+ E base-executable = /usr/bin/python3.14
+
+Fixes https://github.com/edwardgeorge/virtualenv-clone/issues/83
+--- a/clonevirtualenv.py
++++ b/clonevirtualenv.py
+@@ -77,6 +77,7 @@ def clone_virtualenv(src_dir, dst_dir):
+ version, sys_path = _virtualenv_sys(dst_dir)
+ logger.info('fixing scripts in bin...')
+ fixup_scripts(src_dir, dst_dir, version)
++ fixup_pyvenv_cfg(src_dir, dst_dir)
+
+ has_old = lambda s: any(i for i in s if _dirmatch(i, src_dir))
+
+@@ -132,6 +133,23 @@ def fixup_scripts(old_dir, new_dir, version, rewrite_env_python=False):
+ rewrite_env_python=rewrite_env_python)
+
+
++def fixup_pyvenv_cfg(old_dir, new_dir):
++ filename = os.path.join(new_dir, 'pyvenv.cfg')
++ if not os.path.exists(filename):
++ return
++ with open(filename, 'rb') as f:
++ original = f.read()
++ replaced = original.replace(
++ old_dir.encode('utf-8'),
++ new_dir.encode('utf-8')
++ )
++ if original == replaced:
++ return
++ logger.info('fixing pyvenv.cfg...')
++ with open(filename, 'wb') as f:
++ f.write(replaced)
++
++
+ def fixup_script_(root, file_, old_dir, new_dir, version,
+ rewrite_env_python=False):
+ old_shebang = '#!%s/bin/python' % os.path.normcase(os.path.abspath(old_dir))
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.5.7.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.5.7.ebuild
index e3a89e5f77fc..f30a6a5b06a1 100644
--- a/dev-python/virtualenv-clone/virtualenv-clone-0.5.7.ebuild
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.5.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -28,6 +28,10 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${PN}-0.5.7-backport-pr79.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-0.5.7-backport-pr79.patch"
+ "${FILESDIR}/${PN}-0.5.7-fix-test-virtualenv-20.38.patch"
+)
+EPYTEST_PLUGINS=()
distutils_enable_tests pytest