Update scancode-toolkit to newest version #1 (#3)

* Use thew newest ScanCode TK version #1

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

* Update Changelog for #1

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

* Bump version to 1.0.1

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

* Exclude the "tool_version" from the reference data unit test #1

Signed-off-by: Thomas Druez <tdruez@nexb.com>

Co-authored-by: Thomas Druez <tdruez@nexb.com>

.bumpversion.cfg

@@ -0,0 +1,5 @@
+[bumpversion]
+current_version = 1.0.1
+files = setup.py scancodeio/__init__.py docs/installation.rst
+commit = False
+tag = False

docs/changelog.rst

@@ -1,6 +1,13 @@
 // Release notes
 // -------------
 
+### v1.0.1 (2020-09-12)
+
+- *2020-09-11* **ScanPipe** -- Do not fail when collecting system packages in
+  Ubuntu docker images for layers that do not install packages by updating to a
+  newer version of ScanCode Toolkit. Fix for https://github.com/nexB/scancode.io/issues/1
+
+
 ### v1.0.0 (2020-09-09)
 
 - Initial release

docs/installation.rst

@@ -5,7 +5,7 @@ Create the installable archive::
 
    make package
 
-Grab the installable archive in dist/scancodeio-1.0.0.tar.gz
+Grab the installable archive in dist/scancodeio-1.0.1.tar.gz
 and move that to you offline install server.
 
 On the offline install server:
@@ -15,7 +15,7 @@ On the offline install server:
  3. prepare the database
 ::
 
-   tar -xf scancodeio-1.0.0.tar.gz && cd scancode.io
+   tar -xf scancodeio-1.0.1.tar.gz && cd scancode.io
    make install
    make envfile
    make cleandb
@@ -40,7 +40,7 @@ Create the latest installable archive::
 
    make package
 
-Grab the installable archive in dist/scancodeio-1.0.0.tar.gz
+Grab the installable archive in dist/scancodeio-1.0.1.tar.gz
 and move that to you offline install server.
 
 On the offline install server:
@@ -52,6 +52,6 @@ On the offline install server:
 ::
 
     mv scancode.io scancode.io-$(date +"%Y-%m-%d_%H%M")
-    tar -xf scancodeio-1.0.0.tar.gz && cd scancode.io
+    tar -xf scancodeio-1.0.1.tar.gz && cd scancode.io
     make install
     make migrate

etc/requirements/base.txt

@@ -32,4 +32,4 @@ metaflow==2.2.3
 container_inspector==3.1.2
 
 # ScanCode-toolkit
-scancode-toolkit==3.2.0
+scancode-toolkit==3.2.1rc2

scancodeio/__init__.py

@@ -29,7 +29,7 @@
 # Django starts so that shared_task will use this app.
 from scancodeio.celery import app as celery_app
 
-__version__ = "1.0.0"
+__version__ = "1.0.1"
 
 ROOT_DIR = Path(__file__).parent.parent.absolute()
 SCAN_NOTICE = (ROOT_DIR / "scan.NOTICE").read_text()

scanner/tests/test_tasks.py

@@ -301,6 +301,7 @@ def test_run_scancode_output_validation_against_reference_data(
             "--json-pp",
             "file_type",
             "mime_type",
+            "tool_version",
         ]
         reference_data = self.without_keys(reference_data, exclude_keys)
         output_data = self.without_keys(output_data, exclude_keys)

setup.py

@@ -26,7 +26,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-__version__ = "1.0.0"
+__version__ = "1.0.1"
 
 requirement_files = ["etc/requirements/base.txt"]