From b6e54e04af04980cd70aa8c12a574e9096fbfd0a Mon Sep 17 00:00:00 2001 From: Josh Smith Date: Sun, 19 May 2019 17:34:59 -0700 Subject: [PATCH] Use pipenv without --system New best practice, see: https://github.com/pypa/pipenv/pull/2762 --- {{ cookiecutter.project_slug }}/Dockerfile.heroku | 2 +- {{ cookiecutter.project_slug }}/Dockerfile.local | 2 +- .../scripts/heroku/deploy_web.sh | 6 +++--- .../scripts/heroku/run_celery.sh | 2 +- .../scripts/heroku/run_celery_beat.sh | 2 +- .../scripts/heroku/run_web.sh | 2 +- .../scripts/local/run_celery.sh | 2 +- .../scripts/local/run_celery_beat.sh | 2 +- {{ cookiecutter.project_slug }}/scripts/local/run_web.sh | 6 +++--- .../scripts/travis/run_tests.sh | 9 +++++---- 10 files changed, 18 insertions(+), 17 deletions(-) diff --git a/{{ cookiecutter.project_slug }}/Dockerfile.heroku b/{{ cookiecutter.project_slug }}/Dockerfile.heroku index ecbad77..c057cac 100644 --- a/{{ cookiecutter.project_slug }}/Dockerfile.heroku +++ b/{{ cookiecutter.project_slug }}/Dockerfile.heroku @@ -7,7 +7,7 @@ RUN apk update && apk add postgresql-dev gcc python3-dev musl-dev libffi-dev mak # Allows docker to cache installed dependencies between builds COPY Pipfile* ./ RUN pip install pipenv -RUN pipenv install --system --deploy --ignore-pipfile +RUN pipenv install --deploy --ignore-pipfile # Adds our application code to the image COPY . /code/ diff --git a/{{ cookiecutter.project_slug }}/Dockerfile.local b/{{ cookiecutter.project_slug }}/Dockerfile.local index 569c143..791c9e5 100644 --- a/{{ cookiecutter.project_slug }}/Dockerfile.local +++ b/{{ cookiecutter.project_slug }}/Dockerfile.local @@ -7,7 +7,7 @@ RUN apk update && apk add postgresql-dev gcc python3-dev musl-dev libffi-dev mak # Allows docker to cache installed dependencies between builds COPY Pipfile* ./ RUN pip install pipenv -RUN pipenv install --dev --system --deploy --ignore-pipfile +RUN pipenv install --deploy --ignore-pipfile --dev # Adds our application code to the image COPY . /code/ diff --git a/{{ cookiecutter.project_slug }}/scripts/heroku/deploy_web.sh b/{{ cookiecutter.project_slug }}/scripts/heroku/deploy_web.sh index aca33b2..0e6effe 100755 --- a/{{ cookiecutter.project_slug }}/scripts/heroku/deploy_web.sh +++ b/{{ cookiecutter.project_slug }}/scripts/heroku/deploy_web.sh @@ -1,3 +1,3 @@ -#!/bin/bash -python manage.py migrate -python manage.py collectstatic --noinput +#!/bin/sh +pipenv run python manage.py migrate +pipenv run python manage.py collectstatic --noinput diff --git a/{{ cookiecutter.project_slug }}/scripts/heroku/run_celery.sh b/{{ cookiecutter.project_slug }}/scripts/heroku/run_celery.sh index c7cd625..9f3c898 100755 --- a/{{ cookiecutter.project_slug }}/scripts/heroku/run_celery.sh +++ b/{{ cookiecutter.project_slug }}/scripts/heroku/run_celery.sh @@ -1,2 +1,2 @@ #!/bin/sh -celery -A config.celery worker -l info +pipenv run celery -A config.celery worker -l info diff --git a/{{ cookiecutter.project_slug }}/scripts/heroku/run_celery_beat.sh b/{{ cookiecutter.project_slug }}/scripts/heroku/run_celery_beat.sh index fd54b6b..cb8847d 100755 --- a/{{ cookiecutter.project_slug }}/scripts/heroku/run_celery_beat.sh +++ b/{{ cookiecutter.project_slug }}/scripts/heroku/run_celery_beat.sh @@ -1,2 +1,2 @@ #!/bin/sh -celery -A config.celery beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler +pipenv run celery -A config.celery beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler diff --git a/{{ cookiecutter.project_slug }}/scripts/heroku/run_web.sh b/{{ cookiecutter.project_slug }}/scripts/heroku/run_web.sh index 9d32ee3..c11af16 100755 --- a/{{ cookiecutter.project_slug }}/scripts/heroku/run_web.sh +++ b/{{ cookiecutter.project_slug }}/scripts/heroku/run_web.sh @@ -1,2 +1,2 @@ #!/bin/sh -gunicorn config.wsgi:application -b 0.0.0.0:${PORT} -k config.server.production.ProductionUvicornWorker --access-logfile - +pipenv run gunicorn config.wsgi:application -b 0.0.0.0:${PORT} -k config.server.production.ProductionUvicornWorker --access-logfile - diff --git a/{{ cookiecutter.project_slug }}/scripts/local/run_celery.sh b/{{ cookiecutter.project_slug }}/scripts/local/run_celery.sh index 6dd774b..0c67e1a 100755 --- a/{{ cookiecutter.project_slug }}/scripts/local/run_celery.sh +++ b/{{ cookiecutter.project_slug }}/scripts/local/run_celery.sh @@ -1,2 +1,2 @@ #!/bin/sh -watchmedo auto-restart --patterns="*.py" -d api -- celery -A config.celery worker -l info +pipenv run watchmedo auto-restart --patterns="*.py" -d api -- celery -A config.celery worker -l info diff --git a/{{ cookiecutter.project_slug }}/scripts/local/run_celery_beat.sh b/{{ cookiecutter.project_slug }}/scripts/local/run_celery_beat.sh index 056dd44..8368ffa 100755 --- a/{{ cookiecutter.project_slug }}/scripts/local/run_celery_beat.sh +++ b/{{ cookiecutter.project_slug }}/scripts/local/run_celery_beat.sh @@ -1,2 +1,2 @@ #!/bin/sh -watchmedo auto-restart --patterns="*.py" -d api -- celery -A config.celery beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler +pipenv run watchmedo auto-restart --patterns="*.py" -d api -- celery -A config.celery beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler diff --git a/{{ cookiecutter.project_slug }}/scripts/local/run_web.sh b/{{ cookiecutter.project_slug }}/scripts/local/run_web.sh index 6b078ae..eac03e9 100755 --- a/{{ cookiecutter.project_slug }}/scripts/local/run_web.sh +++ b/{{ cookiecutter.project_slug }}/scripts/local/run_web.sh @@ -1,4 +1,4 @@ #!/bin/sh -python scripts/local/wait_for_postgres.py -python manage.py migrate -python manage.py runserver 0.0.0.0:8000 +pipenv run python scripts/local/wait_for_postgres.py +pipenv run python manage.py migrate +pipenv run python manage.py runserver 0.0.0.0:8000 diff --git a/{{ cookiecutter.project_slug }}/scripts/travis/run_tests.sh b/{{ cookiecutter.project_slug }}/scripts/travis/run_tests.sh index 688d2c3..96a85f8 100755 --- a/{{ cookiecutter.project_slug }}/scripts/travis/run_tests.sh +++ b/{{ cookiecutter.project_slug }}/scripts/travis/run_tests.sh @@ -1,5 +1,6 @@ #!/bin/sh -flake8 . && -black --check . && -python scripts/local/wait_for_postgres.py && -pytest --cov=./ +pipenv run \ + flake8 . && + black --check . && + python scripts/local/wait_for_postgres.py && + pytest --cov=./