Do not install patch.py by default

It has deprecated regexes and needs some love to maintain

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

CHANGELOG.rst

@@ -1,7 +1,13 @@
 Changelog
 =========
 
-v30.0.0 (next)
+v31.0.0
+--------
+
+- Do not install patch.py by default. Instead this is now an extra
+
+
+v30.0.0
 --------
 
 - Update to the latest skeleton. The virtualenv is now created under the venv

configure

@@ -29,7 +29,7 @@ CLI_ARGS=$1
 
 # Requirement arguments passed to pip and used by default or with --dev.
 REQUIREMENTS="--editable .[full] --constraint requirements.txt"
-DEV_REQUIREMENTS="--editable .[full,testing] --constraint requirements.txt --constraint requirements-dev.txt"
+DEV_REQUIREMENTS="--editable .[full,testing,patch] --constraint requirements.txt --constraint requirements-dev.txt"
 DOCS_REQUIREMENTS="--editable .[docs] --constraint requirements.txt"
 
 # where we create a virtualenv

configure.bat

@@ -27,7 +27,7 @@
 
 @rem # Requirement arguments passed to pip and used by default or with --dev.
 set "REQUIREMENTS=--editable .[full] --constraint requirements.txt"
-set "DEV_REQUIREMENTS=--editable .[full,testing] --constraint requirements.txt --constraint requirements-dev.txt"
+set "DEV_REQUIREMENTS=--editable .[full,testing,patch] --constraint requirements.txt --constraint requirements-dev.txt"
 set "DOCS_REQUIREMENTS=--editable .[docs] --constraint requirements.txt"
 
 @rem # where we create a virtualenv

setup.cfg

@@ -70,8 +70,6 @@ install_requires =
     commoncode >= 21.5.25
     plugincode >= 21.1.21
     typecode >= 21.6.1
-    patch >= 1.16
-
 
 
 [options.packages.find]
@@ -84,6 +82,9 @@ full =
     extractcode_libarchive >= 3.5.1.210525
     typecode[full] >= 21.6.1
 
+patch =
+    patch >= 1.16
+
 testing =
     pytest >= 6, != 7.0.0
     pytest-xdist >= 2

src/extractcode/archive.py

@@ -1194,5 +1194,11 @@ def try_to_extract(location, target_dir, extractor):
     QCOWHandler,
     VMDKHandler,
     VirtualBoxHandler,
-    PatchHandler,
 ]
+
+# only support extracting patches if patch is installed. This is not a default
+try:
+    import patch as _pythonpatch
+    archive_handlers.append(PatchHandler)
+except:
+    pass

src/extractcode/patch.py

@@ -11,8 +11,6 @@
 import logging
 import os.path
 
-import patch as pythonpatch
-
 from commoncode import paths
 from commoncode import fileutils
 from commoncode import text
@@ -136,6 +134,7 @@ def patch_info(location):
 
     Raise an exception if the file is not a patch file or cannot be parsed.
     """
+    import patch as pythonpatch
     patchset = pythonpatch.fromfile(location)
     if not patchset:
         msg = 'Unable to parse patch file: %(location)s' % locals()

tests/test_patch.py

@@ -17,6 +17,12 @@
 
 from extractcode import patch
 
+try:
+    import patch as _pythonpatch
+except ImportError:
+    import pytest
+    pytestmark = pytest.mark.skipif(True, reason="Run only if patch is installed.")
+
 
 class TestIsPatch(FileBasedTesting):
     test_data_dir = os.path.join(os.path.dirname(__file__), 'data')