Fix: EOL filtering to only exclude builds with no valid tracks. #272

clay-lake · 2024-10-21T08:25:44Z

I have signed the CLA?
I am following the CONTRIBUTING guidelines

Included in this PR:

Fix EOL filtering to only exclude builds with no valid tracks.
Refactor of src/image/prepare_single_image_build_matrix.py.
Upgrade pydantic to 2.8.2 globally.
Respective testing for EOL handeling.
Testing for image trigger file validator.

src/image/prepare_single_image_build_matrix.py

zhijie-yang

Thanks for the changes. Nicely done. A few nitpicks regarding the formatting. I would also suggest use isort to sort the imports ;)

src/image/requirements.txt

tests/unit/test_image_trigger_file_validator.py

tests/unit/test_prepare_single_image_build_matrix.py

tests/unit/test_image_trigger_file_validator.py

src/image/prepare_single_image_build_matrix.py

src/image/utils/schema/triggers.py

tests/unit/test_image_trigger_file_validator.py

…factory into fix_eol_filtering

zhijie-yang

We will omit the blank line after the docstring in this PR as per the discussion offline. Looks good to me. Thanks.

…ithub.com/canonical/oci-factory/actions/runs/11836669622

…factory into fix_eol_filtering

…ithub.com/canonical/oci-factory/actions/runs/11837164168

…factory into fix_eol_filtering

…ithub.com/canonical/oci-factory/actions/runs/11837527741

…factory into fix_eol_filtering

…ithub.com/canonical/oci-factory/actions/runs/11838202813

SamirPS · 2024-11-14T14:37:56Z

src/image/release.py

@@ -67,21 +67,26 @@

 print(f"Parsing image trigger {args.image_trigger}")
 with open(args.image_trigger, encoding="UTF-8") as trigger:
-    image_trigger = ImageSchema(**yaml.load(trigger, Loader=yaml.BaseLoader))


Hey,

Just to know, Why changing this ?

I had to make some changes when updating to pydantic v2. L78 was failing on both the old .dict and new .dump_model methods, so I just kept the image_trigger as a dict, and use the model only for validation like we do in most of the repo.

78: for risk, value in risks.dict(exclude_none=True).items():

…ithub.com/canonical/oci-factory/actions/runs/11839284552

zhijie-yang

Overall looks good to me. Once these nitpicks are fixed, I can approved this PR.

zhijie-yang · 2024-11-14T15:33:01Z

src/docs/requirements.txt

Suggested change

pydantic==2.8.2

pydantic==2.8.2

zhijie-yang · 2024-11-14T15:34:09Z

src/image/prepare_single_image_build_matrix.py

+from typing import Any
+from pathlib import Path
+from git import Repo
+from tempfile import TemporaryDirectory as tempdir
+from copy import deepcopy
+import logging
+
+
+from ..uploads.infer_image_track import get_base_and_track
+from ..shared.github_output import GithubOutput
+from .utils.schema.triggers import ImageSchema
+from .utils.schema.revision_data import RevisionDataSchema


Can you use isort to sort the imports?

* refactor: applied suggetsions from zhijie-yang in #272 --------- Co-authored-by: clay-lake <clay-lake@localhost>

fix: EOL filtering to only exclude builds with no valid tracks.

ae87140

clay-lake force-pushed the fix_eol_filtering branch from f5af210 to ae87140 Compare October 21, 2024 08:30

clay-lake marked this pull request as ready for review October 21, 2024 10:08

clay-lake requested a review from a team as a code owner October 21, 2024 10:08

cjdcordeiro requested a review from zhijie-yang October 21, 2024 10:24

cjdcordeiro reviewed Oct 21, 2024

View reviewed changes

src/image/prepare_single_image_build_matrix.py Show resolved Hide resolved

clay-lake added 8 commits October 30, 2024 16:35

fix: clean revision data of extra fields

beb931a

fix: correct import path

a5e7da1

fix: corrections for relative paths

502421a

fix: serialization of datetime object

342a805

fix: readded track to revision data json

6af1751

fix: broken import in src/image/merge_release_info.py

b20304a

Merge branch 'main' into fix_eol_filtering

c28721b

Merge branch 'main' into fix_eol_filtering

6ce0f03

zhijie-yang requested changes Nov 8, 2024

View reviewed changes

clay-lake added 13 commits November 11, 2024 13:44

fix: formatting issues

d1b5f67

fix: syntax issue in python3.10

f341a46

fix: EOL filtering to only exclude builds with no valid tracks.

8e86560

fix: clean revision data of extra fields

7ce59ec

fix: correct import path

fc26de4

fix: corrections for relative paths

d647b9d

fix: serialization of datetime object

b761f30

fix: readded track to revision data json

c333e0c

fix: broken import in src/image/merge_release_info.py

6ba07dd

fix: formatting issues

e2b87e4

fix: syntax issue in python3.10

71c8579

Merge branch 'fix_eol_filtering' of https://github.com/canonical/oci-…

4dd7294

…factory into fix_eol_filtering

trigger build

deddda5

clay-lake requested a review from zhijie-yang November 11, 2024 13:04

zhijie-yang approved these changes Nov 11, 2024

View reviewed changes

clay-lake and others added 18 commits November 11, 2024 15:31

fix: dump revision_data by alias to fix eol field

d102dd9

test: added debug statement

f30157c

fix(Image.yaml): remove unnecessary revision_file filtering

d7c12ff

fix: update remaining pydantic to 2.8.2

6ee5fde

fix(release.py): simplify image_trigger iteration

0d7084f

ci: automatically update oci/mock-rock/_releases.json, from https://g…

775b540

…ithub.com/canonical/oci-factory/actions/runs/11836669622

fix(release.py): typo

b0ef739

refactor(trigger.py): update for pydantic2

a417784

Merge branch 'fix_eol_filtering' of https://github.com/canonical/oci-…

8866ac0

…factory into fix_eol_filtering

ci: automatically update oci/mock-rock/_releases.json, from https://g…

20565af

…ithub.com/canonical/oci-factory/actions/runs/11837164168

fix: more updates for pydantic 2

c29f1bf

Merge branch 'fix_eol_filtering' of https://github.com/canonical/oci-…

1a3030f

…factory into fix_eol_filtering

ci: automatically update oci/mock-rock/_releases.json, from https://g…

d6a3652

…ithub.com/canonical/oci-factory/actions/runs/11837527741

fix: more updates for pydantic 2

1127c90

Merge branch 'fix_eol_filtering' of https://github.com/canonical/oci-…

262620f

…factory into fix_eol_filtering

ci: automatically update oci/mock-rock/_releases.json, from https://g…

d62b609

…ithub.com/canonical/oci-factory/actions/runs/11838202813

Merge branch 'main' into fix_eol_filtering

4a4439a

refactor: merge_release_info.py excess print

2b915da

SamirPS reviewed Nov 14, 2024

View reviewed changes

ci: automatically update oci/mock-rock/_releases.json, from https://g…

7dc9685

…ithub.com/canonical/oci-factory/actions/runs/11839284552

clay-lake merged commit 2818740 into main Nov 14, 2024

zhijie-yang requested changes Nov 14, 2024

View reviewed changes

clay-lake added a commit that referenced this pull request Nov 15, 2024

refactor: applied suggetsions from zhijie-yang in #272

715fe81

clay-lake deleted the fix_eol_filtering branch November 15, 2024 14:45

clay-lake mentioned this pull request Nov 15, 2024

refactor: applied suggetsions from zhijie-yang in #272 #287

Merged

2 tasks

clay-lake added a commit that referenced this pull request Nov 18, 2024

refactor: applied suggetsions from zhijie-yang in #272 (#287)

a65310b

* refactor: applied suggetsions from zhijie-yang in #272 --------- Co-authored-by: clay-lake <clay-lake@localhost>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: EOL filtering to only exclude builds with no valid tracks. #272

Fix: EOL filtering to only exclude builds with no valid tracks. #272

clay-lake commented Oct 21, 2024 •

edited

Loading

zhijie-yang left a comment

zhijie-yang left a comment

SamirPS Nov 14, 2024

clay-lake Nov 14, 2024 •

edited

Loading

zhijie-yang left a comment

zhijie-yang Nov 14, 2024

zhijie-yang Nov 14, 2024

Fix: EOL filtering to only exclude builds with no valid tracks. #272

Fix: EOL filtering to only exclude builds with no valid tracks. #272

Conversation

clay-lake commented Oct 21, 2024 • edited Loading

zhijie-yang left a comment

Choose a reason for hiding this comment

zhijie-yang left a comment

Choose a reason for hiding this comment

SamirPS Nov 14, 2024

Choose a reason for hiding this comment

clay-lake Nov 14, 2024 • edited Loading

Choose a reason for hiding this comment

zhijie-yang left a comment

Choose a reason for hiding this comment

zhijie-yang Nov 14, 2024

Choose a reason for hiding this comment

zhijie-yang Nov 14, 2024

Choose a reason for hiding this comment

clay-lake commented Oct 21, 2024 •

edited

Loading

clay-lake Nov 14, 2024 •

edited

Loading