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

chore: library upgrade #251

Merged
merged 12 commits into from
Jul 27, 2022
Merged

chore: library upgrade #251

merged 12 commits into from
Jul 27, 2022

Conversation

rokroskar
Copy link
Member

upgrades the libraries pinned in the base image.

rokroskar and others added 2 commits July 22, 2022 12:29
Since jupyterlab is already included in the base base image it should be
possible to use this version instead of installing an older version afterwards.
@rokroskar rokroskar marked this pull request as draft July 22, 2022 10:51
@rokroskar rokroskar marked this pull request as ready for review July 22, 2022 15:13
@rokroskar rokroskar requested review from olevski and gavin-k-lee July 22, 2022 15:13
@rokroskar
Copy link
Member Author

@olevski @gavin-k-lee a bunch of things are changed here in these images so it would be great if you could give them a once-over. They seem fine to me. Note also that since the default python version in the latest jupyter/base-notebookimages is 3.10, we now inherit this python version as well. We'll need to update the templates and probably announce it to the users in the release notes.

Co-authored-by: Lorenzo Cavazzi <[email protected]>
@Panaetius
Copy link
Member

According to https://docs.python.org/3/whatsnew/3.9.html#you-should-check-for-deprecationwarning-in-your-code 3.9 is the last version to contain 2.7 backwards compatibility layer and https://docs.python.org/3/whatsnew/3.10.html#removed did in fact remove some module methods and quite a lot of C API functions/types (at the end of the page). So 3.10 probably has a bit higher chance of breaking things than was the case with 3.9

We do NOT have tests for 3.10 in renku-python, so upgrading to 3.10 would essentially be flying blind, plus the higher risk of breaking user code does mean it'd make sense to upgrade to a version prior to https://github.com/jupyter/docker-stacks/blame/0be9e335026b21a452c888481ab6341dcdd183a5/base-notebook/Dockerfile#L88

@rokroskar
Copy link
Member Author

Something is wrong with the cuda-tf builds - also failing on master. Will make an issue to fix it.

docker/py/Dockerfile Outdated Show resolved Hide resolved
@olevski olevski self-requested a review July 27, 2022 13:10
olevski
olevski previously approved these changes Jul 27, 2022
@olevski olevski self-requested a review July 27, 2022 15:06
@rokroskar rokroskar merged commit 9c452bf into master Jul 27, 2022
@rokroskar rokroskar deleted the 000-upgrade-jupyter branch July 27, 2022 15:09
@@ -62,7 +62,7 @@ jobs:

# This ensures the same image tags as before are built, in addition to new ones
if [[ "${{ matrix.BASE_IMAGE_TAG }}" == lab-* ]]; then
export LABEL_PREFIX=3.9
export LABEL_PREFIX=3.10
Copy link
Member

Choose a reason for hiding this comment

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

@rokroskar I thought none of the images are using python 3.10. And from Ralf's comment it seems we are not ready for 3.10 yet.

So this should then probably be rolled back to 3.9?

Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
export LABEL_PREFIX=3.10
export LABEL_PREFIX=3.9

@@ -356,7 +356,7 @@ jobs:

export DOCKER_TAG="${{ matrix.JULIAVERSIONS }}-$LABEL"
docker build docker/julia \
--build-arg BASE_IMAGE="$DOCKER_NAME-py:3.9-$LABEL" \
--build-arg BASE_IMAGE="$DOCKER_NAME-py:3.10-$LABEL" \
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
--build-arg BASE_IMAGE="$DOCKER_NAME-py:3.10-$LABEL" \
--build-arg BASE_IMAGE="$DOCKER_NAME-py:3.9-$LABEL" \

@@ -408,11 +408,11 @@ jobs:

export DOCKER_TAG="${{ matrix.RVERSION }}-$LABEL"
docker build docker/r \
--build-arg RENKU_BASE="$DOCKER_NAME-py:3.9-$LABEL" \
--build-arg RENKU_BASE="$DOCKER_NAME-py:3.10-$LABEL" \
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
--build-arg RENKU_BASE="$DOCKER_NAME-py:3.10-$LABEL" \
--build-arg RENKU_BASE="$DOCKER_NAME-py:3.9-$LABEL" \

@@ -462,7 +462,7 @@ jobs:

export DOCKER_TAG="${{ matrix.RELEASE }}-$LABEL"
docker build docker/r \
--build-arg RENKU_BASE="$DOCKER_NAME-py:3.9-$LABEL" \
--build-arg RENKU_BASE="$DOCKER_NAME-py:3.10-$LABEL" \
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
--build-arg RENKU_BASE="$DOCKER_NAME-py:3.10-$LABEL" \
--build-arg RENKU_BASE="$DOCKER_NAME-py:3.9-$LABEL" \

@@ -320,8 +320,8 @@ jobs:
fi

docker build docker/batch \
--build-arg RENKU_BASE="$DOCKER_NAME-py:3.9-$LABEL" \
--build-arg BASE_IMAGE="python:3.9-slim-buster" \
--build-arg RENKU_BASE="$DOCKER_NAME-py:3.10-$LABEL" \
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
--build-arg RENKU_BASE="$DOCKER_NAME-py:3.10-$LABEL" \
--build-arg RENKU_BASE="$DOCKER_NAME-py:3.9-$LABEL" \

--build-arg RENKU_BASE="$DOCKER_NAME-py:3.9-$LABEL" \
--build-arg BASE_IMAGE="python:3.9-slim-buster" \
--build-arg RENKU_BASE="$DOCKER_NAME-py:3.10-$LABEL" \
--build-arg BASE_IMAGE="python:3.10-slim-buster" \
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
--build-arg BASE_IMAGE="python:3.10-slim-buster" \
--build-arg BASE_IMAGE="python:3.9-slim-buster" \

@@ -114,7 +114,7 @@ jobs:
fi

docker build docker/$EXTENSION \
--build-arg BASE_IMAGE="$DOCKER_NAME-py:3.9-$LABEL" \
--build-arg BASE_IMAGE="$DOCKER_NAME-py:3.10-$LABEL" \
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
--build-arg BASE_IMAGE="$DOCKER_NAME-py:3.10-$LABEL" \
--build-arg BASE_IMAGE="$DOCKER_NAME-py:3.9-$LABEL" \

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.

5 participants