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
3 changes: 1 addition & 2 deletions src/parser/json/actor_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import re
from typing import Union, Pattern, Match, Optional
from typing import Pattern, Match, Optional

from src.model.actor import Actor, ActorType
from src.model.spdx_no_assertion import SpdxNoAssertion
from src.parser.error import SPDXParsingError
from src.parser.json.dict_parsing_functions import construct_or_raise_parsing_error

Expand Down
3 changes: 1 addition & 2 deletions src/parser/json/annotation_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
from src.parser.error import SPDXParsingError
from src.parser.json.actor_parser import ActorParser
from src.parser.json.dict_parsing_functions import datetime_from_str, construct_or_raise_parsing_error, \
parse_field_or_log_error, append_parsed_field_or_log_error, raise_parsing_error_if_logger_has_messages, \
parse_list_of_elements
parse_field_or_log_error, append_parsed_field_or_log_error, raise_parsing_error_if_logger_has_messages
from src.parser.logger import Logger


Expand Down
7 changes: 3 additions & 4 deletions src/parser/json/checksum_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from typing import Dict, List, Optional
from typing import Dict, Optional

from src.model.checksum import Checksum, ChecksumAlgorithm
from src.parser.error import SPDXParsingError
from src.parser.json.dict_parsing_functions import append_parsed_field_or_log_error, \
raise_parsing_error_if_logger_has_messages, json_str_to_enum_name, construct_or_raise_parsing_error
from src.parser.json.dict_parsing_functions import raise_parsing_error_if_logger_has_messages, json_str_to_enum_name, \
construct_or_raise_parsing_error
from src.parser.logger import Logger


Expand Down
2 changes: 1 addition & 1 deletion src/parser/json/dict_parsing_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from datetime import datetime
from typing import Any, Callable, Dict, List, Union, Optional
from typing import Any, Callable, Dict, List, Optional

from src.model.spdx_no_assertion import SpdxNoAssertion
from src.model.spdx_none import SpdxNone
Expand Down
2 changes: 1 addition & 1 deletion src/parser/json/file_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from src.parser.json.checksum_parser import ChecksumParser
from src.parser.json.dict_parsing_functions import raise_parsing_error_if_logger_has_messages, \
construct_or_raise_parsing_error, parse_field_or_log_error, \
parse_field_or_no_assertion_or_none, parse_list_of_elements
parse_field_or_no_assertion_or_none
from src.parser.json.license_expression_parser import LicenseExpressionParser
from src.parser.logger import Logger

Expand Down
2 changes: 1 addition & 1 deletion src/parser/json/package_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from src.parser.json.checksum_parser import ChecksumParser
from src.parser.json.dict_parsing_functions import append_parsed_field_or_log_error, datetime_from_str, \
raise_parsing_error_if_logger_has_messages, json_str_to_enum_name, construct_or_raise_parsing_error, \
parse_field_or_log_error, parse_field_or_no_assertion_or_none, parse_field_or_no_assertion, parse_list_of_elements
parse_field_or_log_error, parse_field_or_no_assertion_or_none, parse_field_or_no_assertion
from src.parser.json.license_expression_parser import LicenseExpressionParser
from src.parser.logger import Logger

Expand Down
2 changes: 1 addition & 1 deletion src/validation/relationship_validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from typing import List, Union
from typing import List

from src.model.document import Document
from src.model.relationship import Relationship, RelationshipType
Expand Down
1 change: 0 additions & 1 deletion tests/parser/test_extracted_licensing_info_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

import pytest

from src.model.spdx_no_assertion import SpdxNoAssertion
from src.parser.error import SPDXParsingError
from src.parser.json.extracted_licensing_info_parser import ExtractedLicensingInfoParser

Expand Down
1 change: 0 additions & 1 deletion tests/parser/test_json_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import pytest

from src.model.document import Document
from src.parser.error import SPDXParsingError
from src.parser.json.json_parser import JsonParser

def test_parse_json_file_not_found():
Expand Down
6 changes: 2 additions & 4 deletions tests/validation/test_external_document_ref_validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@

from typing import List

import pytest

from src.model.external_document_ref import ExternalDocumentRef
from src.validation.external_document_ref_validator import validate_external_document_ref
from src.validation.validation_message import ValidationMessage, ValidationContext, SpdxElementType
from tests.valid_defaults import get_checksum, get_external_document_ref
from src.validation.validation_message import ValidationMessage
from tests.valid_defaults import get_checksum


def test_valid_external_document_ref():
Expand Down