Skip to content

Commit

Permalink
updates labs to Python 3.10, matching Colab
Browse files Browse the repository at this point in the history
  • Loading branch information
charlesfrye committed May 15, 2023
1 parent 55890b7 commit e674946
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 24 deletions.
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ channels:
- nvidia
- conda-forge
dependencies:
- python=3.9 # versioned to match Google Colab # version also pinned in Dockerfile
- python=3.10 # versioned to match Google Colab # version also pinned in Dockerfile
- pytorch-cuda=11.8 # versioned to match Google Colab
- pip=22.0.4 # versioned to match Google Colab # version also pinned in Dockerfile
- pip=23.1.2 # versioned to match Google Colab # version also pinned in Dockerfile
4 changes: 2 additions & 2 deletions lab07/api_serverless/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Starting from an official AWS image
# Keep any dependencies and versions in this file aligned with the environment.yml and Makefile
FROM public.ecr.aws/lambda/python:3.9
FROM public.ecr.aws/lambda/python:3.10

# Install Python dependencies
COPY requirements/prod.txt ./requirements.txt
RUN pip install --upgrade pip==22.0.4
RUN pip install --upgrade pip==23.1.2
RUN pip install -r requirements.txt

# Copy only the relevant directories and files
Expand Down
4 changes: 2 additions & 2 deletions lab07/app_gradio/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The "buster" flavor of the official docker Python image is based on Debian and includes common packages.
# Keep any dependencies and versions in this file aligned with the environment.yml and Makefile
FROM python:3.9-buster
FROM python:3.10-buster

# Create the working directory
# set -x prints commands and set -e causes us to stop on errors
Expand All @@ -9,7 +9,7 @@ WORKDIR /repo

# Install Python dependencies
COPY requirements/prod.txt ./requirements.txt
RUN pip install --upgrade pip==22.0.4
RUN pip install --upgrade pip==23.1.2
RUN pip install -r requirements.txt
ENV PYTHONPATH ".:"

Expand Down
4 changes: 2 additions & 2 deletions lab08/api_serverless/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Starting from an official AWS image
# Keep any dependencies and versions in this file aligned with the environment.yml and Makefile
FROM public.ecr.aws/lambda/python:3.9
FROM public.ecr.aws/lambda/python:3.10

# Install Python dependencies
COPY requirements/prod.txt ./requirements.txt
RUN pip install --upgrade pip==22.0.4
RUN pip install --upgrade pip==23.1.2
RUN pip install -r requirements.txt

# Copy only the relevant directories and files
Expand Down
4 changes: 2 additions & 2 deletions lab08/app_gradio/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The "buster" flavor of the official docker Python image is based on Debian and includes common packages.
# Keep any dependencies and versions in this file aligned with the environment.yml and Makefile
FROM python:3.9-buster
FROM python:3.10-buster

# Create the working directory
# set -x prints commands and set -e causes us to stop on errors
Expand All @@ -9,7 +9,7 @@ WORKDIR /repo

# Install Python dependencies
COPY requirements/prod.txt ./requirements.txt
RUN pip install --upgrade pip==22.0.4
RUN pip install --upgrade pip==23.1.2
RUN pip install -r requirements.txt
ENV PYTHONPATH ".:"

Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pytest==7.1.1
pytest-cov==3.0.0
# versioned to match Google Colab
seaborn>=0.12,<0.13
tornado>=6.2,<6.3
tornado>=6.3,<6.4
# versioned due to Jinja2 compatibility issue
nbconvert==6.4.3
# versioned to improve stability
Expand Down
13 changes: 2 additions & 11 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with python 3.9
# This file is autogenerated by pip-compile with python 3.10
# To update, run:
#
# pip-compile requirements/dev.in
Expand Down Expand Up @@ -115,11 +115,6 @@ idna==3.4
# -c requirements/prod.txt
# requests
# yarl
importlib-metadata==5.2.0
# via
# -c requirements/prod.txt
# jupyter-client
# markdown
iniconfig==1.1.1
# via pytest
ipykernel==4.10.1
Expand Down Expand Up @@ -452,7 +447,7 @@ torchmetrics==0.7.3
# via
# -r requirements/dev.in
# pytorch-lightning
tornado==6.2
tornado==6.3.2
# via
# -r requirements/dev.in
# ipykernel
Expand Down Expand Up @@ -516,10 +511,6 @@ yarl==1.8.2
# via
# -c requirements/prod.txt
# aiohttp
zipp==3.11.0
# via
# -c requirements/prod.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
3 changes: 1 addition & 2 deletions requirements/prod.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with python 3.9
# This file is autogenerated by pip-compile with python 3.10
# To update, run:
#
# pip-compile requirements/prod.in
Expand Down Expand Up @@ -303,7 +303,6 @@ typing-extensions==4.4.0
# via
# gantry
# pydantic
# starlette
# torch
tzdata==2022.7
# via pytz-deprecation-shim
Expand Down

0 comments on commit e674946

Please sign in to comment.