From fefcad3c1c7aa73812855a3e665ec338f4746dc6 Mon Sep 17 00:00:00 2001 From: ykatorz Date: Thu, 25 Feb 2021 21:09:39 +0100 Subject: [PATCH 1/8] fichier supprimer --- .../Untitled-checkpoint.ipynb | 6 ---- notebooks/Untitled.ipynb | 32 ------------------- 2 files changed, 38 deletions(-) delete mode 100644 notebooks/.ipynb_checkpoints/Untitled-checkpoint.ipynb delete mode 100644 notebooks/Untitled.ipynb diff --git a/notebooks/.ipynb_checkpoints/Untitled-checkpoint.ipynb b/notebooks/.ipynb_checkpoints/Untitled-checkpoint.ipynb deleted file mode 100644 index 7fec515..0000000 --- a/notebooks/.ipynb_checkpoints/Untitled-checkpoint.ipynb +++ /dev/null @@ -1,6 +0,0 @@ -{ - "cells": [], - "metadata": {}, - "nbformat": 4, - "nbformat_minor": 4 -} diff --git a/notebooks/Untitled.ipynb b/notebooks/Untitled.ipynb deleted file mode 100644 index e1c80b5..0000000 --- a/notebooks/Untitled.ipynb +++ /dev/null @@ -1,32 +0,0 @@ -{ - "cells": [ - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] - } - ], - "metadata": { - "kernelspec": { - "display_name": "Python 3", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.8.2" - } - }, - "nbformat": 4, - "nbformat_minor": 4 -} From f49a9347a7b87d9b63c689840b50bf64dfadfae7 Mon Sep 17 00:00:00 2001 From: ykatorz Date: Sat, 27 Mar 2021 19:39:04 +0100 Subject: [PATCH 2/8] evolution 2 docker file --- Dockerfile | 3 ++- README.md | 6 +++++- requirements.txt | 6 +++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d54099..6c982d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,8 @@ RUN apt-get install -y \ libffi-dev \ python3-dev \ python3-pip \ - curl + curl \ + gcc # Change Aliases RUN cd "$(dirname $(which python3))" \ diff --git a/README.md b/README.md index 136347b..9f09256 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,10 @@ Make sure to wait at least 30 seconds before launching any service ! # Development -1. After making your changes, run `docker-compose build -f dev-docker-compose.yml` +1. After making your changes, run `docker-compose -f dev-docker-compose.yml build` *(N.B. : the build process may be long, due to the build of jupyterlab after installing extensions)* + + +# Commande pour executer un notebook rapidement terminal jupyterlab +`docker exec jupyterlab bash /scripts/run_notebook.sh /home/notebooks/Data_SIMA/IMMATS.ipynb` \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 88fac3b..eb35611 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,8 @@ requests Scrapy jupyterlab ipydeps -xeus-python \ No newline at end of file +xeus-python +xlrd +openpyxl +SQLAlchemy +psycopg2-binary \ No newline at end of file From 76430f13171017aabaca48d7617f82fb649459c6 Mon Sep 17 00:00:00 2001 From: ykatorz Date: Sat, 27 Mar 2021 19:39:34 +0100 Subject: [PATCH 3/8] lancer les notebook jupyter depuis le scripts --- datafuel.docker-compose.yml | 2 ++ scripts/run_notebook.sh | 2 ++ 2 files changed, 4 insertions(+) create mode 100755 scripts/run_notebook.sh diff --git a/datafuel.docker-compose.yml b/datafuel.docker-compose.yml index ddd3446..74eda1c 100644 --- a/datafuel.docker-compose.yml +++ b/datafuel.docker-compose.yml @@ -3,11 +3,13 @@ version: '3' services: jupyterlab: image: datafuel/jupyterlab + container_name: jupyterlab environment: - TOKEN=$TOKEN command: "jupyter lab --ip=0.0.0.0 --port=8888 --allow-root --NotebookApp.token=$TOKEN" volumes: - ./notebooks:/home/notebooks + - ./scripts:/scripts ports: - 8888:8888 diff --git a/scripts/run_notebook.sh b/scripts/run_notebook.sh new file mode 100755 index 0000000..7603bf5 --- /dev/null +++ b/scripts/run_notebook.sh @@ -0,0 +1,2 @@ +NOTEBOOK=$1 +jupyter nbconvert --to notebook --execute $NOTEBOOK \ No newline at end of file From bfa6be9597297dd1fbd67a1aa503ffa53b736b85 Mon Sep 17 00:00:00 2001 From: ykatorz Date: Sat, 27 Mar 2021 19:44:12 +0100 Subject: [PATCH 4/8] rectification --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 9f09256..c7ea33a 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,6 @@ Make sure to wait at least 30 seconds before launching any service ! # Development 1. After making your changes, run `docker-compose -f dev-docker-compose.yml build` -*(N.B. : the build process may be long, due to the build of jupyterlab after installing extensions)* # Commande pour executer un notebook rapidement terminal jupyterlab From 25d023eef98c01b5b437c8a2e2518954225d5032 Mon Sep 17 00:00:00 2001 From: ykatorz Date: Mon, 29 Mar 2021 16:14:14 +0200 Subject: [PATCH 5/8] rectification readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c7ea33a..21a38ad 100644 --- a/README.md +++ b/README.md @@ -21,4 +21,4 @@ Make sure to wait at least 30 seconds before launching any service ! # Commande pour executer un notebook rapidement terminal jupyterlab -`docker exec jupyterlab bash /scripts/run_notebook.sh /home/notebooks/Data_SIMA/IMMATS.ipynb` \ No newline at end of file +`docker exec jupyterlab bash /scripts/run_notebook.sh /home/notebooks/Data_SIMA/Toutes_IMMATS.ipynb` \ No newline at end of file From d43ff5a4f120b7d47514e5ebcf679b3ac7d23715 Mon Sep 17 00:00:00 2001 From: ykatorz Date: Wed, 31 Mar 2021 13:50:59 +0200 Subject: [PATCH 6/8] rectification --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21a38ad..c21a13d 100644 --- a/README.md +++ b/README.md @@ -21,4 +21,4 @@ Make sure to wait at least 30 seconds before launching any service ! # Commande pour executer un notebook rapidement terminal jupyterlab -`docker exec jupyterlab bash /scripts/run_notebook.sh /home/notebooks/Data_SIMA/Toutes_IMMATS.ipynb` \ No newline at end of file +`docker exec jupyterlab bash /scripts/run_notebook.sh /home/notebooks/Data_SIMA/Toutes_IMMATS.ipynb` \ No newline at end of file From b64a34c4f3c786d7fd9da5cd504bd813ab646fc1 Mon Sep 17 00:00:00 2001 From: ykatorz Date: Tue, 6 Apr 2021 12:27:20 +0200 Subject: [PATCH 7/8] modification docker-compose --- README.md | 2 +- datafuel.docker-compose.yml | 20 -------------------- docker-compose.yml | 10 +++++++++- 3 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 datafuel.docker-compose.yml diff --git a/README.md b/README.md index c21a13d..ce06e67 100644 --- a/README.md +++ b/README.md @@ -21,4 +21,4 @@ Make sure to wait at least 30 seconds before launching any service ! # Commande pour executer un notebook rapidement terminal jupyterlab -`docker exec jupyterlab bash /scripts/run_notebook.sh /home/notebooks/Data_SIMA/Toutes_IMMATS.ipynb` \ No newline at end of file +`docker exec jupyterlab bash /scripts/run_notebook.sh /home/notebooks/Data_SIMA/P.O.C/immats_02_21.ipynb` \ No newline at end of file diff --git a/datafuel.docker-compose.yml b/datafuel.docker-compose.yml deleted file mode 100644 index 74eda1c..0000000 --- a/datafuel.docker-compose.yml +++ /dev/null @@ -1,20 +0,0 @@ -version: '3' - -services: - jupyterlab: - image: datafuel/jupyterlab - container_name: jupyterlab - environment: - - TOKEN=$TOKEN - command: "jupyter lab --ip=0.0.0.0 --port=8888 --allow-root --NotebookApp.token=$TOKEN" - volumes: - - ./notebooks:/home/notebooks - - ./scripts:/scripts - ports: - - 8888:8888 - -networks: - default: - external: - name: datafuel-local-network - \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 3cbc4b9..74eda1c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,10 +3,18 @@ version: '3' services: jupyterlab: image: datafuel/jupyterlab + container_name: jupyterlab environment: - TOKEN=$TOKEN command: "jupyter lab --ip=0.0.0.0 --port=8888 --allow-root --NotebookApp.token=$TOKEN" volumes: - ./notebooks:/home/notebooks + - ./scripts:/scripts ports: - - 8888:8888 \ No newline at end of file + - 8888:8888 + +networks: + default: + external: + name: datafuel-local-network + \ No newline at end of file From e7c102223cfc6fc0e735ae28d48211f838096b9f Mon Sep 17 00:00:00 2001 From: ykatorz Date: Wed, 14 Apr 2021 09:54:27 +0200 Subject: [PATCH 8/8] rectification du readme --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ce06e67..9772d7e 100644 --- a/README.md +++ b/README.md @@ -21,4 +21,10 @@ Make sure to wait at least 30 seconds before launching any service ! # Commande pour executer un notebook rapidement terminal jupyterlab -`docker exec jupyterlab bash /scripts/run_notebook.sh /home/notebooks/Data_SIMA/P.O.C/immats_02_21.ipynb` \ No newline at end of file +`docker exec jupyterlab bash /scripts/run_notebook.sh /home/notebooks/Data_SIMA/P.O.C/immats_03_21.ipynb` + +`docker exec jupyterlab bash /scripts/run_notebook.sh /home/notebooks/Data_SIMA/P.O.C/immats_2018.ipynb` + +`docker exec jupyterlab bash /scripts/run_notebook.sh /home/notebooks/Data_SIMA/P.O.C/immats_2019.ipynb` + +`docker exec jupyterlab bash /scripts/run_notebook.sh /home/notebooks/Data_SIMA/P.O.C/immats_2020.ipynb` \ No newline at end of file