Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scancode-toolkit to newest version #1 #3

Merged
merged 4 commits into from
Sep 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[bumpversion]
current_version = 1.0.1
files = setup.py scancodeio/__init__.py docs/installation.rst
commit = False
tag = False
7 changes: 7 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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
2 changes: 1 addition & 1 deletion etc/requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion scancodeio/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 1 addition & 0 deletions scanner/tests/test_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down