Skip to content

Commit 0345a86

Browse files
authored
Merge pull request #1184 from minrk/unsupported-python
2 parents 7580a30 + 1841bf7 commit 0345a86

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

repo2docker/buildpacks/conda/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ def get_build_script_files(self):
163163
frozen_name = "environment.lock"
164164
pip_frozen_name = "requirements.txt"
165165
if py_version:
166-
if self.py2:
166+
if self.python_version == "2.7":
167167
# python 2 goes in a different env
168168
files[
169169
"conda/environment.py-2.7.lock"
@@ -180,8 +180,8 @@ def get_build_script_files(self):
180180
if os.path.exists(os.path.join(HERE, py_frozen_name)):
181181
frozen_name = py_frozen_name
182182
pip_frozen_name = f"requirements.py-{py_version}.pip"
183-
if not frozen_name:
184-
self.log.warning(f"No frozen env for {py_version}\n")
183+
else:
184+
raise ValueError(f"Python version {py_version} is not supported!")
185185
files[
186186
"conda/" + frozen_name
187187
] = self._nb_environment_file = "/tmp/env/environment.lock"

tests/unit/test_buildpack.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import pytest
44
from tempfile import TemporaryDirectory
5-
from repo2docker.buildpacks import LegacyBinderDockerBuildPack
5+
from repo2docker.buildpacks import LegacyBinderDockerBuildPack, PythonBuildPack
66
from repo2docker.utils import chdir
77

88

@@ -35,3 +35,13 @@ def test_legacy_on_repo_without_dockerfile():
3535
with chdir(repodir):
3636
bp = LegacyBinderDockerBuildPack()
3737
assert not bp.detect()
38+
39+
40+
@pytest.mark.parametrize("python_version", ["2.6", "3.0", "4.10", "3.99"])
41+
def test_unsupported_python(tmpdir, python_version):
42+
tmpdir.chdir()
43+
bp = PythonBuildPack()
44+
bp._python_version = python_version
45+
assert bp.python_version == python_version
46+
with pytest.raises(ValueError):
47+
bp.render()

0 commit comments

Comments
 (0)