mirror
/
repo2docker
kopia lustrzana https://github.com/jupyterhub/repo2docker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #277 from choldgraf/folder_search 

fixing python2 search
pull/283/head
Tim Head 2018-03-21 08:06:56 +01:00 zatwierdzone przez GitHub
rodzic eaad02ca34 2d0772afb4
commit 76e55a3e98
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 9 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
repo2docker/buildpacks/base.py
Wyświetl plik

@ -170,7 +170,7 @@ class BuildPack:
# FIXME: Use npm from nodesource! # FIXME: Use npm from nodesource!
# Everything seems to depend on npm these days, unfortunately. # Everything seems to depend on npm these days, unfortunately.
"npm", "npm",
"unzip", "unzip",
} }

15
repo2docker/buildpacks/python/__init__.py
Wyświetl plik

@ -12,7 +12,7 @@ class PythonBuildPack(BaseImage):
Note: The packages specified here are for the core Python3 language. Note: The packages specified here are for the core Python3 language.
Third party libraries are specified in other configuration files. Third party libraries are specified in other configuration files.
""" """
return super().get_packages().union({ return super().get_packages().union({
'python3', 'python3',
@ -37,7 +37,7 @@ class PythonBuildPack(BaseImage):
def get_path(self): def get_path(self):
"""Return paths (including virtual environment path) to be added to """Return paths (including virtual environment path) to be added to
the PATH environment variable. the PATH environment variable.
""" """
return super().get_path() + [ return super().get_path() + [
"${VENV_PATH}/bin" "${VENV_PATH}/bin"
@ -148,7 +148,7 @@ class Python2BuildPack(PythonBuildPack):
Note: The packages specified here are for the core Python2 language. Note: The packages specified here are for the core Python2 language.
Third party libraries are specified in other configuration files. Third party libraries are specified in other configuration files.
""" """
return super().get_packages().union({ return super().get_packages().union({
'python', 'python',
@ -162,7 +162,7 @@ class Python2BuildPack(PythonBuildPack):
We set `VENV_PATH` to the virtual environment location containing We set `VENV_PATH` to the virtual environment location containing
Python 2. Python 2.
""" """
return super().get_env() + [ return super().get_env() + [
('VENV2_PATH', '${APP_BASE}/venv2') ('VENV2_PATH', '${APP_BASE}/venv2')
@ -171,7 +171,7 @@ class Python2BuildPack(PythonBuildPack):
def get_path(self): def get_path(self):
"""Return paths (including virtual environment path) to be added to """Return paths (including virtual environment path) to be added to
the PATH environment variable. the PATH environment variable.
""" """
return super().get_path() + [ return super().get_path() + [
"${VENV2_PATH}/bin" "${VENV2_PATH}/bin"
@ -190,7 +190,7 @@ class Python2BuildPack(PythonBuildPack):
This currently adds a frozen set of Python 2 requirements to the dict This currently adds a frozen set of Python 2 requirements to the dict
of files. of files.
""" """
files = { files = {
'python/requirements2.frozen.txt': '/tmp/requirements2.frozen.txt', 'python/requirements2.frozen.txt': '/tmp/requirements2.frozen.txt',
@ -238,10 +238,11 @@ class Python2BuildPack(PythonBuildPack):
def get_assemble_scripts(self): def get_assemble_scripts(self):
"""Return series of build-steps specific to this repository. """Return series of build-steps specific to this repository.
""" """
requirements_file = self.binder_path('requirements.txt')
return super().get_assemble_scripts() + [ return super().get_assemble_scripts() + [
( (
'${NB_USER}', '${NB_USER}',
'pip2 install --no-cache-dir -r requirements.txt' 'pip2 install --no-cache-dir -r "{}"'.format(requirements_file)
) )
] ]