From 35d57d048bab0b22e54999100707833a6150b335 Mon Sep 17 00:00:00 2001 From: enchance Date: Fri, 24 Jul 2020 00:53:56 +0800 Subject: [PATCH 1/4] Compatibility issue for mypy 0.782. Must be mypy 0.770 because it uses djago-stubs 1.5.0. --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index cbb8dc319..f315d9dc7 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchgod==0.6 # https://github.com/samuelcolvin/watchgod # Testing # ------------------------------------------------------------------------------ -mypy==0.782 # https://github.com/python/mypy +mypy==0.770 # https://github.com/python/mypy django-stubs==1.5.0 # https://github.com/typeddjango/django-stubs pytest==5.4.3 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar From 160ed6cb6d5ee552bef7fc5538255a074e85624f Mon Sep 17 00:00:00 2001 From: enchance Date: Fri, 24 Jul 2020 01:00:56 +0800 Subject: [PATCH 2/4] Added name to CONTRIBUTORS.txt --- {{cookiecutter.project_slug}}/CONTRIBUTORS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt b/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt index 82a80bfc1..e8450c4c3 100644 --- a/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt +++ b/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt @@ -1 +1 @@ -{{ cookiecutter.author_name }} +enchance \ No newline at end of file From 97e18889c68b55326fbf11685ebc7d239ac7ed72 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 11 Aug 2020 16:05:14 +0100 Subject: [PATCH 3/4] Revert "Added name to CONTRIBUTORS.txt" This reverts commit 160ed6cb --- {{cookiecutter.project_slug}}/CONTRIBUTORS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt b/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt index e8450c4c3..82a80bfc1 100644 --- a/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt +++ b/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt @@ -1 +1 @@ -enchance \ No newline at end of file +{{ cookiecutter.author_name }} From 1645b8826d49a8bd57c8843bc8e78df0708163d3 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 11 Aug 2020 16:20:10 +0100 Subject: [PATCH 4/4] Use the pip resolver to avoid broken deps --- tests/test_bare.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/test_bare.sh b/tests/test_bare.sh index 7021a7e47..28f9b7bfb 100755 --- a/tests/test_bare.sh +++ b/tests/test_bare.sh @@ -5,6 +5,10 @@ set -o errexit +# Install modern pip to use new resolver: +# https://blog.python.org/2020/07/upgrade-pip-20-2-changes-20-3.html +pip install 'pip>=20.2' + # install test requirements pip install -r requirements.txt @@ -20,7 +24,7 @@ cd my_awesome_project sudo utility/install_os_dependencies.sh install # Install Python deps -pip install -r requirements/local.txt +pip install --use-feature=2020-resolver -r requirements/local.txt # run the project's tests pytest