Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

work/CRAFT-3862-Implement-the-initial-Imagecraft-spec #70

Merged
merged 26 commits into from
Jan 20, 2025

Conversation

upils
Copy link
Collaborator

@upils upils commented Jan 8, 2025

  • Have you followed the guidelines for contributing?
  • Have you signed the CLA?

Specification https://docs.google.com/document/d/1pTXN9LIFu4F0KmCT-iK2-_gGKELapKxvEj0-74xdr3g/edit?tab=t.0

@upils upils self-assigned this Jan 8, 2025
@upils upils force-pushed the work/CRAFT-3862-Implement-the-initial-Imagecraft-spec branch 5 times, most recently from f0af6fd to 255adcc Compare January 10, 2025 15:13
@upils upils marked this pull request as ready for review January 13, 2025 07:34
.pre-commit-config.yaml Outdated Show resolved Hide resolved
common.mk Show resolved Hide resolved
lengau
lengau previously approved these changes Jan 13, 2025
lengau
lengau previously approved these changes Jan 14, 2025
@upils upils force-pushed the work/CRAFT-3862-Implement-the-initial-Imagecraft-spec branch from 7388f44 to cedb44f Compare January 15, 2025 07:39
mattculler
mattculler previously approved these changes Jan 16, 2025
Copy link

@mattculler mattculler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. A link to the spec would be helpful
  2. Love to see thousands of lines deleted!
  3. It looks like this PR includes both a merge from starbase and spec implementation - in the future, splitting those two large changes into separate PRs would make for easier review.

But looks good! None of my inline comments are blockers.

HACKING.rst Show resolved Hide resolved
HACKING.rst Show resolved Hide resolved
HACKING.rst Outdated Show resolved Hide resolved
HACKING.rst Show resolved Hide resolved
common.mk Outdated Show resolved Hide resolved
imagecraft/models/project.py Outdated Show resolved Hide resolved
imagecraft/models/project.py Outdated Show resolved Hide resolved
pyproject.toml Show resolved Hide resolved
@upils upils force-pushed the work/CRAFT-3862-Implement-the-initial-Imagecraft-spec branch from cedb44f to 030383c Compare January 16, 2025 08:51
@upils
Copy link
Collaborator Author

upils commented Jan 16, 2025

  1. A link to the spec would be helpful
  2. Love to see thousands of lines deleted!
  3. It looks like this PR includes both a merge from starbase and spec implementation - in the future, splitting those two large changes into separate PRs would make for easier review.

But looks good! None of my inline comments are blockers.

@mattculler I added the spec in the PR description. The PR is indeed doing both but the actual spec implementation is very very small here (this is just about setting constraints on base and build_base) so I was not sure it was worth splitting.

Copy link

@tigarmo tigarmo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I mostly reviewed the contents for the imagecraft directory, let me know if there's anything important outside of it that I should look at (I assumed most of it is the standard starbase/starflow stuff)

imagecraft/cli.py Show resolved Hide resolved
imagecraft/models/project.py Show resolved Hide resolved
imagecraft/services/lifecycle.py Show resolved Hide resolved
imagecraft/services/pack.py Show resolved Hide resolved
@upils
Copy link
Collaborator Author

upils commented Jan 16, 2025

Thanks! I mostly reviewed the contents for the imagecraft directory, let me know if there's anything important outside of it that I should look at (I assumed most of it is the standard starbase/starflow stuff)

@tigarmo Thanks! I am also interested in a review of the GH workflow changes and the spread-related ones (I previously had tests on various systems for amd64/arm64 that I removed for now since the tool is not doing much).

tigarmo
tigarmo previously approved these changes Jan 16, 2025
mattculler
mattculler previously approved these changes Jan 16, 2025
Copy link

@mattculler mattculler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good

@medubelko medubelko dismissed stale reviews from mattculler and tigarmo via 9a966bf January 17, 2025 01:46
medubelko
medubelko previously approved these changes Jan 17, 2025
Copy link

@medubelko medubelko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@upils I fixed the build and did some reorganisation of the docs so they align with current practices. Everything looks good from my end.

@upils
Copy link
Collaborator Author

upils commented Jan 17, 2025

@upils I fixed the build and did some reorganisation of the docs so they align with current practices. Everything looks good from my end.

Great, thanks!

@medubelko I also changed the configuration on RTD to use .readthedocs.yaml and not docs/.readthedocs.yaml. I am not sure if that was something I changed at some point in the past or if this is the default configuration though. Do you know?

The build is now looking for docs/.sphinx/build_requirements.py (which is missing). Do you want to dig and fix this or can we do that in a following PR?

@upils upils force-pushed the work/CRAFT-3862-Implement-the-initial-Imagecraft-spec branch from 9a966bf to 7337ac0 Compare January 17, 2025 10:42
tigarmo
tigarmo previously approved these changes Jan 17, 2025
@sergiusens sergiusens force-pushed the work/CRAFT-3862-Implement-the-initial-Imagecraft-spec branch from 2922f1a to 0408e92 Compare January 17, 2025 21:40
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't see why the RTD builds are failing, but they're currently failing.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warnings,

WARNING: The local Git repository could not be found.

Seems like craft-cli had these once upon a time (not longer than a month ago), so I decided to allow them for now https://app.readthedocs.com/projects/canonical-craft-cli/builds/2700288/#30829517--59

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this is different from what we have in starbase, but I think @medubelko wants us to move over to CONTRIBUTING.rst so maybe we can do that here?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CONTRIBUTING is preferred, but I don't think we should tackle that right now.

@sergiusens sergiusens force-pushed the work/CRAFT-3862-Implement-the-initial-Imagecraft-spec branch 2 times, most recently from 9a3310a to 0408e92 Compare January 18, 2025 00:30
Signed-off-by: Sergio Schvezov <[email protected]>
@upils upils merged commit 9bdd6f0 into main Jan 20, 2025
5 checks passed
@upils upils deleted the work/CRAFT-3862-Implement-the-initial-Imagecraft-spec branch January 20, 2025 07:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants