Skip to content
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
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Upcoming changes...

## [1.17.3] - 2024-11-05
### Fixed
- Fixed undeclared policy


## [1.17.2] - 2024-11-01
### Fixed
- Fixed parsing of dependencies in Policy Checks
Expand Down Expand Up @@ -378,4 +383,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[1.16.0]: https://github.com/scanoss/scanoss.py/compare/v1.15.0...v1.16.0
[1.17.0]: https://github.com/scanoss/scanoss.py/compare/v1.16.0...v1.17.0
[1.17.1]: https://github.com/scanoss/scanoss.py/compare/v1.17.0...v1.17.1
[1.17.2]: https://github.com/scanoss/scanoss.py/compare/v1.17.1...v1.17.2
[1.17.2]: https://github.com/scanoss/scanoss.py/compare/v1.17.1...v1.17.2
[1.17.3]: https://github.com/scanoss/scanoss.py/compare/v1.17.2...v1.17.3
2 changes: 1 addition & 1 deletion src/scanoss/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
THE SOFTWARE.
"""

__version__ = "1.17.2"
__version__ = "1.17.3"
5 changes: 3 additions & 2 deletions src/scanoss/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@
from pathlib import Path
import sys
import pypac
from scanoss.inspection.copyleft import Copyleft
from scanoss.inspection.undeclared_component import UndeclaredComponent

from .inspection.copyleft import Copyleft
from .inspection.undeclared_component import UndeclaredComponent
from .threadeddependencies import SCOPE
from .scanoss_settings import ScanossSettings
from .scancodedeps import ScancodeDeps
Expand Down
2 changes: 1 addition & 1 deletion src/scanoss/inspection/copyleft.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"""
import json
from typing import Dict, Any
from scanoss.inspection.policy_check import PolicyCheck, PolicyStatus
from .policy_check import PolicyCheck, PolicyStatus

class Copyleft(PolicyCheck):
"""
Expand Down
5 changes: 3 additions & 2 deletions src/scanoss/inspection/policy_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@
from abc import abstractmethod
from enum import Enum
from typing import Callable, List, Dict, Any
from scanoss.inspection.utils.license_utils import LicenseUtil
from scanoss.scanossbase import ScanossBase
from .utils.license_utils import LicenseUtil
from ..scanossbase import ScanossBase


class PolicyStatus(Enum):
"""
Expand Down
4 changes: 2 additions & 2 deletions src/scanoss/inspection/undeclared_component.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"""
import json
from typing import Dict, Any
from scanoss.inspection.policy_check import PolicyCheck, PolicyStatus
from .policy_check import PolicyCheck, PolicyStatus

class UndeclaredComponent(PolicyCheck):
"""
Expand Down Expand Up @@ -115,7 +115,7 @@ def _markdown(self, components: list) -> Dict[str,Any]:
'summary': self._get_summary(components),
}

def _generate_sbom_file(self, components: list) -> dict[str, list[dict[str, str]]]:
def _generate_sbom_file(self, components: list) -> dict:
"""
Generate a list of PURLs for the SBOM file.

Expand Down
2 changes: 1 addition & 1 deletion src/scanoss/inspection/utils/license_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
"""
from scanoss.scanossbase import ScanossBase
from ...scanossbase import ScanossBase

DEFAULT_COPYLEFT_LICENSES = {
'agpl-3.0-only', 'artistic-1.0', 'artistic-2.0', 'cc-by-sa-4.0', 'cddl-1.0', 'cddl-1.1', 'cecill-2.1',
Expand Down
23 changes: 0 additions & 23 deletions src/scanoss/inspection/utils/markdown_utils.py

This file was deleted.

79 changes: 0 additions & 79 deletions src/scanoss/inspection/utils/result_utils.py

This file was deleted.

4 changes: 2 additions & 2 deletions tests/policy-inspect-test.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import re
import unittest

from scanoss.inspection.copyleft import Copyleft
from scanoss.inspection.undeclared_component import UndeclaredComponent
from src.scanoss.inspection.copyleft import Copyleft
from src.scanoss.inspection.undeclared_component import UndeclaredComponent


class MyTestCase(unittest.TestCase):
Expand Down