From e126001e627345abc6515cc49d7ca6f801a2c759 Mon Sep 17 00:00:00 2001 From: Eric Soroos Date: Wed, 30 Dec 2020 11:25:34 +0100 Subject: [PATCH 1/9] Help as default goal --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6430c9776ea..3febff602a5 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.DEFAULT_GOAL := release-test +.DEFAULT_GOAL := help .PHONY: clean clean: From dae30d86016dfd3ed69d344809346d63b3039591 Mon Sep 17 00:00:00 2001 From: Eric Soroos Date: Wed, 30 Dec 2020 11:26:32 +0100 Subject: [PATCH 2/9] Removed co target -- Artifact of previous code review process --- Makefile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Makefile b/Makefile index 3febff602a5..031b1de0d3e 100644 --- a/Makefile +++ b/Makefile @@ -7,13 +7,6 @@ clean: rm -r build || true find . -name __pycache__ | xargs rm -r || true -BRANCHES=`git branch -a | grep -v HEAD | grep -v master | grep remote` -.PHONY: co -co: - -for i in $(BRANCHES) ; do \ - git checkout -t $$i ; \ - done - .PHONY: coverage coverage: pytest -qq From 85649e299d3faa7d45523d180b0939f960f6c4f7 Mon Sep 17 00:00:00 2001 From: Eric Soroos Date: Wed, 30 Dec 2020 11:51:04 +0100 Subject: [PATCH 3/9] Makefile: Lint target --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 031b1de0d3e..ab64730a2c0 100644 --- a/Makefile +++ b/Makefile @@ -102,3 +102,9 @@ test: .PHONY: readme readme: python3 setup.py --long-description | markdown2 > .long-description.html && open .long-description.html + + +.PHONY: lint +lint: + tox --help > /dev/null || pip install tox + tox -e lint From 4ba769f99e4b7493d457b562096dfe8e896b5468 Mon Sep 17 00:00:00 2001 From: Eric Soroos Date: Thu, 31 Dec 2020 16:38:41 +0100 Subject: [PATCH 4/9] documentation --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ab64730a2c0..8dd35ec5c55 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,9 @@ help: @echo " install make and install" @echo " install-coverage make and install with C coverage" @echo " install-req install documentation and test dependencies" - @echo " install-venv install in virtualenv" + @echo " install-venv (deprecated) install in virtualenv" + @echo " lint run the lint checks" + @echo " lint-fix run black to (mostly) fix lint issues." @echo " release-test run code and package tests before release" @echo " test run tests on installed pillow" @echo " upload build and upload sdists to PyPI" From 35c396c1e6298ab1fdfdd31f502419916a4acebc Mon Sep 17 00:00:00 2001 From: Eric Soroos Date: Thu, 31 Dec 2020 16:38:57 +0100 Subject: [PATCH 5/9] the other pip invocation --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8dd35ec5c55..322b5bc43df 100644 --- a/Makefile +++ b/Makefile @@ -108,5 +108,5 @@ readme: .PHONY: lint lint: - tox --help > /dev/null || pip install tox + tox --help > /dev/null || python3 -m pip install tox tox -e lint From 31b6e80f6efb33a2aa541872a728b212d33ea2fc Mon Sep 17 00:00:00 2001 From: Eric Soroos Date: Thu, 31 Dec 2020 16:39:10 +0100 Subject: [PATCH 6/9] lint-fix target, currently including black --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 322b5bc43df..0ed45370538 100644 --- a/Makefile +++ b/Makefile @@ -110,3 +110,7 @@ readme: lint: tox --help > /dev/null || python3 -m pip install tox tox -e lint + +.PHONY: lint-fix +lint-fix: + black --target-version py36 . From 78a051470cbed0f4d6e7a938f7cfeec691a66e07 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 1 Jan 2021 15:54:53 +1100 Subject: [PATCH 7/9] Added isort to lint-fix --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 0ed45370538..36338b2e185 100644 --- a/Makefile +++ b/Makefile @@ -114,3 +114,4 @@ lint: .PHONY: lint-fix lint-fix: black --target-version py36 . + isort . From 4f28ed3956a8104a7e36e7f0fe2b74d034d4a4aa Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 1 Jan 2021 23:32:46 +1100 Subject: [PATCH 8/9] Changed tabs to spaces for consistency --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 36338b2e185..af1c120393f 100644 --- a/Makefile +++ b/Makefile @@ -41,8 +41,8 @@ help: @echo " install-coverage make and install with C coverage" @echo " install-req install documentation and test dependencies" @echo " install-venv (deprecated) install in virtualenv" - @echo " lint run the lint checks" - @echo " lint-fix run black to (mostly) fix lint issues." + @echo " lint run the lint checks" + @echo " lint-fix run black to (mostly) fix lint issues." @echo " release-test run code and package tests before release" @echo " test run tests on installed pillow" @echo " upload build and upload sdists to PyPI" From 6f3670df4d27f54f2bd66f9b1f2a98e59b46bf1d Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Sat, 2 Jan 2021 09:46:03 +1100 Subject: [PATCH 9/9] Updated description --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index af1c120393f..dae26bbee19 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ help: @echo " install-req install documentation and test dependencies" @echo " install-venv (deprecated) install in virtualenv" @echo " lint run the lint checks" - @echo " lint-fix run black to (mostly) fix lint issues." + @echo " lint-fix run black and isort to (mostly) fix lint issues." @echo " release-test run code and package tests before release" @echo " test run tests on installed pillow" @echo " upload build and upload sdists to PyPI"