From e0e596ed4946b8cddb8d7685fd12f4233e661d15 Mon Sep 17 00:00:00 2001 From: Benjamin Alan Weaver Date: Mon, 13 Jan 2025 11:50:21 -0700 Subject: [PATCH] remove explicit references to 3.10 --- py/desiutil/test/test_install.py | 163 ++++++++++++++++--------------- 1 file changed, 82 insertions(+), 81 deletions(-) diff --git a/py/desiutil/test/test_install.py b/py/desiutil/test/test_install.py index 4d6f3e9..632e3aa 100644 --- a/py/desiutil/test/test_install.py +++ b/py/desiutil/test/test_install.py @@ -35,7 +35,8 @@ class TestInstall(unittest.TestCase): @classmethod def setUpClass(cls): - pass + cls.py = f"python{sys.version_info.major:d}.{sys.version_info.minor:d}" + cls.cext = f"cpython-{sys.version_info.major:d}.{sys.version_info.minor:d}.pyc" @classmethod def tearDownClass(cls): @@ -623,41 +624,41 @@ def test_permissions(self, mock_chmod, mock_walk): self.desiInstall.install_dir = join(self.data_dir, 'desiutil') self.desiInstall.is_branch = False mock_walk.return_value = iter([(join(self.desiInstall.install_dir, 'bin'), [], ['executable', 'README.txt']), - (join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + (join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil-1.2.3.dist-info'), [], ['METADATA', 'LICENSE.rst']), - (join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', - 'desiutil', '__pycache__'), [], ['__init__.cpython-3.10.pyc', 'module.cpython-3.10.pyc']), - (join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + (join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', + 'desiutil', '__pycache__'), [], [f"__init__.{self.cext}", f"module.{self.cext}"]), + (join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil'), ['__pycache__'], ['__init__.py', 'module.py']), - (join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages'), + (join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages'), ['desiutil-1.2.3.dist-info', 'desiutil'], []), - (join(self.desiInstall.install_dir, 'lib', 'python3.10'), ['site-packages'], []), - (join(self.desiInstall.install_dir, 'lib'), ['python3.10'], []), + (join(self.desiInstall.install_dir, 'lib', self.py), ['site-packages'], []), + (join(self.desiInstall.install_dir, 'lib'), [self.py], []), (self.desiInstall.install_dir, ['bin', 'lib'], [])]) self.desiInstall.permissions() mock_walk.assert_called_once_with(self.desiInstall.install_dir, topdown=False) mock_chmod.assert_has_calls([call(join(self.desiInstall.install_dir, 'bin', 'executable'), 0o555), call(join(self.desiInstall.install_dir, 'bin', 'README.txt'), 0o444), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil-1.2.3.dist-info', 'METADATA'), 0o444), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil-1.2.3.dist-info', 'LICENSE.rst'), 0o444), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', - 'desiutil', '__pycache__', '__init__.cpython-3.10.pyc'), 0o444), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', - 'desiutil', '__pycache__', 'module.cpython-3.10.pyc'), 0o444), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', + 'desiutil', '__pycache__', f"__init__.{self.cext}"), 0o444), + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', + 'desiutil', '__pycache__', f"module.{self.cext}"), 0o444), + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil', '__init__.py'), 0o444), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil', 'module.py'), 0o444), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil', '__pycache__'), 0o2555), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil-1.2.3.dist-info'), 0o2555), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil'), 0o2555), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages'), 0o2555), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10'), 0o2555), + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages'), 0o2555), + call(join(self.desiInstall.install_dir, 'lib', self.py), 0o2555), call(join(self.desiInstall.install_dir, 'bin'), 0o2555), call(join(self.desiInstall.install_dir, 'lib'), 0o2555), call(self.desiInstall.install_dir, 0o2555)]) @@ -675,41 +676,41 @@ def test_permissions_with_branch(self, mock_chmod, mock_walk): self.desiInstall.install_dir = join(self.data_dir, 'desiutil') self.desiInstall.is_branch = True mock_walk.return_value = iter([(join(self.desiInstall.install_dir, 'bin'), [], ['executable', 'README.txt']), - (join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + (join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil-1.2.3.dist-info'), [], ['METADATA', 'LICENSE.rst']), - (join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', - 'desiutil', '__pycache__'), [], ['__init__.cpython-3.10.pyc', 'module.cpython-3.10.pyc']), - (join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + (join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', + 'desiutil', '__pycache__'), [], [f"__init__.{self.cext}", f"module.{self.cext}"]), + (join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil'), ['__pycache__'], ['__init__.py', 'module.py']), - (join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages'), + (join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages'), ['desiutil-1.2.3.dist-info', 'desiutil'], []), - (join(self.desiInstall.install_dir, 'lib', 'python3.10'), ['site-packages'], []), - (join(self.desiInstall.install_dir, 'lib'), ['python3.10'], []), + (join(self.desiInstall.install_dir, 'lib', self.py), ['site-packages'], []), + (join(self.desiInstall.install_dir, 'lib'), [self.py], []), (self.desiInstall.install_dir, ['bin', 'lib'], [])]) self.desiInstall.permissions() mock_walk.assert_called_once_with(self.desiInstall.install_dir, topdown=False) mock_chmod.assert_has_calls([call(join(self.desiInstall.install_dir, 'bin', 'executable'), 0o755), call(join(self.desiInstall.install_dir, 'bin', 'README.txt'), 0o644), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil-1.2.3.dist-info', 'METADATA'), 0o644), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil-1.2.3.dist-info', 'LICENSE.rst'), 0o644), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', - 'desiutil', '__pycache__', '__init__.cpython-3.10.pyc'), 0o644), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', - 'desiutil', '__pycache__', 'module.cpython-3.10.pyc'), 0o644), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', + 'desiutil', '__pycache__', f"__init__.{self.cext}"), 0o644), + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', + 'desiutil', '__pycache__', f"module.{self.cext}"), 0o644), + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil', '__init__.py'), 0o644), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil', 'module.py'), 0o644), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil', '__pycache__'), 0o2755), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil-1.2.3.dist-info'), 0o2755), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil'), 0o2755), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages'), 0o2755), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10'), 0o2755), + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages'), 0o2755), + call(join(self.desiInstall.install_dir, 'lib', self.py), 0o2755), call(join(self.desiInstall.install_dir, 'bin'), 0o2755), call(join(self.desiInstall.install_dir, 'lib'), 0o2755), call(self.desiInstall.install_dir, 0o2755)]) @@ -727,40 +728,40 @@ def test_permissions_without_world(self, mock_chmod, mock_walk): self.desiInstall.install_dir = join(self.data_dir, 'desiutil') self.desiInstall.is_branch = False mock_walk.return_value = iter([(join(self.desiInstall.install_dir, 'bin'), [], ['executable', 'README.txt']), - (join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + (join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil-1.2.3.dist-info'), [], ['METADATA', 'LICENSE.rst']), - (join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', - 'desiutil', '__pycache__'), [], ['__init__.cpython-3.10.pyc', 'module.cpython-3.10.pyc']), - (join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + (join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', + 'desiutil', '__pycache__'), [], [f"__init__.{self.cext}", f"module.{self.cext}"]), + (join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil'), ['__pycache__'], ['__init__.py', 'module.py']), - (join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages'), ['desiutil-1.2.3.dist-info', 'desiutil'], []), - (join(self.desiInstall.install_dir, 'lib', 'python3.10'), ['site-packages'], []), - (join(self.desiInstall.install_dir, 'lib'), ['python3.10'], []), + (join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages'), ['desiutil-1.2.3.dist-info', 'desiutil'], []), + (join(self.desiInstall.install_dir, 'lib', self.py), ['site-packages'], []), + (join(self.desiInstall.install_dir, 'lib'), [self.py], []), (self.desiInstall.install_dir, ['bin', 'lib'], [])]) self.desiInstall.permissions() mock_walk.assert_called_once_with(self.desiInstall.install_dir, topdown=False) mock_chmod.assert_has_calls([call(join(self.desiInstall.install_dir, 'bin', 'executable'), 0o550), call(join(self.desiInstall.install_dir, 'bin', 'README.txt'), 0o440), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil-1.2.3.dist-info', 'METADATA'), 0o440), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil-1.2.3.dist-info', 'LICENSE.rst'), 0o440), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', - 'desiutil', '__pycache__', '__init__.cpython-3.10.pyc'), 0o440), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', - 'desiutil', '__pycache__', 'module.cpython-3.10.pyc'), 0o440), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', + 'desiutil', '__pycache__', f"__init__.{self.cext}"), 0o440), + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', + 'desiutil', '__pycache__', f"module.{self.cext}"), 0o440), + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil', '__init__.py'), 0o440), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil', 'module.py'), 0o440), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil', '__pycache__'), 0o2550), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil-1.2.3.dist-info'), 0o2550), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil'), 0o2550), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages'), 0o2550), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10'), 0o2550), + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages'), 0o2550), + call(join(self.desiInstall.install_dir, 'lib', self.py), 0o2550), call(join(self.desiInstall.install_dir, 'bin'), 0o2550), call(join(self.desiInstall.install_dir, 'lib'), 0o2550), call(self.desiInstall.install_dir, 0o2550)]) @@ -778,40 +779,40 @@ def test_permissions_with_branch_without_world(self, mock_chmod, mock_walk): self.desiInstall.install_dir = join(self.data_dir, 'desiutil') self.desiInstall.is_branch = True mock_walk.return_value = iter([(join(self.desiInstall.install_dir, 'bin'), [], ['executable', 'README.txt']), - (join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + (join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil-1.2.3.dist-info'), [], ['METADATA', 'LICENSE.rst']), - (join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', - 'desiutil', '__pycache__'), [], ['__init__.cpython-3.10.pyc', 'module.cpython-3.10.pyc']), - (join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + (join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', + 'desiutil', '__pycache__'), [], [f"__init__.{self.cext}", f"module.{self.cext}"]), + (join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil'), ['__pycache__'], ['__init__.py', 'module.py']), - (join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages'), ['desiutil-1.2.3.dist-info', 'desiutil'], []), - (join(self.desiInstall.install_dir, 'lib', 'python3.10'), ['site-packages'], []), - (join(self.desiInstall.install_dir, 'lib'), ['python3.10'], []), + (join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages'), ['desiutil-1.2.3.dist-info', 'desiutil'], []), + (join(self.desiInstall.install_dir, 'lib', self.py), ['site-packages'], []), + (join(self.desiInstall.install_dir, 'lib'), [self.py], []), (self.desiInstall.install_dir, ['bin', 'lib'], [])]) self.desiInstall.permissions() mock_walk.assert_called_once_with(self.desiInstall.install_dir, topdown=False) mock_chmod.assert_has_calls([call(join(self.desiInstall.install_dir, 'bin', 'executable'), 0o750), call(join(self.desiInstall.install_dir, 'bin', 'README.txt'), 0o640), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil-1.2.3.dist-info', 'METADATA'), 0o640), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil-1.2.3.dist-info', 'LICENSE.rst'), 0o640), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', - 'desiutil', '__pycache__', '__init__.cpython-3.10.pyc'), 0o640), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', - 'desiutil', '__pycache__', 'module.cpython-3.10.pyc'), 0o640), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', + 'desiutil', '__pycache__', f"__init__.{self.cext}"), 0o640), + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', + 'desiutil', '__pycache__', f"module.{self.cext}"), 0o640), + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil', '__init__.py'), 0o640), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil', 'module.py'), 0o640), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil', '__pycache__'), 0o2750), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil-1.2.3.dist-info'), 0o2750), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages', + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages', 'desiutil'), 0o2750), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10', 'site-packages'), 0o2750), - call(join(self.desiInstall.install_dir, 'lib', 'python3.10'), 0o2750), + call(join(self.desiInstall.install_dir, 'lib', self.py, 'site-packages'), 0o2750), + call(join(self.desiInstall.install_dir, 'lib', self.py), 0o2750), call(join(self.desiInstall.install_dir, 'bin'), 0o2750), call(join(self.desiInstall.install_dir, 'lib'), 0o2750), call(self.desiInstall.install_dir, 0o2750)])