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.

Sign up for GitHub

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

#523 - Poetry version fixes #524

Merged
merged 1 commit into from
Jan 6, 2025
Merged

#523 - Poetry version fixes #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions .github/actions/install_dependencies/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ runs:
default: 3.11.4
- name: Install Poetry
uses: snok/install-poetry@v1
with:
version: 1.8.5
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I: fixing version until we update Habushu

Copy link
Contributor

Choose a reason for hiding this comment

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

Assuming this is the highest pre-2.0 version?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yep!

- name: Install Helm
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion ...training-api-containers/aissemble-model-training-api/src/main/resources/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM docker.io/python:3.11 AS habushu_builder
RUN python -m ensurepip --upgrade && \
pip install poetry && \
poetry self add poetry-monorepo-dependency-plugin && \
poetry self add poetry-plugin-bundle@1.3.0
poetry self add poetry-plugin-bundle
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I: Removing fixed version until we update Habushu (line 5 installs the latest version of poetry)


WORKDIR /work-dir
COPY --chown=1001 target/containerize-support ./containerize-support/
Expand Down
2 changes: 1 addition & 1 deletion extensions/extensions-docker/aissemble-versioning/src/main/resources/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM docker.io/python:3.11 AS habushu_builder
RUN python -m ensurepip --upgrade && \
pip install poetry && \
poetry self add poetry-monorepo-dependency-plugin && \
poetry self add poetry-plugin-bundle@1.3.0
poetry self add poetry-plugin-bundle

WORKDIR /work-dir
COPY --chown=1001 target/containerize-support ./containerize-support/
Expand Down
2 changes: 2 additions & 0 deletions extensions/extensions-docker/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@
<dockerBuilderBase>docker.io/python:3.11</dockerBuilderBase>
<dockerFinalBase>docker.io/python:3.11-slim</dockerFinalBase>
<dockerUser>1001</dockerUser>
<!-- Turning off the Dockerfile update so that we can remove the fixed version for poetry-plugin-bundle in the Dockerfiles. The latest version of poetry breaks the build. We will revert this change after we update Habushu to work with poetry version 2.x. -->
<updateDockerfile>false</updateDockerfile>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I: Turning off habushu so that we can make the fix in the Dockerfiles above

Copy link
Contributor

@ewilkins-csi ewilkins-csi Jan 6, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

A: Let's add a POM comment saying why we're turning off the update feature, and when we plan to turn it back on.

</configuration>
</execution>
</executions>
Expand Down
Loading