From a84e8ebcf55910d2fa7bba945c8040a2dba85fe1 Mon Sep 17 00:00:00 2001 From: yuvipanda Date: Thu, 30 Nov 2017 00:27:14 -0800 Subject: [PATCH] Use requirements.txt for installing base packages in requirements.txt Lets us move to a frozen requirements.txt that can be automated soon. --- repo2docker/buildpacks/python/__init__.py | 17 +++++++++++------ repo2docker/buildpacks/python/requirements.txt | 3 +++ repo2docker/buildpacks/python/requirements2.txt | 1 + 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 repo2docker/buildpacks/python/requirements.txt create mode 100644 repo2docker/buildpacks/python/requirements2.txt diff --git a/repo2docker/buildpacks/python/__init__.py b/repo2docker/buildpacks/python/__init__.py index 10bee9a6..7caef1fc 100644 --- a/repo2docker/buildpacks/python/__init__.py +++ b/repo2docker/buildpacks/python/__init__.py @@ -26,6 +26,11 @@ class PythonBuildPack(BuildPack): "${VENV_PATH}/bin" ] + + build_script_files = { + 'python/requirements.txt': '/tmp/requirements.txt', + } + build_scripts = [ ( "root", @@ -43,10 +48,7 @@ class PythonBuildPack(BuildPack): ( "${NB_USER}", r""" - pip install --no-cache-dir \ - notebook==5.2.2 \ - ipywidgets==6.0.0 \ - jupyterlab==0.28 && \ + pip install --no-cache-dir -r /tmp/requirements.txt && \ jupyter nbextension enable --py widgetsnbextension --sys-prefix && \ jupyter serverextension enable --py jupyterlab --sys-prefix """ @@ -92,6 +94,10 @@ class Python2BuildPack(BuildPack): 'virtualenv' } + build_script_files = { + 'python/requirements2.txt': '/tmp/requirements2.txt', + } + env = [ ('VENV2_PATH', '${APP_BASE}/venv2') ] @@ -117,8 +123,7 @@ class Python2BuildPack(BuildPack): ( "${NB_USER}", r""" - pip2 install --no-cache-dir \ - ipykernel==4.6.1 && \ + pip2 install --no-cache-dir -r /tmp/requirements2.txt && \ python2 -m ipykernel install --prefix=${NB_PYTHON_PREFIX} """ ) diff --git a/repo2docker/buildpacks/python/requirements.txt b/repo2docker/buildpacks/python/requirements.txt new file mode 100644 index 00000000..7fbc7ac0 --- /dev/null +++ b/repo2docker/buildpacks/python/requirements.txt @@ -0,0 +1,3 @@ +notebook==5.2.2 +ipywidgets==6.0.0 +jupyterlab==0.28 diff --git a/repo2docker/buildpacks/python/requirements2.txt b/repo2docker/buildpacks/python/requirements2.txt new file mode 100644 index 00000000..4b0eddbc --- /dev/null +++ b/repo2docker/buildpacks/python/requirements2.txt @@ -0,0 +1 @@ +ipykernel==4.6.1