Merge branch 'release/1.5.1'

* release/1.5.1:
  bump 1.5.1
  fixes test enviromnent
  updates readme
  updates readme
  typo in README

Author: saxix

.travis.yml

@@ -2,7 +2,6 @@ language: python
 sudo: false
 
 python:
-  - "2.6"
   - "2.7"
   - "3.3"
   - "3.4"
@@ -12,7 +11,7 @@ python:
 
 install:
   - pip install .
-  - pip install tox coverage codecov
+  - pip install tox codecov
   - "TOX_ENV=${TRAVIS_PYTHON_VERSION/[0-9].[0-9]/py${TRAVIS_PYTHON_VERSION/.}}"
 
 

CHANGELOG

@@ -1,3 +1,7 @@
+1.5.1
+-----
+* drop suport python 2.6
+
 1.5
 ---
 * add support for 'globbing' package version and enviromnent variables

README.rst

@@ -1,6 +1,8 @@
+===========
 pytest-echo
 ===========
 
+
 .. image:: https://badge.fury.io/py/pytest-echo.svg
    :target: http://badge.fury.io/py/pytest-echo
    :alt: PyPI package
@@ -13,8 +15,9 @@ Useful in the continuous integration to dump test
 configuration/environment and or to check is attributes are properly set
 (ie. you change environment with `os.environ`)
 
+
 Install
--------
+=======
 
 install via::
 
@@ -26,30 +29,32 @@ The plugin provides ability to print some extra information prior to run the tes
 
 
 
-Example
--------
+Examples
+========
 
 Dump environment variables
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+--------------------------
 
 .. code-block:: sh
 
     $ py.test --echo-env=HOME
     ============================= test session starts =========================
     platform linux2 -- Python 2.7.4 -- py-1.4.22 -- pytest-2.6.0 -- /bin/python
-    HOME: /home/sax
+    Environment:
+        HOME: /Users/sax
     plugins: echo, pydev, cov, cache, django
 
 
 Dump package version
-~~~~~~~~~~~~~~~~~~~~
+--------------------
 
 .. code-block:: sh
 
     $ py.test --echo-version=pytest_echo
     ============================= test session starts =========================
     platform linux2 -- Python 2.7.4 -- py-1.4.22 -- pytest-2.6.0 -- /bin/python
-    pytest_echo: 0.1
+    Package version:
+        pytest_echo: 0.1
     plugins: echo, pydev, cov, cache, django
 
 .. warning:: The first attempt to retrieve the version is done via setuptools
@@ -59,14 +64,15 @@ Dump package version
     should be present in the first level of the package
 
 Dump attributes
-~~~~~~~~~~~~~~~
+---------------
 
 .. code-block:: sh
 
     $ py.test --echo-attr=django.conf.settings.DEBUG
     ============================= test session starts =========================
     platform linux2 -- Python 2.7.4 -- py-1.4.22 -- pytest-2.6.0 -- /bin/python
-    DEBUG: False
+    Inspections
+        django.conf.settings.DEBUG: False
     plugins: echo, pydev, cov, cache, django
 
 .. warning:: Be careful when use ``--echo-attr``. It loads any module in the path and this will
@@ -77,7 +83,7 @@ Dump attributes
 
 
 Configure via tox.ini/setup.cfg/pytest.cfg
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+------------------------------------------
 
 Example of use in a django project:
 
@@ -120,7 +126,7 @@ Example of use in a django project:
 
 
 Globbing
-~~~~~~~~
+--------
 
 Starting from version 1.5, is possible to glob packages version and environment variables,
 as:
@@ -142,7 +148,7 @@ or
 
 
 Links
-~~~~~
+-----
 
 +--------------------+----------------+--------------+-----------------+
 | Stable             | |master-build| | |master-cov| | |master-doc|    |

docs/index.rst

@@ -3,6 +3,7 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
+=======================================
 Welcome to pytest-echo's documentation!
 =======================================
 

pytest_echo.py

@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
+from __future__ import print_function
 import fnmatch
 import os
 from pprint import pformat
 
 import pip
 from pkg_resources import DistributionNotFound
 
-__version__ = '1.5'
+__version__ = '1.5.1'
 
 
 def get_attr(obj, attr, default='NOT FOUND'):
@@ -63,11 +64,11 @@ def get_module_attribute(path):
     :param path: full path to the attribute
     :return:
 
-    >>> print get_module_attribute('linecache.cache.__class__')
-    <type 'dict'>
-    >>> print get_module_attribute('os.path.curdir')
+    >>> print(get_module_attribute('linecache.cache.__class__'))
+    <... 'dict'>
+    >>> print(get_module_attribute('os.path.curdir'))
     '.'
-    >>> print get_module_attribute('wrong')
+    >>> print(get_module_attribute('wrong'))
     ('Unable to load %s', 'wrong')
     """
     parts = path.split('.')

setup.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 from setuptools import setup
 from pytest_echo import __version__
@@ -34,5 +35,5 @@
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.6'
     ])

test_echo.py

@@ -82,9 +82,8 @@ def test_echo_version_no_setuptools(testdir, monkeypatch):
 
 def test_echo_version_glob(testdir):
     result = testdir.runpytest('--echo-version=pytest*')
-    result.stdout.fnmatch_lines(["    pytest: %s" % pytest.__version__,
-                                 "    pytest-echo: %s" % pytest_echo.__version__,
-                                 ])
+    result.stdout.fnmatch_lines(["    pytest: %s" % pytest.__version__])
+    result.stdout.fnmatch_lines(["    pytest-echo: %s" % pytest_echo.__version__])
 
 
 def test_echo_all(testdir):

tox.ini

@@ -3,7 +3,7 @@ envlist=py27,py33,py34,py35,py36,pypy
 
 [testenv]
 deps =
-    py{27,33}: django<2
+    py{27,33},pypy: django<2
     py{34,35,36}: django
     py{33,34}: pytest<3
     py{33,34}: py<1.5
@@ -12,14 +12,14 @@ deps =
 commands =
 ;    py.test --pyargs test_echo.py
     pip install -e .
-    coverage run -m py.test
+    coverage run -m py.test test_echo.py pytest_echo.py
     coverage report
     coverage html
 
 [pytest]
 pep8ignore = E128 E302
     doc/conf.py ALL
-;python_files=test_echo.py
+python_files=test_echo.py
 
 addopts =
         --tb=short