From 72ffa2380ed835dc522b8fabeaa9bf6489d639ee Mon Sep 17 00:00:00 2001 From: George Dang <53052793+gtdang@users.noreply.github.com> Date: Thu, 15 Jun 2023 16:32:52 +0000 Subject: [PATCH 1/3] Update python in Readme --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f3c717ef..cc3cab04 100644 --- a/README.md +++ b/README.md @@ -59,13 +59,14 @@ To add a new class: - `-c`: class name (string) - `-s`: class season/semester (fall, summer, spring) - `-t`: target in docker file (string – `base`, `r_lang` or `r_julia`) - - `-p`: python version (i.e 3.7 if ommited defaults to 3.10) + - `-p`: python version (i.e 3.9 if ommited defaults to 3.10) - `-q`: wheter to install sqlite kernel (ommit the `-q` tag if sqlite is not required) +The example below shows creating a class specifying an older version of python (3.9). Omitting the `-p` argument will default version (currently 3.10). The default python is configured in the `docker-compose.yml`. ```bash # e.g cd dev/ -./add_class.sh -c data1010 -t r_julia -s fall -p 3.7 -q +./add_class.sh -c data1010 -t r_julia -s fall -p 3.9 -q ``` To build the images locally: From f45f934e7309d25a731c3d929bb11062a928b8b1 Mon Sep 17 00:00:00 2001 From: George Dang <53052793+gtdang@users.noreply.github.com> Date: Thu, 15 Jun 2023 16:34:54 +0000 Subject: [PATCH 2/3] Update text. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cc3cab04..a3cb8e43 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ To add a new class: - `-p`: python version (i.e 3.9 if ommited defaults to 3.10) - `-q`: wheter to install sqlite kernel (ommit the `-q` tag if sqlite is not required) -The example below shows creating a class specifying an older version of python (3.9). Omitting the `-p` argument will default version (currently 3.10). The default python is configured in the `docker-compose.yml`. +The example below shows creating a class specifying an older version of python (3.9). Omitting the `-p` argument will use the default version (currently 3.10). The default python is configured in the `docker-compose.yml`. ```bash # e.g cd dev/ From c0c58c31000d676da3caca87a462c7e4f397a941 Mon Sep 17 00:00:00 2001 From: George Dang <53052793+gtdang@users.noreply.github.com> Date: Thu, 15 Jun 2023 16:57:24 +0000 Subject: [PATCH 3/3] Update defaults to python 3.9 --- README.md | 6 +++--- dev/add_class.sh | 2 +- docker-compose.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a3cb8e43..c3418ca3 100644 --- a/README.md +++ b/README.md @@ -59,10 +59,10 @@ To add a new class: - `-c`: class name (string) - `-s`: class season/semester (fall, summer, spring) - `-t`: target in docker file (string – `base`, `r_lang` or `r_julia`) - - `-p`: python version (i.e 3.9 if ommited defaults to 3.10) - - `-q`: wheter to install sqlite kernel (ommit the `-q` tag if sqlite is not required) + - `-p`: python version (i.e if ommited defaults to 3.9) + - `-q`: whether to install sqlite kernel (ommit the `-q` tag if sqlite is not required) -The example below shows creating a class specifying an older version of python (3.9). Omitting the `-p` argument will use the default version (currently 3.10). The default python is configured in the `docker-compose.yml`. +The example below shows creating a class specifying the python version. Omitting the `-p` argument will use the default version (currently 3.9). The default python is configured in the `add_class.sh`. ```bash # e.g cd dev/ diff --git a/dev/add_class.sh b/dev/add_class.sh index 29f99e4a..bf350c42 100755 --- a/dev/add_class.sh +++ b/dev/add_class.sh @@ -2,7 +2,7 @@ set -e #default version of Python to use -PYTHON_VERSION=3.10 +PYTHON_VERSION=3.9 usage () { echo "Usage:" echo " -h – help" diff --git a/docker-compose.yml b/docker-compose.yml index 8262cd75..4b2adee1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,7 +23,7 @@ services: args: CLASS: ${CLASS} SQLITE: ${SQLITE:-false} - PYTHON_VERSION: ${PYTHON_VERSION:-3.10} + PYTHON_VERSION: ${PYTHON_VERSION:-3.9} volumes: - ./requirements/out:/home/jovyan/tmp/out user: root