From 1dfbe273f0deb7642ba2f7427d3b4d5733f01eb2 Mon Sep 17 00:00:00 2001 From: Alex Clark Date: Wed, 23 Mar 2016 17:18:08 -0400 Subject: [PATCH 1/7] Clean up reqs - pip freeze - Combine docs/requirements.txt with requirements.txt (No need for separate reqs if top-level calls sub-level.) --- docs/requirements.txt | 2 -- requirements.txt | 33 +++++++++++++++++++++++---------- 2 files changed, 23 insertions(+), 12 deletions(-) delete mode 100644 docs/requirements.txt diff --git a/docs/requirements.txt b/docs/requirements.txt deleted file mode 100644 index 6b104fb015c..00000000000 --- a/docs/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -Sphinx -sphinx-rtd-theme diff --git a/requirements.txt b/requirements.txt index 179635722b2..35e4fde1026 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,24 @@ -# Testing and documentation requirements -e . --r docs/requirements.txt -coveralls -nose -nose-cov -pep8 -pyflakes -check-manifest -pyroma -jarn.viewdoc +Babel==2.2.0 +Jinja2==2.8 +MarkupSafe==0.23 +Pygments==2.1.3 +Sphinx==1.3.6 +alabaster==0.7.7 +check-manifest==0.31 +cov-core==1.15.0 +coverage==4.0.3 +coveralls==1.1 +docopt==0.6.2 +docutils==0.12 +jarn.viewdoc==1.7 +nose-cov==1.6 +nose==1.3.7 +pep8==1.7.0 +pyflakes==1.1.0 +pyroma==2.0.2 +pytz==2016.2 +requests==2.9.1 +six==1.10.0 +snowballstemmer==1.2.1 +sphinx-rtd-theme==0.1.9 From a52b468e96337965f901708f8134da287beda438 Mon Sep 17 00:00:00 2001 From: Alex Clark Date: Wed, 23 Mar 2016 17:23:08 -0400 Subject: [PATCH 2/7] Add note about reqs [ci skip] These are development, documentation & testing requirements (i.e. not installation requirements.) --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 35e4fde1026..6a581002b5b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +# Development, documentation & testing requirements. -e . Babel==2.2.0 Jinja2==2.8 From 3af794bc058ff74159a5317fe5af1da79ada84c6 Mon Sep 17 00:00:00 2001 From: Alex Clark Date: Wed, 23 Mar 2016 17:30:55 -0400 Subject: [PATCH 3/7] Exclude more build detritus from package --- MANIFEST.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 5476d49df83..f6a1488f0b1 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -20,8 +20,12 @@ graft docs prune docs/_static # build/src control detritus +exclude .coveragerc +exclude .editorconfig +exclude .landscape.yaml +exclude appveyor.yml exclude build_children.sh +exclude tox.ini global-exclude .git* global-exclude *.pyc global-exclude *.so - From 74493e161673761538bcfd5a53eb58cef13a7237 Mon Sep 17 00:00:00 2001 From: Alex Clark Date: Thu, 24 Mar 2016 07:44:42 -0400 Subject: [PATCH 4/7] Add install-venv makefile target [ci skip] - Creates a venv, runs pip install --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 24b8c5f6b5b..b707f076683 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,7 @@ help: @echo " inplace make inplace extension" @echo " install make and install" @echo " install-req install documentation and test dependencies" + @echo " install-venv install in virtualenv" @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" @@ -48,6 +49,8 @@ install: install-req: pip install -r requirements.txt +install-venv: venv install-req + release-test: $(MAKE) install-req python setup.py develop @@ -76,5 +79,8 @@ upload-test: upload: python setup.py sdist --format=gztar,zip upload +venv: + virtualenv . + readme: viewdoc From 5bb7ac3662a53210e57f271cd260bc6c46f738f6 Mon Sep 17 00:00:00 2001 From: Alex Clark Date: Thu, 24 Mar 2016 07:51:45 -0400 Subject: [PATCH 5/7] Add makefile target `co` for code review - `make co` to checkout all branches for code review --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index b707f076683..7256bca138c 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,12 @@ clean: rm -r build || true find . -name __pycache__ | xargs rm -r || true +BRANCHES=`git branch -a | grep -v HEAD | grep -v master | grep remote` +co: + -for i in $(BRANCHES) ; do \ + git checkout -t $$i ; \ + done + coverage: coverage erase coverage run --parallel-mode --include=PIL/* selftest.py From 557801977ea5959df5080fe5559b4110f6b3649d Mon Sep 17 00:00:00 2001 From: Alex Clark Date: Thu, 24 Mar 2016 08:06:55 -0400 Subject: [PATCH 6/7] Use venv & run release-test [ci skip] - Call python with relative path (bin/python) to use venv python. - Possibly positioning `install-venv` to be the default target. - No need to factor out venv target. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7256bca138c..84d1cd1ad18 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,10 @@ install: install-req: pip install -r requirements.txt -install-venv: venv install-req +install-venv: + virtualenv . + bin/pip install -r requirements.txt + $(MAKE) release-test release-test: $(MAKE) install-req @@ -85,8 +88,5 @@ upload-test: upload: python setup.py sdist --format=gztar,zip upload -venv: - virtualenv . - readme: viewdoc From 86561f61c6dfe5419c71f6ab7a87387d0dd9d878 Mon Sep 17 00:00:00 2001 From: Alex Clark Date: Thu, 24 Mar 2016 08:14:06 -0400 Subject: [PATCH 7/7] Dont call release-test from install-venv [ci skip] release-test will use python from PATH not venv --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 84d1cd1ad18..148a70070a8 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,6 @@ install-req: install-venv: virtualenv . bin/pip install -r requirements.txt - $(MAKE) release-test release-test: $(MAKE) install-req