pull/649/head
Erik Sundell 2019-06-23 06:38:31 +02:00
rodzic fe2d9b9e0d
commit e5160e4b3f
2 zmienionych plików z 9 dodań i 19 usunięć

Wyświetl plik

@ -78,10 +78,9 @@ class PipfileBuildPack(CondaBuildPack):
# environment.
assemble_scripts = super().get_assemble_scripts()
if self.py2:
# using Python 2 as a kernel, but Python 3 for the notebook server
# requirements3.txt allows for packages to be installed to the
# notebook servers Python environment
nb_requirements_file = self.binder_path("requirements3.txt")
@ -95,7 +94,6 @@ class PipfileBuildPack(CondaBuildPack):
)
)
pipfile = self.binder_path("Pipfile")
pipfile_lock = self.binder_path("Pipfile.lock")
@ -133,7 +131,9 @@ class PipfileBuildPack(CondaBuildPack):
pipenv install {install_option} --system --dev \\
)""".format(
working_directory=working_directory,
install_option="--skip-lock" if not os.path.exists(pipfile_lock) else "--ignore-pipfile",
install_option="--skip-lock"
if not os.path.exists(pipfile_lock)
else "--ignore-pipfile",
),
)
)

Wyświetl plik

@ -11,23 +11,17 @@ assert sys.version_info[:2] == (2, 7)
# Verify - notebook server's Python: 'numpy' isn't installed
status_code = os.system("python3 -c 'import numpy'")
if status_code == 0:
raise Exception(
"notebook server's Python: 'numpy' IS installed"
)
raise Exception("notebook server's Python: 'numpy' IS installed")
# Verify - notebook server's Python: 'parse' isn't installed
status_code = os.system("python3 -c 'import parse'")
if status_code == 0:
raise Exception(
"notebook server's Python: 'parse' IS installed"
)
raise Exception("notebook server's Python: 'parse' IS installed")
# Verify - notebook server's Python: 'nbgitpuller' is installed
status_code = os.system("python3 -c 'import nbgitpuller'")
if not status_code == 0:
raise Exception(
"notebook server's Python: 'nbgitpuller' ISN'T installed"
)
raise Exception("notebook server's Python: 'nbgitpuller' ISN'T installed")
# Verify - kernel's Python: 'nbgitpuller' isn't installed
@ -36,9 +30,7 @@ try:
except ImportError:
pass
else:
raise Exception(
"kernel's Python: 'nbgitpuller' IS installed"
)
raise Exception("kernel's Python: 'nbgitpuller' IS installed")
# Verify - kernel's Python: 'numpy' is installed
try:
@ -52,6 +44,4 @@ except ImportError:
try:
import parse
except ImportError:
raise Exception(
"kernel's Python: 'parse' ISN'T installed"
)
raise Exception("kernel's Python: 'parse' ISN'T installed")