Merge branch 'main' into include-mask-images

Author: JorjMcKie

scripts/sysinstall.py

@@ -227,7 +227,7 @@ def run(command, env_extra=None):
     #
     if pip == 'sudo':
         log('## Installing Python packages required for building MuPDF and PyMuPDF.')
-        run(f'sudo pip install --upgrade pip')
+        #run(f'sudo pip install --upgrade pip') # Breaks on Github see: https://github.com/pypa/get-pip/issues/226.
         names = test_py.wrap_get_requires_for_build_wheel(f'{__file__}/../..')
         run(f'sudo pip install {names}')
 
@@ -275,7 +275,7 @@ def run(command):
             run(f'. {venv_name}/bin/activate && pip install --upgrade installer')
             run(f'{env} {venv_name}/bin/python -m pip wheel -vv -w dist {os.path.abspath(pymupdf_dir)}')
         elif pip == 'sudo':
-            run(f'sudo pip install --upgrade pip')
+            #run(f'sudo pip install --upgrade pip') # Breaks on Github see: https://github.com/pypa/get-pip/issues/226.
             run(f'sudo pip install installer')
             run(f'{env} pip wheel -vv -w dist {os.path.abspath(pymupdf_dir)}')
         else:

scripts/test.py

@@ -44,7 +44,7 @@
         environment variable `PYMUPDF_SETUP_MUPDF_BUILD_TYPE`, which is used by
         PyMuPDF's `setup.py`.]
     -d
-        Equivalent to `--build-type debug`.
+        Equivalent to `-b debug`.
     -f 0|1
         If 1 we also test alias `fitz` as well as `pymupdf`. Default is '0'.
     -i <implementations>
@@ -54,7 +54,8 @@
              'R' - rebased without optimisations.
             Default is 'r'. Also see `PyMuPDF:tests/run_compound.py`.
     -k <expression>
-        Select which test(s) to run; passed straight through to pytest's `-k`.
+        Specify which test(s) to run; passed straight through to pytest's `-k`.
+        For example `-k test_3354`.
     -m <location> | --mupdf <location>
         Location of local mupdf/ directory or 'git:...' to be used
         when building PyMuPDF. [This sets environment variable