Merge pull request #306 from codecrafters-io/andy/fix

andy1li · web-flow · commit 15d8e92df458 · 2025-05-20T20:00:46.000+09:00
[Redis] CC-1750: Fix python Dockerfiles missing pipenv
diff --git a/compiled_starters/python/.codecrafters/run.sh b/compiled_starters/python/.codecrafters/run.sh
@@ -8,4 +8,4 @@
 
 set -e # Exit on failure
 
-exec python3 -m app.main "$@"
+exec pipenv run python3 -m app.main "$@"
diff --git a/compiled_starters/python/.gitignore b/compiled_starters/python/.gitignore
@@ -94,6 +94,12 @@ ipython_config.py
 #   install all needed dependencies.
 #Pipfile.lock
 
+# UV
+#   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#uv.lock
+
 # poetry
 #   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
 #   This is especially recommended for binary packages to ensure reproducibility, and is more
@@ -106,8 +112,10 @@ ipython_config.py
 #pdm.lock
 #   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
 #   in version control.
-#   https://pdm.fming.dev/#use-with-ide
+#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
 .pdm.toml
+.pdm-python
+.pdm-build/
 
 # PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
 __pypackages__/
@@ -151,3 +159,16 @@ dmypy.json
 
 # Cython debug symbols
 cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+.idea/
+
+# Ruff stuff:
+.ruff_cache/
+
+# PyPI configuration file
+.pypirc
diff --git a/compiled_starters/python/Pipfile b/compiled_starters/python/Pipfile
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+
+[dev-packages]
+
+[requires]
+python_version = "3"
diff --git a/compiled_starters/python/Pipfile.lock b/compiled_starters/python/Pipfile.lock
diff --git a/compiled_starters/python/your_program.sh b/compiled_starters/python/your_program.sh
@@ -12,4 +12,4 @@ set -e # Exit early if any commands fail
 #
 # - Edit this to change how your program runs locally
 # - Edit .codecrafters/run.sh to change how your program runs remotely
-exec python3 -m app.main "$@"
+exec pipenv run python3 -m app.main "$@"
diff --git a/dockerfiles/python-3.13.Dockerfile b/dockerfiles/python-3.13.Dockerfile
@@ -1 +1,17 @@
 FROM python:3.13-alpine
+
+RUN pip install --no-cache-dir pipenv==2025.0.2
+
+COPY Pipfile /app/Pipfile
+COPY Pipfile.lock /app/Pipfile.lock
+
+WORKDIR /app
+
+ENV WORKON_HOME=/venvs
+
+RUN pipenv install
+
+# Force environment creation
+RUN pipenv run python3 -c "1+1"
+
+ENV CODECRAFTERS_DEPENDENCY_FILE_PATHS="Pipfile,Pipfile.lock"
diff --git a/solutions/python/01-jm1/code/.codecrafters/run.sh b/solutions/python/01-jm1/code/.codecrafters/run.sh
@@ -8,4 +8,4 @@
 
 set -e # Exit on failure
 
-exec python3 -m app.main "$@"
+exec pipenv run python3 -m app.main "$@"
diff --git a/solutions/python/01-jm1/code/.gitignore b/solutions/python/01-jm1/code/.gitignore
@@ -94,6 +94,12 @@ ipython_config.py
 #   install all needed dependencies.
 #Pipfile.lock
 
+# UV
+#   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#uv.lock
+
 # poetry
 #   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
 #   This is especially recommended for binary packages to ensure reproducibility, and is more
@@ -106,8 +112,10 @@ ipython_config.py
 #pdm.lock
 #   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
 #   in version control.
-#   https://pdm.fming.dev/#use-with-ide
+#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
 .pdm.toml
+.pdm-python
+.pdm-build/
 
 # PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
 __pypackages__/
@@ -151,3 +159,16 @@ dmypy.json
 
 # Cython debug symbols
 cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+.idea/
+
+# Ruff stuff:
+.ruff_cache/
+
+# PyPI configuration file
+.pypirc
diff --git a/solutions/python/01-jm1/code/Pipfile b/solutions/python/01-jm1/code/Pipfile
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+
+[dev-packages]
+
+[requires]
+python_version = "3"
diff --git a/solutions/python/01-jm1/code/Pipfile.lock b/solutions/python/01-jm1/code/Pipfile.lock
diff --git a/solutions/python/01-jm1/code/your_program.sh b/solutions/python/01-jm1/code/your_program.sh
@@ -12,4 +12,4 @@ set -e # Exit early if any commands fail
 #
 # - Edit this to change how your program runs locally
 # - Edit .codecrafters/run.sh to change how your program runs remotely
-exec python3 -m app.main "$@"
+exec pipenv run python3 -m app.main "$@"
diff --git a/solutions/python/02-rg2/code/Pipfile b/solutions/python/02-rg2/code/Pipfile
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+
+[dev-packages]
+
+[requires]
+python_version = "3"
diff --git a/solutions/python/02-rg2/code/Pipfile.lock b/solutions/python/02-rg2/code/Pipfile.lock
diff --git a/solutions/python/02-rg2/code/your_program.sh b/solutions/python/02-rg2/code/your_program.sh
@@ -12,4 +12,4 @@ set -e # Exit early if any commands fail
 #
 # - Edit this to change how your program runs locally
 # - Edit .codecrafters/run.sh to change how your program runs remotely
-exec python3 -m app.main "$@"
+exec pipenv run python3 -m app.main "$@"
diff --git a/starter_templates/python/code/.codecrafters/run.sh b/starter_templates/python/code/.codecrafters/run.sh
@@ -8,4 +8,4 @@
 
 set -e # Exit on failure
 
-exec python3 -m app.main "$@"
+exec pipenv run python3 -m app.main "$@"
diff --git a/starter_templates/python/code/.gitignore b/starter_templates/python/code/.gitignore
@@ -94,6 +94,12 @@ ipython_config.py
 #   install all needed dependencies.
 #Pipfile.lock
 
+# UV
+#   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#uv.lock
+
 # poetry
 #   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
 #   This is especially recommended for binary packages to ensure reproducibility, and is more
@@ -106,8 +112,10 @@ ipython_config.py
 #pdm.lock
 #   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
 #   in version control.
-#   https://pdm.fming.dev/#use-with-ide
+#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
 .pdm.toml
+.pdm-python
+.pdm-build/
 
 # PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
 __pypackages__/
@@ -151,3 +159,16 @@ dmypy.json
 
 # Cython debug symbols
 cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+.idea/
+
+# Ruff stuff:
+.ruff_cache/
+
+# PyPI configuration file
+.pypirc
diff --git a/starter_templates/python/code/Pipfile b/starter_templates/python/code/Pipfile
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+
+[dev-packages]
+
+[requires]
+python_version = "3"
diff --git a/starter_templates/python/code/Pipfile.lock b/starter_templates/python/code/Pipfile.lock
diff --git a/starter_templates/python/config.yml b/starter_templates/python/config.yml
@@ -1,3 +1,3 @@
 attributes:
-  required_executable: python (3.13)
-  user_editable_file: app/main.py
+  required_executable: "python (3.13)"
+  user_editable_file: "app/main.py"

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@`
`8`	`8`
`9`	`9`	`set -e # Exit on failure`
`10`	`10`
`11`		`-exec python3 -m app.main "$@"`
	`11`	`+exec pipenv run python3 -m app.main "$@"`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,4 @@ set -e # Exit early if any commands fail`
`12`	`12`	`#`
`13`	`13`	`# - Edit this to change how your program runs locally`
`14`	`14`	`# - Edit .codecrafters/run.sh to change how your program runs remotely`
`15`		`-exec python3 -m app.main "$@"`
	`15`	`+exec pipenv run python3 -m app.main "$@"`