Skip to content

Commit

Permalink
upgrade to python 3.12 and Pangeo 2024.10.01
Browse files Browse the repository at this point in the history
  • Loading branch information
mgdenno committed Oct 7, 2024
1 parent 552f57a commit 5077ec6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build TEEHR
FROM python:3.11 AS builder
FROM python:3.12 AS builder

WORKDIR /teehr

Expand All @@ -12,11 +12,11 @@ RUN TEEHR_VERSION=$(cat /teehr/version.txt) && \
mv dist/teehr-${TEEHR_VERSION}.tar.gz dist/teehr-build.tar.gz

# Install TEEHR in the Pangeo Image
FROM pangeo/pangeo-notebook:2024.03.13
FROM pangeo/pangeo-notebook:2024.10.01

USER root
ENV DEBIAN_FRONTEND=noninteractive
ENV PATH ${NB_PYTHON_PREFIX}/bin:$PATH
ENV PATH=${NB_PYTHON_PREFIX}/bin:$PATH

# Needed for apt-key to work -- Is this part needed?
RUN apt-get update -qq --yes > /dev/null && \
Expand All @@ -30,7 +30,7 @@ RUN apt-get update \
RUN mamba install -n ${CONDA_ENV} -y -c conda-forge nodejs selenium geckodriver pyspark

# Set up the environment for pyspark
ENV SPARK_HOME ${NB_PYTHON_PREFIX}/lib/python3.11/site-packages/pyspark
ENV SPARK_HOME=${NB_PYTHON_PREFIX}/lib/python3.12/site-packages/pyspark
RUN curl -s https://repo1.maven.org/maven2/com/amazonaws/aws-java-sdk-bundle/1.12.262/aws-java-sdk-bundle-1.12.262.jar -Lo ${SPARK_HOME}/jars/aws-java-sdk-bundle-1.12.262.jar
RUN curl -s https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-aws/3.3.4/hadoop-aws-3.3.4.jar -Lo ${SPARK_HOME}/jars/hadoop-aws-3.3.4.jar

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ readme = "README.md"
[tool.poetry.dependencies]
python = "^3.10"
geopandas = "^0.14.0"
duckdb = "^0.9.2"
duckdb = "^1.0.0"
pydantic = "^2.4.2"
hydrotools-metrics = "^1.3.3"
hydrotools-nwis-client = "^3.3.1"
Expand Down

0 comments on commit 5077ec6

Please sign in to comment.