Merge branch 'release/1.6'

* release/1.6:
  updates Makefile/tox
  update gitignore
  add Makefile
  removed pip dependency
  start 1.6
  updates setup.py
  update README
  update README
  update README

Author: saxix

.gitignore

@@ -8,3 +8,4 @@ __pycache__
 docs/_build
 .coverage
 ~build
+build

CHANGELOG

@@ -1,3 +1,8 @@
+1.6.0 (dev)
+-----------
+* removed pip dependency
+* drop support pytest<3.0
+
 1.5.1
 -----
 * drop suport python 2.6

Makefile

@@ -0,0 +1,13 @@
+build:
+	python setup.py sdist bdist_wheel
+
+clean:
+	rm -fr dist build pytest_echo.egg-info .coverage ./~build
+
+fullclean: clean
+	rm -fr .tox .cache .pytest_cache
+	find . -name '*.pyc' -exec rm -f {} +
+
+release: build
+	twine upload dist/*
+	$(MAKE) fullclean

README.rst

@@ -12,7 +12,7 @@ Print environment variables, package version and generic attributes,
 as they are at the begining of the test.
 
 Useful in the continuous integration to dump test
-configuration/environment and or to check is attributes are properly set
+configuration/environment and or to check if attributes are properly set
 (ie. you change environment with `os.environ`)
 
 
@@ -25,10 +25,6 @@ install via::
 
 
 
-The plugin provides ability to print some extra information prior to run the tests.
-
-
-
 Examples
 ========
 
@@ -57,6 +53,7 @@ Dump package version
         pytest_echo: 0.1
     plugins: echo, pydev, cov, cache, django
 
+
 .. warning:: The first attempt to retrieve the version is done via setuptools
     if it fails, the module is imported (``__import__(package)``) to retrieve the version reading
     ``get_version``, ``__version__``, ``VERSION``, ``version`` so any module
@@ -150,21 +147,21 @@ or
 Links
 -----
 
-+--------------------+----------------+--------------+-----------------+
-| Stable             | |master-build| | |master-cov| | |master-doc|    |
-+--------------------+----------------+--------------+-----------------+
-| Development        | |dev-build|    | |dev-cov|    | |dev-doc|       |
-+--------------------+-------------------------------------------------+
-| Project home page: |https://github.com/saxix/pytest-echo             |
-+--------------------+-------------------------------------------------+
-| Issue tracker:     |https://github.com/saxix/pytest-echo/issues?sort |
-+--------------------+-------------------------------------------------+
-| CI:                |https://travis-ci.org/saxix/pytest-echo          |
-+--------------------+-------------------------------------------------+
-| Download:          |http://pypi.python.org/pypi/pytest-echo/         |
-+--------------------+-------------------------------------------------+
-| Documentation:     |https://pytest-echo.readthedocs.org/en/latest/   |
-+--------------------+-------------------------------------------------+
++--------------------+-----------------+---------------+----------------+
+| Stable             |  |master-build| |  |master-cov| |  |master-doc|  |
++--------------------+-----------------+---------------+----------------+
+| Development        |  |dev-build|    |  |dev-cov|    |  |dev-doc|     |
++--------------------+-----------------+---------------+----------------+
+| Project home page: | https://github.com/saxix/pytest-echo             |
++--------------------+--------------------------------------------------+
+| Issue tracker:     | https://github.com/saxix/pytest-echo/issues?sort |
++--------------------+--------------------------------------------------+
+| CI:                | https://travis-ci.org/saxix/pytest-echo          |
++--------------------+--------------------------------------------------+
+| Download:          | http://pypi.python.org/pypi/pytest-echo/         |
++--------------------+--------------------------------------------------+
+| Documentation:     | https://pytest-echo.readthedocs.org/en/latest/   |
++--------------------+--------------------------------------------------+
 
 
 .. |master-build| image:: https://secure.travis-ci.org/saxix/pytest-echo.png?branch=master
@@ -180,8 +177,8 @@ Links
                   :target: http://travis-ci.org/saxix/pytest-echo/
 
 .. |dev-cov| image:: https://codecov.io/gh/saxix/pytest-echo/branch/develop/graph/badge.svg
-                    :target: https://codecov.io/gh/saxix/pytest-echo
+                :target: https://codecov.io/gh/saxix/pytest-echo
 
 .. |dev-doc| image:: https://readthedocs.org/projects/pytest-echo/badge/?version=latest
-                    :target: http://pytest-echo.readthedocs.io/en/latest/
+                :target: http://pytest-echo.readthedocs.io/en/latest/
 

pytest_echo.py

@@ -1,13 +1,21 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function
+
 import fnmatch
 import os
 from pprint import pformat
 
-import pip
+import pkg_resources
 from pkg_resources import DistributionNotFound
 
-__version__ = '1.5.1'
+__version__ = '1.6.0'
+
+
+def get_installed_distributions():
+    """
+    Return a list of installed Distribution objects.
+    """
+    return [d for d in pkg_resources.working_set]
 
 
 def get_attr(obj, attr, default='NOT FOUND'):
@@ -105,7 +113,7 @@ def get_env(var_name):
 def get_version(package_name):
     if '*' in package_name:
         targets = [(i.key, i.version)
-                   for i in pip.get_installed_distributions()
+                   for i in get_installed_distributions()
                    if fnmatch.fnmatch(i.key, package_name)]
     else:
         targets = [(package_name, _get_version(package_name))]

setup.py

@@ -12,7 +12,7 @@
     version=__version__,
     author='Stefano Apostolico',
     author_email='[email protected]',
-    url='http://pypi.python.org/pypi/pytest-echo/',
+    url='https://github.com/saxix/pytest-echo',
     py_modules=['pytest_echo'],
     entry_points={'pytest11': ['echo = pytest_echo']},
     install_requires=['pytest>=2.2'],

tox.ini

@@ -1,18 +1,21 @@
 [tox]
-envlist=py27,py33,py34,py35,py36,pypy
+envlist=py{27,35,36}-pytest{30,31,32,33,34,35}
 
 [testenv]
 deps =
-    py{27,33},pypy: django<2
-    py{34,35,36}: django
-    py{33,34}: pytest<3
-    py{33,34}: py<1.5
     coverage
+    py{27,33},pypy: django<2
+    py{34,35,36}: django>=2
+    pytest30: pytest>=3.0,<3.1
+    pytest31: pytest>=3.1,<3.2
+    pytest32: pytest>=3.2,<3.3
+    pytest33: pytest>=3.3,<3.4
+    pytest34: pytest>=3.4,<3.5
+    pytest35: pytest>=3.5,<3.6
 
 commands =
-;    py.test --pyargs test_echo.py
     pip install -e .
-    coverage run -m py.test test_echo.py pytest_echo.py
+    coverage run -m py.test -vv test_echo.py pytest_echo.py
     coverage report
     coverage html