bump version, merge branch 'devel'

Author: casperdcl

.travis.yml

@@ -1,53 +1,46 @@
-sudo: required
-dist: trusty
 language: python
-python: 3.5
-
-# use cache for big builds
+matrix:
+  include:
+  - python: 2.6
+    env: TOXENV=py26
+  - python: 2.7
+    env: TOXENV=py27
+  - python: 3.4
+    env: TOXENV=py34
+  - python: 3.5
+    env: TOXENV=py35
+  - python: 3.6
+    env: TOXENV=py36
+  - python: 3.7
+    dist: xenial
+    sudo: true
+    env: TOXENV=py37
+  - python: pypy2.7-5.10.0
+    env: TOXENV=pypy
+  - python: pypy3.5-5.10.0
+    env: TOXENV=pypy3
+  - python: 3.6
+    env: TOXENV=flake8
+# use cache for big builds like pandas (to minimise build time).
+# If issues, clear cache
+# https://docs.travis-ci.com/user/caching/#Clearing-Caches
 cache:
   pip: true
   directories:
     - $HOME/.cache/pip
 before_cache:
   - rm -f $HOME/.cache/pip/log/debug.log
-
 notifications:
   email: false
 # branches:  # remove travis double-check on pull requests in main repo
 #   only:
 #     - master
 #     - /^\d\.\d+$/
-
-env:
-  - TOXENV=py26
-  - TOXENV=py27
-  - TOXENV=py33
-  - TOXENV=py34
-  - TOXENV=py35
-  - TOXENV=pypy
-  - TOXENV=pypy3
-  - TOXENV=flake8
-
-before_install:
-  # fix a crash with multiprocessing on Travis
-  - sudo rm -rf /dev/shm
-  - sudo ln -s /run/shm /dev/shm
-  # install codecov
-  - pip install codecov
-
 install:
-  # install big packages (they are cached to minimize build time)
-  # if issues, clear cache
-  # https://docs.travis-ci.com/user/caching/#Clearing-Caches
-  # Coverage install
-  - pip install tox 'coverage<4'
-  # install this package (pymake) into the environment
-  - python setup.py install
-
+  # Install tox first, before dependencies (to get per-env deps)
+  - pip install tox
+  # install this package (py-make) into the environment
+  - pip install .
 # run tests
 script:
   - tox
-# submit coverage
-
-after_success:
-  - codecov

LICENCE

@@ -1,38 +1,19 @@
 `pymake` is a product of collaborative work.
 Unless otherwise stated, all authors (see commit logs) retain copyright
-for their respective work, and release the work under the MIT licence
-(text below).
+for their respective work, and release the work under the MPLv2.0 licence.
 
 Exceptions or notable authors are listed below
 in reverse chronological order:
 
-* MPLv2.0 (text below) 2016 (c) Casper da Costa-Luis
+* files *
+  MPLv2.0 2016-2019 (c) Casper da Costa-Luis
   [casperdcl](https://github.com/casperdcl).
 
 
 Mozilla Public Licence (MPL) v. 2.0 - Exhibit A
 -----------------------------------------------
 
-This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-
-MIT License (MIT)
------------------
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+This Source Code Form is subject to the terms of the
+Mozilla Public License, v. 2.0.
+If a copy of the MPL was not distributed with this file,
+You can obtain one at https://mozilla.org/MPL/2.0/.

MANIFEST.in

@@ -3,11 +3,11 @@ include .coveragerc
 include CONTRIBUTE
 include LICENCE
 include Makefile
-include README.rst
 include tox.ini
 
 # Test suite
 recursive-include pymake/tests *.py
 
 # Examples/Documentation
-recursive-include examples *
+recursive-include examples *.py Makefile*
+include README.rst

Makefile

@@ -10,7 +10,8 @@
 #test:
 #	nosetest
 #install:
-#	python setup.py install
+#	python setup.py \
+#  install
 #```
 
 .PHONY:
@@ -26,15 +27,17 @@
 	coverclean
 	prebuildclean
 	clean
+	toxclean
 	installdev
 	install
 	build
-	pypimeta
+	buildupload
 	pypi
+	help
 	none
 
 help:
-	@python setup.py make
+	@python setup.py make -p
 
 alltests:
 	@+make testcoverage
@@ -46,10 +49,7 @@ all:
 	@+make build
 
 flake8:
-	@+flake8 --max-line-length=80 --count --statistics --exit-zero pymake/
-	@+flake8 --max-line-length=80 --count --statistics --exit-zero examples/
-	@+flake8 --max-line-length=80 --count --statistics --exit-zero .
-	@+flake8 --max-line-length=80 --count --statistics --exit-zero pymake/tests/
+	@+flake8 --max-line-length=80 --exclude .tox,build -j 8 --count --statistics --exit-zero .
 
 test:
 	tox --skip-missing-interpreters
@@ -78,10 +78,16 @@ prebuildclean:
 	@+python -c "import shutil; shutil.rmtree('pymake.egg-info', True)"
 coverclean:
 	@+python -c "import os; os.remove('.coverage') if os.path.exists('.coverage') else None"
+	@+python -c "import shutil; shutil.rmtree('pymake/__pycache__', True)"
+	@+python -c "import shutil; shutil.rmtree('pymake/tests/__pycache__', True)"
 clean:
-	@+python -c "import os; import glob; [os.remove(i) for i in glob.glob('*.py[co]')]"
-	@+python -c "import os; import glob; [os.remove(i) for i in glob.glob('pymake/*.py[co]')]"
-	@+python -c "import os; import glob; [os.remove(i) for i in glob.glob('pymake/tests/*.py[co]')]"
+	@+python -c "import os, glob; [os.remove(i) for i in glob.glob('*.py[co]')]"
+	@+python -c "import os, glob; [os.remove(i) for i in glob.glob('pymake/*.py[co]')]"
+	@+python -c "import os, glob; [os.remove(i) for i in glob.glob('pymake/tests/*.py[co]')]"
+	@+python -c "import os, glob; [os.remove(i) for i in glob.glob('pymake/examples/*.py[co]')]"
+toxclean:
+	@+python -c "import shutil; shutil.rmtree('.tox', True)"
+
 
 installdev:
 	python setup.py develop --uninstall
@@ -92,19 +98,15 @@ install:
 
 build:
 	@make prebuildclean
-	python setup.py sdist --formats=gztar,zip bdist_wheel
-	python setup.py bdist_wininst
-
-pypimeta:
-	python setup.py register
+	python setup.py sdist bdist_wheel
+	# python setup.py bdist_wininst
 
 pypi:
 	twine upload dist/*
 
 buildupload:
 	@make testsetup
 	@make build
-	@make pypimeta
 	@make pypi
 
 none:

README.rst

@@ -1,13 +1,11 @@
-|Logo|
-
 py-make
 =======
 
 |PyPI-Status| |PyPI-Versions|
 
-|Build-Status| |Coverage-Status| |Branch-Coverage-Status| |Codacy-Grade|
+|Build-Status| |Coverage-Status| |Branch-Coverage-Status| |Codacy-Grade| |Libraries-Rank|
 
-|LICENCE|
+|DOI-URI| |LICENCE| |OpenHub-Status|
 
 
 Bring basic ``Makefile`` support to any system with Python.
@@ -16,7 +14,7 @@ Inspired by work in `tqdm <https://github.com/tqdm/tqdm>`__.
 
 Simply install then execute ``pymake`` in a directory containing a ``Makefile``.
 
-``pyamke`` works on any platform (Linux, Windows, Mac, FreeBSD, Solaris/SunOS).
+``pymake`` works on any platform (Linux, Windows, Mac, FreeBSD, Solaris/SunOS).
 
 ``pymake`` does not require any library to run, just a vanilla Python
 interpreter will do.
@@ -34,16 +32,16 @@ Installation
 Latest PyPI stable release
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-|PyPI-Status|
+|PyPI-Status| |PyPI-Downloads| |Libraries-Dependents|
 
 .. code:: sh
 
     pip install py-make
 
-Latest development release on github
+Latest development release on GitHub
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-|GitHub-Status| |GitHub-Stars| |GitHub-Forks|
+|GitHub-Status| |GitHub-Stars| |GitHub-Commits| |GitHub-Forks| |GitHub-Updated|
 
 Pull and install in the current directory:
 
@@ -93,7 +91,8 @@ Sample makefile compatible with ``pymake``:
     test:
     	nosetest
     install:
-    	python setup.py install
+    	python setup.py\
+        install
     compile:
     	$(PY) test.py
     circle:
@@ -106,7 +105,7 @@ Sample makefile compatible with ``pymake``:
 Documentation
 -------------
 
-|PyPI-Versions| |README-Hits| (Since 19 May 2016)
+|PyPI-Versions| |README-Hits| (Since 28 Oct 2016)
 
 .. code:: sh
 
@@ -116,6 +115,8 @@ Documentation
 Contributions
 -------------
 
+|GitHub-Commits| |GitHub-Issues| |GitHub-PRs| |OpenHub-Status|
+
 All source code is hosted on `GitHub <https://github.com/tqdm/py-make>`__.
 Contributions are welcome.
 
@@ -135,35 +136,57 @@ Citation information: |DOI-URI|
 Authors
 -------
 
--  Casper da Costa-Luis (casperdcl)
--  Stephen Larroque (lrq3000)
+The main developers, ranked by surviving lines of code
+(`git fame -wMC <https://github.com/casperdcl/git-fame>`__), are:
+
+- Casper da Costa-Luis (`casperdcl <https://github.com/casperdcl>`__, ~99.5%, |Gift-Casper|)
+- Stephen Larroque (`lrq3000 <https://github.com/lrq3000>`__, ~0.5%)
+
+We are grateful for all |GitHub-Contributions|.
 
 |README-Hits| (Since 28 Oct 2016)
 
-.. |Logo| image:: https://raw.githubusercontent.com/tqdm/py-make/master/logo.png
-.. |Screenshot| image:: https://raw.githubusercontent.com/tqdm/py-make/master/images/py-make.gif
-.. |Build-Status| image:: https://travis-ci.org/tqdm/py-make.svg?branch=master
+.. |Build-Status| image:: https://img.shields.io/travis/tqdm/py-make/master.svg?logo=travis
    :target: https://travis-ci.org/tqdm/py-make
-.. |Coverage-Status| image:: https://coveralls.io/repos/tqdm/py-make/badge.svg
-   :target: https://coveralls.io/r/tqdm/py-make
-.. |Branch-Coverage-Status| image:: https://codecov.io/github/tqdm/py-make/coverage.svg?branch=master
-   :target: https://codecov.io/github/tqdm/py-make?branch=master
+.. |Coverage-Status| image:: https://coveralls.io/repos/tqdm/py-make/badge.svg?branch=master
+   :target: https://coveralls.io/github/tqdm/py-make
+.. |Branch-Coverage-Status| image:: https://codecov.io/gh/tqdm/py-make/branch/master/graph/badge.svg
+   :target: https://codecov.io/gh/tqdm/py-make
 .. |Codacy-Grade| image:: https://api.codacy.com/project/badge/Grade/3f965571598f44549c7818f29cdcf177
    :target: https://www.codacy.com/app/tqdm/py-make?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=tqdm/py-make&amp;utm_campaign=Badge_Grade
-.. |GitHub-Status| image:: https://img.shields.io/github/tag/tqdm/py-make.svg?maxAge=2592000
+.. |GitHub-Status| image:: https://img.shields.io/github/tag/tqdm/py-make.svg?maxAge=86400&logo=github&logoColor=white
    :target: https://github.com/tqdm/py-make/releases
-.. |GitHub-Forks| image:: https://img.shields.io/github/forks/tqdm/py-make.svg
+.. |GitHub-Forks| image:: https://img.shields.io/github/forks/tqdm/py-make.svg?logo=github&logoColor=white
    :target: https://github.com/tqdm/py-make/network
-.. |GitHub-Stars| image:: https://img.shields.io/github/stars/tqdm/py-make.svg
+.. |GitHub-Stars| image:: https://img.shields.io/github/stars/tqdm/py-make.svg?logo=github&logoColor=white
    :target: https://github.com/tqdm/py-make/stargazers
+.. |GitHub-Commits| image:: https://img.shields.io/github/commit-activity/y/tqdm/py-make.svg?logo=git&logoColor=white
+   :target: https://github.com/tqdm/py-make/graphs/commit-activity
+.. |GitHub-Issues| image:: https://img.shields.io/github/issues-closed/tqdm/py-make.svg?logo=github&logoColor=white
+   :target: https://github.com/tqdm/py-make/issues
+.. |GitHub-PRs| image:: https://img.shields.io/github/issues-pr-closed/tqdm/py-make.svg?logo=github&logoColor=white
+   :target: https://github.com/tqdm/py-make/pulls
+.. |GitHub-Contributions| image:: https://img.shields.io/github/contributors/tqdm/py-make.svg?logo=github&logoColor=white
+   :target: https://github.com/tqdm/py-make/graphs/contributors
+.. |GitHub-Updated| image:: https://img.shields.io/github/last-commit/tqdm/py-make/master.svg?logo=github&logoColor=white&label=pushed
+   :target: https://github.com/tqdm/py-make/pulse
+.. |Gift-Casper| image:: https://img.shields.io/badge/gift-donate-ff69b4.svg
+   :target: https://caspersci.uk.to/donate.html
 .. |PyPI-Status| image:: https://img.shields.io/pypi/v/py-make.svg
-   :target: https://pypi.python.org/pypi/py-make
-.. |PyPI-Downloads| image:: https://img.shields.io/pypi/dm/py-make.svg
-   :target: https://pypi.python.org/pypi/py-make
-.. |PyPI-Versions| image:: https://img.shields.io/pypi/pyversions/py-make.svg
-   :target: https://pypi.python.org/pypi/py-make
+   :target: https://pypi.org/project/py-make
+.. |PyPI-Downloads| image:: https://img.shields.io/pypi/dm/py-make.svg?label=pypi%20downloads&logo=python&logoColor=white
+   :target: https://pypi.org/project/py-make
+.. |PyPI-Versions| image:: https://img.shields.io/pypi/pyversions/py-make.svg?logo=python&logoColor=white
+   :target: https://pypi.org/project/py-make
+.. |Libraries-Rank| image:: https://img.shields.io/librariesio/sourcerank/pypi/py-make.svg?logo=koding&logoColor=white
+   :target: https://libraries.io/pypi/py-make
+.. |Libraries-Dependents| image:: https://img.shields.io/librariesio/dependent-repos/pypi/py-make.svg?logo=koding&logoColor=white
+    :target: https://github.com/tqdm/py-make/network/dependents
+.. |OpenHub-Status| image:: https://www.openhub.net/p/py-make/widgets/project_thin_badge?format=gif
+   :target: https://www.openhub.net/p/py-make?ref=Thin+badge
 .. |LICENCE| image:: https://img.shields.io/pypi/l/py-make.svg
    :target: https://raw.githubusercontent.com/tqdm/py-make/master/LICENCE
 .. |DOI-URI| image:: https://zenodo.org/badge/21637/tqdm/py-make.svg
    :target: https://zenodo.org/badge/latestdoi/21637/tqdm/py-make
-.. |README-Hits| image:: http://hitt.herokuapp.com/pymake/pymake.svg
+.. |README-Hits| image:: https://caspersci.uk.to/cgi-bin/hits.cgi?q=py-make&style=social&r=https://github.com/tqdm/py-make
+   :target: https://caspersci.uk.to/cgi-bin/hits.cgi?q=py-make&a=plot&r=https://github.com/tqdm/tqdm&style=social

examples/Makefile

@@ -4,8 +4,9 @@ IPY=python -c
 	err
 
 hello:
-	# this is a comment
-	$(IPY) "print('hello world')"
+	# this is a comment followed by a multi-line command
+	$(IPY) \
+    "print('hello world')"
 
 err:
 	keyboardmashitalltogetherthisshouldnotrunotherwiseunittestswillfail