Skip to content

Commit 7d0478a

Browse files
authored
Merge pull request #235 from oz123/pipenv-improvements
feature: use pipenv sync instead of install
2 parents 5507705 + 0d299df commit 7d0478a

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

internal/question/build_steps.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (q *BuildSteps) Ask(ctx context.Context) error {
4040
"# Install Pipenv as a global tool",
4141
"python -m venv /app/.global",
4242
"pip install pipenv==$PIPENV_TOOL_VERSION",
43-
"pipenv install",
43+
"pipenv sync",
4444
)
4545
case models.Pip:
4646
answers.BuildSteps = append(

internal/question/environment.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ func (q *Environment) Ask(ctx context.Context) error {
1818
for _, dm := range answers.DependencyManagers {
1919
switch dm {
2020
case models.Poetry:
21-
answers.Environment["POETRY_VERSION"] = "1.4.0"
21+
answers.Environment["POETRY_VERSION"] = "1.8.4"
2222
answers.Environment["POETRY_VIRTUALENVS_IN_PROJECT"] = "true"
2323
case models.Pipenv:
24-
answers.Environment["PIPENV_TOOL_VERSION"] = "2023.2.18"
24+
answers.Environment["PIPENV_TOOL_VERSION"] = "2024.2.0"
2525
answers.Environment["PIPENV_VENV_IN_PROJECT"] = "1"
2626
}
2727
}

platformifier/templates/django/settings_psh.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@ def decode(variable):
2222
JSON decoding error.
2323
"""
2424
try:
25-
if sys.version_info[1] > 5:
26-
return json.loads(base64.b64decode(variable))
27-
else:
28-
return json.loads(base64.b64decode(variable).decode("utf-8"))
25+
return json.loads(base64.b64decode(variable))
2926
except json.decoder.JSONDecodeError:
3027
print("Error decoding JSON, code %d", json.decoder.JSONDecodeError)
3128

0 commit comments

Comments
 (0)