Skip to content

Commit 18250af

Browse files
authored
Merge branch 'main' into fix/delete-mvr-attributeerror-235
2 parents c26c3e5 + f5252f8 commit 18250af

5 files changed

Lines changed: 10 additions & 6 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
reqstool status local -p docs/reqstool
4040
# Upload artifacts for later use
4141
- name: Upload Artifacts
42-
uses: actions/upload-artifact@v6
42+
uses: actions/upload-artifact@v7
4343
with:
4444
name: dist
4545
path: dist/

.github/workflows/release_prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
steps:
3232
# Download artifacts from the build job
3333
- name: Download Artifacts
34-
uses: actions/download-artifact@v7
34+
uses: actions/download-artifact@v8
3535
with:
3636
name: dist
3737
path: dist

.github/workflows/release_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
# Download artifacts from the build job
2525
- name: Download Artifacts
26-
uses: actions/download-artifact@v7
26+
uses: actions/download-artifact@v8
2727
with:
2828
name: dist
2929
path: dist

renovate.json5

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
extends: ["github>reqstool/.github//.github/renovate.json5"],
3+
}
4+

src/reqstool/model_generators/combined_indexed_dataset_generator.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ def __get_filtered_out_requirements_for_filter_urn( # noqa C901 # NOSONAR
404404
)
405405
# compute lark_tree if custom exclude exists
406406
tree_custom_exclude = (
407-
None if req_filter.custom_imports is None else RequirementsELTransformer.parse_el(req_filter.custom_exclude)
407+
None if req_filter.custom_exclude is None else RequirementsELTransformer.parse_el(req_filter.custom_exclude)
408408
)
409409

410410
# iterate over _all accessible_ requirements
@@ -476,7 +476,7 @@ def __process_svc_filters_per_urn(self, urn: str) -> Tuple[Set[UrnId], Set[UrnId
476476
# for each import urn in the initial urn
477477
for import_urn in self._crd.parsing_graph[urn]:
478478
if self._crd.raw_datasets[import_urn].requirements_data.metadata.variant is VARIANTS.MICROSERVICE:
479-
break
479+
continue
480480

481481
logging.debug(f"Applying svcs filters for import urn {import_urn}")
482482

@@ -539,7 +539,7 @@ def __get_filtered_out_svcs_for_filter_urn( # noqa C901 # NOSONAR
539539
)
540540
# compute lark_tree if custom exclude exists
541541
tree_custom_exclude = (
542-
None if svc_filter.custom_imports is None else SVCsELTransformer.parse_el(svc_filter.custom_exclude)
542+
None if svc_filter.custom_exclude is None else SVCsELTransformer.parse_el(svc_filter.custom_exclude)
543543
)
544544

545545
# iterate over _all accessible_ svcs

0 commit comments

Comments
 (0)