Skip to content

Commit

Permalink
[CIVIS-9806] ENH update datascience-python base image to v8.1.0 (#58)
Browse files Browse the repository at this point in the history
* ENH update ds-py to v8.1.0, refresh requirements files

* MAINT update changelog

* MAINT switch to uv to install packages; always create dev images

* MAINT switch back to pip for now
  • Loading branch information
jacksonlee-civis authored Nov 18, 2024
1 parent 1a3e91a commit bc0ef9f
Show file tree
Hide file tree
Showing 7 changed files with 103 additions and 61 deletions.
2 changes: 1 addition & 1 deletion .ds_python_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.0.1
8.1.0
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## Unreleased

## [4.1.0]
### Changed
- Updated base datascience-python image version to v8.1.0 (#58)
- Updated core Python dependency versions (#58):
* matplotlib 3.9.0 -> 3.9.2

## [4.0.1]
### Fixed
- Update base datascience-python version to v8.0.1 (#57)
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Unfortunately Dockerhub isn't as flexible as CircleCi or AWS Codebuild, so we have to hardcode this value here.
# So if you in the future need to update this value, make sure you also edit the value in .ds_python_version.
# These values should be kept in sync.
ARG DS_PYTHON_IMG_VERSION=8.0.1
ARG DS_PYTHON_IMG_VERSION=8.1.0

ARG PLATFORM=linux/x86_64

Expand Down Expand Up @@ -37,7 +37,7 @@ COPY requirements-full.txt .

# setuptools is required since the notebook package uses distutils, which isn't in Python 3.12.6+.
# It's installed here since pip-compile doesn't include setuptools in requirements files.
RUN pip install --progress-bar off --no-cache-dir setuptools==75.1.0 && \
RUN pip install --progress-bar off --no-cache-dir setuptools==75.5.0 && \
pip install --progress-bar off --no-cache-dir -r requirements-full.txt && \
rm requirements-full.txt && \
civis-jupyter-notebooks-install
Expand Down
7 changes: 3 additions & 4 deletions buildspec/push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ phases:
- echo $BRANCH_NAME
- export DS_PYTHON_IMG_VERSION=$(head -n 1 ./.ds_python_version)
- docker build --build-arg="DS_PYTHON_IMG_VERSION=${DS_PYTHON_IMG_VERSION}" --tag ${FIPS_REPOSITORY_URI}:${COMMIT_HASH_SHORT} --tag ${FIPS_REPOSITORY_URI}:${BRANCH_NAME} .
# This config tests the codebuild login and the build but does not push dev images.
# The following lines can be temporarily uncommented to test a dev image.
# Note: for dev branches, there's no need to push to DockerHub.
# - docker image push --all-tags ${FIPS_REPOSITORY_URI}
# We have a life cycle policy in place to expire and delete images from dev branches,
# so there are no issues with pushing as many of these images as there may be.
- docker image push --all-tags ${FIPS_REPOSITORY_URI}
post_build:
commands:
- echo Build completed!
Expand Down
2 changes: 1 addition & 1 deletion generate-requirements-full.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ docker run \
"pip freeze >> /tmp/requirements-aggregated-core.txt && \
cat /src/requirements-core.txt >> /tmp/requirements-aggregated-core.txt && \
pip install pip-tools && \
pip-compile --output-file=/src/requirements-full.txt --pip-args='--prefer-binary' --upgrade /tmp/requirements-aggregated-core.txt"
pip-compile --output-file=/src/requirements-full.txt --strip-extras --pip-args='--prefer-binary' --upgrade /tmp/requirements-aggregated-core.txt"
2 changes: 1 addition & 1 deletion requirements-core.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
civis-jupyter-notebook==2.2.1
matplotlib==3.9.0
matplotlib==3.9.2
seaborn==0.13.2
Loading

0 comments on commit bc0ef9f

Please sign in to comment.