diff --git a/{{cookiecutter.repo_name}}/Dockerfile-django.production b/{{cookiecutter.repo_name}}/Dockerfile-django.production index 2671347..92ed407 100644 --- a/{{cookiecutter.repo_name}}/Dockerfile-django.production +++ b/{{cookiecutter.repo_name}}/Dockerfile-django.production @@ -29,8 +29,7 @@ ENV POETRY_NO_INTERACTION 1 ENV POETRY_VIRTUALENVS_CREATE 0 ENV PATH="$POETRY_HOME/bin:$PATH" -RUN wget https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py && \ - python3 get-poetry.py +RUN wget -O - -o /dev/null https://install.python-poetry.org | python3 - COPY pyproject.toml / COPY poetry.lock / diff --git a/{{cookiecutter.repo_name}}/Dockerfile-django.production.debian b/{{cookiecutter.repo_name}}/Dockerfile-django.production.debian index c5d0c38..0e30fd9 100644 --- a/{{cookiecutter.repo_name}}/Dockerfile-django.production.debian +++ b/{{cookiecutter.repo_name}}/Dockerfile-django.production.debian @@ -28,8 +28,7 @@ ENV POETRY_NO_INTERACTION 1 ENV POETRY_VIRTUALENVS_CREATE 0 ENV PATH="$POETRY_HOME/bin:$PATH" -RUN wget https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py && \ - python3 get-poetry.py +RUN wget -O - -o /dev/null https://install.python-poetry.org | python3 - COPY pyproject.toml / COPY poetry.lock / diff --git a/{{cookiecutter.repo_name}}/pyproject.toml b/{{cookiecutter.repo_name}}/pyproject.toml index fb0861c..055a57b 100644 --- a/{{cookiecutter.repo_name}}/pyproject.toml +++ b/{{cookiecutter.repo_name}}/pyproject.toml @@ -104,6 +104,7 @@ exclude = ''' | build | dist | docs + | cover )/ | local.py | local_test.py diff --git a/{{cookiecutter.repo_name}}/scripts/django-dev-entrypoint.sh b/{{cookiecutter.repo_name}}/scripts/django-dev-entrypoint.sh index 30ebe34..cfe734d 100755 --- a/{{cookiecutter.repo_name}}/scripts/django-dev-entrypoint.sh +++ b/{{cookiecutter.repo_name}}/scripts/django-dev-entrypoint.sh @@ -59,7 +59,8 @@ fi if [[ "${DPT_VENV_CACHING}" -eq "1" ]]; then reported_path=$(poetry env list | cut -f 1 -d ' ') - if [[ "${reported_path}" != "${ENV_FOLDER}" ]]; then + # Bail out if ENV_FOLDER does not match reported_path or if it does not exists in the poetry env list (when multiple are available). + if [[ "${reported_path}" != "${ENV_FOLDER}" ]] && [[ $reported_path != *"${ENV_FOLDER}"* ]]; then echo "The env folder path does not match ENV_FOLDER setting. Please update ENV_FOLDER" echo " in Dockerfile-django." echo "" diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/.prospector.yaml b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/.prospector.yaml index c9c36ca..f7ab091 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/.prospector.yaml +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/.prospector.yaml @@ -9,6 +9,7 @@ ignore-paths: ignore-patterns: - migrations/ - htmlcov/ + - cover/ pycodestyle: enable: diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/mypy.ini b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/mypy.ini index 3cb0c21..41ad9e7 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/mypy.ini +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/mypy.ini @@ -13,6 +13,13 @@ warn_redundant_casts = True warn_unused_configs = True warn_unreachable = True warn_no_return = True +exclude = (?x)( + local\.py$ + | local_test\.py$ + | test_(.+) + | tests\.py + | tests + ) plugins = mypy_django_plugin.main,