scripts/ tests/: updated to match new location of pipcl.py in src/.

Author: julian-smith-artifex-com

scripts/gh_release.py

@@ -89,7 +89,7 @@
 
 pymupdf_dir = os.path.abspath( f'{__file__}/../..')
 
-sys.path.insert(0, pymupdf_dir)
+sys.path.insert(0, f'{pymupdf_dir}/src')
 import pipcl
 del sys.path[0]
 

scripts/sysinstall.py

@@ -89,7 +89,7 @@
 
 pymupdf_dir = os.path.abspath( f'{__file__}/../..')
 
-sys.path.insert(0, pymupdf_dir)
+sys.path.insert(0, f'{pymupdf_dir}/src')
 import pipcl
 del sys.path[0]
 

scripts/test.py

@@ -379,7 +379,7 @@
 pymupdf_dir_abs = os.path.abspath( f'{__file__}/../..')
 
 try:
-    sys.path.insert(0, pymupdf_dir_abs)
+    sys.path.insert(0, f'{pymupdf_dir_abs}/src')
     import pipcl
 finally:
     del sys.path[0]
@@ -1140,13 +1140,9 @@ def get_requires_for_build_wheel(config_settings=None):
     with open(f'{testdir}/pyproject.toml', 'w') as f:
         f.write(textwrap.dedent('''
                 [build-system]
-                # We define required packages in setup.py:get_requires_for_build_wheel().
-                requires = []
-
-                # See pep-517.
-                #
-                build-backend = "setup"
-                backend-path = ["."]
+                    requires = ['pipcl']
+                    build-backend = 'setup'
+                    backend-path = ['.']
                 '''))
 
     shutil.copy2(f'{pymupdf_dir_abs}/pipcl.py', f'{testdir}/pipcl.py')
@@ -1513,16 +1509,17 @@ def getmtime(path):
 
 def get_pyproject_required(ppt=None):
     '''
-    Returns space-separated names of required packages in pyproject.toml.  We
+    Returns list of names of required packages in pyproject.toml.  We
     do not do a proper parse and rely on the packages being in a single line.
     '''
     if ppt is None:
         ppt = os.path.abspath(f'{__file__}/../../pyproject.toml')
     with open(ppt) as f:
         for line in f:
-            m = re.match('^requires = \\[(.*)\\]$', line)
+            m = re.match('^ *requires = \\[(.*)\\]$', line)
             if m:
-                names = m.group(1).replace(',', ' ').replace('"', '')
+                names = m.group(1).replace(',', ' ').replace('"', '').replace("'", '')
+                names = names.split()
                 return names
         else:
             assert 0, f'Failed to find "requires" line in {ppt}'
@@ -1538,6 +1535,7 @@ def wrap_get_requires_for_build_wheel(dir_):
     ppt = os.path.join(dir_abs, 'pyproject.toml')
     if os.path.exists(ppt):
         ret += get_pyproject_required(ppt)
+    log(f'{ret=}')
     if os.path.exists(os.path.join(dir_abs, 'setup.py')):
         sys.path.insert(0, dir_abs)
         try:

tests/test_codespell.py

@@ -44,11 +44,7 @@ def test_codespell():
                 --ignore-multiline-regex 'codespell:ignore-begin.*codespell:ignore-end'
             ''')
 
-    sys.path.append(root)
-    try:
-        import pipcl
-    finally:
-        del sys.path[0]
+    import pipcl
 
     git_files = pipcl.git_items(root)
 

tests/test_general.py

@@ -1082,15 +1082,11 @@ def test_cli_out():
     import platform
     import re
     import subprocess
+    import pipcl
     log_prefix = None
     if os.environ.get('PYMUPDF_USE_EXTRA') == '0':
         log_prefix = f'.+Using non-default setting from PYMUPDF_USE_EXTRA: \'0\''
 
-    sys.path.append(os.path.normpath(f'{__file__}/../..'))
-    try:
-        import pipcl
-    finally:
-        del sys.path[0]
     pipcl.show_system()
     def check(
             expect_out,
@@ -1482,11 +1478,7 @@ def test_open2():
     # of tests/resources/test_open2_expected.json regardless of the actual
     # checkout directory.
     print()
-    sys.path.append(root)
-    try:
-        import pipcl
-    finally:
-        del sys.path[0]
+    import pipcl
     paths = pipcl.git_items(f'{root}/tests/resources')
     paths = fnmatch.filter(paths, f'test_open2.*')
     paths = [f'tests/resources/{i}' for i in paths]

tests/test_memory.py

@@ -178,11 +178,7 @@ def test_4125():
     import psutil
 
     root = os.path.normpath(f'{__file__}/../..')
-    sys.path.insert(0, root)
-    try:
-        import pipcl
-    finally:
-        del sys.path[0]
+    import pipcl
 
     process = psutil.Process()
 

tests/test_pylint.py

@@ -102,9 +102,7 @@ def test_pylint():
 
     root = os.path.abspath(f'{__file__}/../..')
 
-    sys.path.insert(0, root)
     import pipcl
-    del sys.path[0]
 
     # We want to run pylist on all of our src/*.py files so we find them with
     # `pipcl.git_items()`. However this seems to fail on github windows with
@@ -124,9 +122,11 @@ def test_pylint():
             'fitz___init__.py',
             'fitz_table.py',
             'fitz_utils.py',
+            'pipcl.py',
             'pymupdf.py',
             'table.py',
             'utils.py',
+            'wdev.py',
             ]
     leafs.sort()
     try:
@@ -139,6 +139,9 @@ def test_pylint():
         leafs_git.sort()
         assert  leafs_git == leafs, f'leafs:\n    {leafs!r}\nleafs_git:\n    {leafs_git!r}'
     for leaf in leafs:
+        if leaf == 'pipcl.py':
+            # Has various warnings but it's old code that we will eventually stop using.
+            continue
         command += f' {directory}/{leaf}'
     print(f'Running: {command}')
     subprocess.run(command, shell=1, check=1)

tests/test_release.py

@@ -8,11 +8,12 @@
 g_root_abs = os.path.normpath(f'{__file__}/../../')
 
 sys.path.insert(0, g_root_abs)
+sys.path.insert(0, f'{g_root_abs}/src')
 try:
     import pipcl
     import setup
 finally:
-    del sys.path[0]
+    del sys.path[0:2]
 
 g_root = pipcl.relpath(g_root_abs)