Merge pull request #4 from nexB/v21.01.21-prep

V21.01.21 prep

Author: pombredanne

CHANGELOG.rst

@@ -35,7 +35,7 @@ function setup {
 
 setup
 
-$CONFIGURE_ROOT_DIR/tmp/bin/pip install -e .[testing]
+$CONFIGURE_ROOT_DIR/tmp/bin/pip install -e .[full] -e .[testing]
 
 if [ -f "$CONFIGURE_ROOT_DIR/tmp/bin/activate" ]; then
     source "$CONFIGURE_ROOT_DIR/tmp/bin/activate"

README.rst

@@ -89,8 +89,7 @@ call mkdir "%CFG_ROOT_DIR%tmp"
 call curl -o "%CFG_ROOT_DIR%tmp\virtualenv.pyz" https://bootstrap.pypa.io/virtualenv.pyz
 call %PYTHON_EXECUTABLE% "%CFG_ROOT_DIR%tmp\virtualenv.pyz" "%CFG_ROOT_DIR%tmp"
 call "%CFG_ROOT_DIR%tmp\Scripts\activate"
-call "%CFG_ROOT_DIR%tmp\Scripts\pip" install --upgrade pip virtualenv setuptools wheel
-call "%CFG_ROOT_DIR%tmp\Scripts\pip" install -e .[testing]
+call "%CFG_ROOT_DIR%tmp\Scripts\pip" install  -e .[full] -e .[testing]
 
 @rem Return a proper return code on failure
 if %ERRORLEVEL% neq 0 (

configure

@@ -3,7 +3,7 @@ parameters:
     image_name: ''
     python_versions: []
     test_suites: {}
-    python_architecture: x86
+    python_architecture: x64
 
 jobs:
     - job: ${{ parameters.job_name }}

configure.bat

@@ -0,0 +1,13 @@
+about_resource: .
+copyright: copyright (c) nexB. Inc. and others
+description: A mostly universal archive extractor using z7zip, libarchve, other 
+ libraries and the Python standard library for reliable archive extraction.
+ It is used by ScanCode toolkit and related projects 
+keywords: archive, extraction, libarchive, 7zip, scancode-toolkit
+homepage_url: https://github.com/nexB/extractcode
+holder: nexB. Inc. and others
+holder_contact: info@aboutcode.org
+license_expression: apache-2.0
+name: extractcode
+package_url: pkg:pypi/extractcode
+primary_language: Python

etc/ci/azure-win.yml

@@ -10,7 +10,7 @@ author_email = info@aboutcode.org
 license = Apache-2.0
 
 # description must be on ONE line https://github.com/pypa/setuptools/issues/1390
-description = A set of utilities and functions for extracting archives.
+description = A mostly universal archive extractor using z7zip, libarchve, other libraries and the Python standard library for reliable archive extraction.
 long_description = file:README.rst
 url = https://github.com/nexB/extractcode
 classifiers =
@@ -31,28 +31,32 @@ keywords =
 [options]
 package_dir=
     =src
-packages=find:
+packages = find:
 include_package_data = true
 zip_safe = false
 install_requires =
-    commoncode >= 21.1
-    plugincode >= 20.09
-    typecode >= 21.1
-    typecode-libmagic >= 5.39.1.1
-    patch >= 1.15
-    extractcode-7z >= 16.5
-    extractcode-libarchive >= 3.4.3
+    commoncode >= 21.1.21
+    plugincode >= 21.1.21
+    typecode >= 21.1.21
+    patch >= 1.16
 
 setup_requires = setuptools_scm[toml] >= 4
 
 [options.packages.find]
 where=src
 
 [options.extras_require]
+full =
+    extractcode-7z >= 16.5.210122
+    extractcode_libarchive >= 3.5.1.210122
+    typecode[full] >= 21.1.21
+
 testing =
     # upstream
+    attr
     pytest >= 6
     pytest-xdist >= 2
+
 docs=
     Sphinx>=3.3.1
     sphinx-rtd-theme>=0.5.0

extractcode.ABOUT

@@ -26,7 +26,6 @@
 from commoncode import filetype
 from commoncode import functional
 from commoncode.ignore import is_ignored
-from commoncode.system import on_linux
 
 from typecode import contenttype
 

setup.cfg

@@ -29,7 +29,9 @@
 
 from commoncode import fileutils
 from commoncode import ignore
+
 import extractcode
+import extractcode.archive
 
 logger = logging.getLogger(__name__)
 TRACE = False

src/extractcode/archive.py

@@ -93,10 +93,16 @@ def load_lib():
     """
     from plugincode.location_provider import get_location
 
-    # get paths from plugins
     dll = get_location(EXTRACTCODE_LIBARCHIVE_DLL)
     libdir = get_location(EXTRACTCODE_LIBARCHIVE_LIBDIR)
+    if not (dll and libdir) or not os.path.isfile(dll) or not os.path.isdir(libdir):
+        raise Exception(
+            'CRITICAL: libarchive DLL is not installed. '
+            'Unable to continue: you need to install a valid extractcode-libarchive '
+            'plugin with a valid libarchive DLL available.'
+    )
     return command.load_shared_library(dll, libdir)
+    
 
 
 def set_env_with_tz():