Skip to content

Commit

Permalink
Release v34.5.0 (#1246)
Browse files Browse the repository at this point in the history
Signed-off-by: tdruez <[email protected]>
  • Loading branch information
tdruez authored May 22, 2024
1 parent 56f0a9e commit 6192657
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 12 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Changelog
=========

v34.5.0 (unreleased)
v34.5.0 (2024-05-22)
--------------------

- Display the current path location in the "Codebase" panel as a navigation breadcrumbs.
Expand All @@ -17,7 +17,7 @@ v34.5.0 (unreleased)

- Workaround an issue with the cyclonedx-python-lib that does not allow to load
SBOMs that contains properties with no values.
Also, a few fixes pre-validation are applyed before deserializing thr SBOM for
Also, a few fixes pre-validation are applied before deserializing thr SBOM for
maximum compatibility.
https://github.com/nexB/scancode.io/issues/1185
https://github.com/nexB/scancode.io/issues/1230
Expand Down
2 changes: 1 addition & 1 deletion scancodeio/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

import git

VERSION = "34.4.0"
VERSION = "34.5.0"

PROJECT_DIR = Path(__file__).resolve().parent
ROOT_DIR = PROJECT_DIR.parent
Expand Down
6 changes: 4 additions & 2 deletions scanpipe/pipes/strings.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
# ScanCode.io is a free software code scanning tool from nexB Inc. and others.
# Visit https://github.com/nexB/scancode.io for support and download.

from source_inspector import strings_xgettext

from scanpipe.pipes import LoopProgress


Expand All @@ -34,6 +32,8 @@ def collect_and_store_resource_strings(project, logger=None):
Collect source strings from codebase files using xgettext and store
them in the extra data field.
"""
from source_inspector import strings_xgettext

if not strings_xgettext.is_xgettext_installed():
raise XgettextNotFound(
"``xgettext`` not found. Install ``gettext`` to use this pipeline."
Expand Down Expand Up @@ -61,6 +61,8 @@ def _collect_and_store_resource_strings(resource):
Collect strings from a resource using xgettext and store
them in the extra data field.
"""
from source_inspector import strings_xgettext

result = strings_xgettext.collect_strings(resource.location)
strings = [item["string"] for item in result if "string" in item]
resource.update_extra_data({"source_strings": strings})
6 changes: 4 additions & 2 deletions scanpipe/pipes/symbols.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@

from django.db.models import Q

from source_inspector import symbols_ctags

from scanpipe.pipes import LoopProgress


Expand All @@ -36,6 +34,8 @@ def collect_and_store_resource_symbols_ctags(project, logger=None):
Collect symbols from codebase files using Ctags and store
them in the extra data field.
"""
from source_inspector import symbols_ctags

if not symbols_ctags.is_ctags_installed():
raise UniversalCtagsNotFound(
"``Universal Ctags`` not found."
Expand Down Expand Up @@ -64,6 +64,8 @@ def _collect_and_store_resource_symbols_ctags(resource):
Collect symbols from a resource using Ctags and store
them in the extra data field.
"""
from source_inspector import symbols_ctags

symbols = symbols_ctags.collect_symbols(resource.location)
tags = [symbol["name"] for symbol in symbols if "name" in symbol]
resource.update_extra_data({"source_symbols": tags})
Expand Down
10 changes: 5 additions & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = scancodeio
version = 34.4.0
version = 34.5.0
license = Apache-2.0
description = Automate software composition analysis pipelines
long_description = file:README.rst
Expand Down Expand Up @@ -50,7 +50,7 @@ include_package_data = true
zip_safe = false
install_requires =
importlib-metadata==7.1.0
setuptools==69.5.1
setuptools==70.0.0
# Django related
Django==5.0.6
django-environ==0.11.2
Expand Down Expand Up @@ -86,7 +86,7 @@ install_requires =
# Utilities
XlsxWriter==3.2.0
openpyxl==3.1.2
requests==2.31.0
requests==2.32.2
gitpython==3.1.43
# Profiling
pyinstrument==4.6.2
Expand Down Expand Up @@ -122,7 +122,7 @@ dev =
sphinxcontrib-django==2.5
# Release
bumpver==2023.1129
twine==5.0.0
twine==5.1.0

[options.entry_points]
console_scripts =
Expand Down Expand Up @@ -166,7 +166,7 @@ ignore = D1,D203,D205,D212,D400,D415

[bumpver]
version_pattern = "MAJOR.MINOR.PATCH"
current_version = "34.4.0"
current_version = "34.5.0"

[bumpver:file_patterns]
setup.cfg =
Expand Down

0 comments on commit 6192657

Please sign in to comment.