From 2ac2685192020c563779d0dbc98f8b9cdb2243ae Mon Sep 17 00:00:00 2001 From: Michael Chin Date: Fri, 7 Apr 2023 19:18:53 -0700 Subject: [PATCH 1/2] Enforce Python 3.8 on Dockerfile --- Dockerfile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index e3255128..8a81bdbc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ENV pipargs="" ENV WORKING_DIR="/root" ENV NOTEBOOK_DIR="${WORKING_DIR}/notebooks" ENV EXAMPLE_NOTEBOOK_DIR="${NOTEBOOK_DIR}/Example Notebooks" -ENV NODE_VERSION=12.x +ENV NODE_VERSION=14.x ENV GRAPH_NOTEBOOK_AUTH_MODE="DEFAULT" ENV GRAPH_NOTEBOOK_HOST="neptune.cluster-XXXXXXXXXXXX.us-east-1.neptune.amazonaws.com" ENV GRAPH_NOTEBOOK_PROXY_PORT="8192" @@ -36,12 +36,16 @@ RUN mkdir -p "${WORKING_DIR}" && \ mkdir -p "${EXAMPLE_NOTEBOOK_DIR}" && \ # Yum Update and install dependencies yum update -y && \ - yum install tar gzip git -y && \ + yum install tar gzip git amazon-linux-extras which -y && \ # Install NPM/Node curl --silent --location https://rpm.nodesource.com/setup_${NODE_VERSION} | bash - && \ yum install nodejs -y && \ npm install -g opencollective && \ - yum install python3 -y && \ + # Install Python 3.8 + amazon-linux-extras install python3.8 -y && \ + update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1 && \ + echo 'Using python version:' && \ + python3 --version && \ python3 -m ensurepip --upgrade && \ python3 -m venv /tmp/venv && \ source /tmp/venv/bin/activate && \ @@ -49,7 +53,8 @@ RUN mkdir -p "${WORKING_DIR}" && \ # Clone the repo and install python dependencies git clone https://github.com/aws/graph-notebook && \ cd "${WORKING_DIR}/graph-notebook" && \ - pip3 install --upgrade pip setuptools wheel twine && \ + pip3 install --upgrade pip setuptools wheel && \ + pip3 install twine==3.7.1 && \ pip3 install -r requirements.txt && \ pip3 install "jupyterlab>=3" && \ # Build the package From 8307cdb9aa15adc9a10c9c005a455e8a04e45d08 Mon Sep 17 00:00:00 2001 From: Michael Chin Date: Thu, 13 Apr 2023 17:14:54 -0700 Subject: [PATCH 2/2] update changelog --- ChangeLog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.md b/ChangeLog.md index bdf277a6..467fb880 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -6,6 +6,7 @@ Starting with v1.31.6, this file will contain a record of major features and upd - Fixed Dockerfile builds breaking with AL2023 ([Link to PR](https://github.com/aws/graph-notebook/pull/466)) - Fixed `--store-to` option for several magics ([Link to PR](https://github.com/aws/graph-notebook/pull/463)) - Fixed broken documentation links in Neptune ML notebooks ([PR #1](https://github.com/aws/graph-notebook/pull/467)) ([PR #2](https://github.com/aws/graph-notebook/pull/468)) +- Deprecated Python 3.7 support ([PR #1](https://github.com/aws/graph-notebook/pull/453)) ([PR #2](https://github.com/aws/graph-notebook/pull/473)) ## Release 3.7.3 (March 14, 2023) - Fixed detailed mode output for graph summary requests ([Link to PR](https://github.com/aws/graph-notebook/pull/461))