Merge branch 'release/1.4'

* release/1.4:
  fixes typo and docs
  fixes travis config
  fixes travis config
  updates tests configuration
  updated README
  bump 1.4
  add .gitignore
  updates README
  add python 3.2 to classifier
  updates README
  removed assert of unicode string
  python 2.6 support
  update travis config
  add travis config

Author: saxix

.gitignore

@@ -5,3 +5,4 @@ dist
 *.egg-info
 *.pyc
 __pycache__
+docs/_build

.travis.yml

@@ -0,0 +1,23 @@
+language: python
+
+python:
+  - "2.6"
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "pypy"
+
+install:
+  - "pip install -e ."
+  - "pip install pytest --use-mirrors"
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then travis_retry pip install 'django<1.5'; fi
+  - if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]]; then travis_retry pip install 'django>=1.6'; fi
+
+
+branches:
+  only:
+    - develop
+
+script:
+  py.test

CHANGELOG

@@ -1,8 +1,12 @@
+1.4
+---
+* fixes typo in documentation
+
 1.3
 ---
 * fixes url in setup.py
 * add ability to dump version using setuptools ``pkg_resources``
-* python 3.3/3.4 
+* python 3.3/3.4
 
 1.2
 ---

README.rst

@@ -53,6 +53,11 @@ 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
+    level code is executed. This should be not an issue as no problematic code
+    should be present in the first level of the package
 
 Dump attributes
 ~~~~~~~~~~~~~~~
@@ -80,6 +85,7 @@ Example of use in a django project:
 .. code-block:: inifile
 
     [pytest]
+    addopts = -vvv
             --tb=short
             --capture=no
             --echo-env PWD
@@ -99,7 +105,7 @@ Example of use in a django project:
     platform linux2 -- Python 2.7.4 -- py-1.4.22 -- pytest-2.6.0 -- /bin/python
     Environment:
         DJANGO_SETTINGS_MODULE: tests.settings
-        PWD: /data/PROGETTI/ONU_WorldFoodProgramme/wfp-auth
+        PWD: /data/PROGETTI/sem
         VIRTUAL_ENV: /data/VENV/sem
         DBENGINE: <not set>
     Package version:
@@ -108,6 +114,10 @@ Example of use in a django project:
         pytest_echo: 1.2
     Inspections:
         django.conf.settings.DATABASES.default.ENGINE: 'django.db.backends.postgresql_psycopg2'
+    plugins: echo, cache, capturelog, contextfixture, cov, django, pydev
+    collected 14 items
+    .............
+    14 passed in 4.95 seconds
 
 Links
 ~~~~~

docs/changelog.rst

@@ -0,0 +1,5 @@
+
+Changelog
+=========
+
+.. include:: ../CHANGELOG

docs/index.rst

@@ -3,13 +3,13 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to pytest-cache's documentation!
+Welcome to pytest-echo's documentation!
 ========================================
 
 Contents:
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    readme
-
+   changelog

docs/readme.rst

@@ -1 +1,2 @@
+
 .. include:: ../README.rst

pytest_echo.py

@@ -3,7 +3,7 @@
 from pprint import pformat
 
 
-__version__ = '1.3'
+__version__ = '1.4'
 
 
 class RetrieveException(Exception):
@@ -72,17 +72,18 @@ def get_module_attribute(path):
     parent = ""
     pkg = None
     try:
-        for i, el in enumerate(parts):
+        for i, part in enumerate(parts):
             try:
                 if parent:
-                    a = "{}.{}".format(parent, parts[i])
+                    module_name = "%s.%s" % (parent, parts[i])
                 else:
-                    a = parts[i]
-                pkg = __import__(a, fromlist=[parent])
-                parent = a
+                    module_name = parts[i]
+                pkg = __import__(module_name, fromlist=[parent])
+                parent = module_name
             except ImportError:
-                if hasattr(pkg, el):
+                if hasattr(pkg, part):
                     return pformat(get_attr(pkg, ".".join(parts[i:])))
+        raise Exception('Unable to load %s', path)
     except Exception as e:
         return str(e)
 

setup.py

@@ -28,7 +28,9 @@
         'Topic :: Software Development :: Libraries',
         'Topic :: Utilities',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
     ])

test_echo.py

@@ -59,19 +59,19 @@ def test_echo_attr_dict(testdir):
 
 def test_echo_attr_list(testdir):
     result = testdir.runpytest('--echo-attr=test_echo.ATTR_LIST.2')
-    result.stdout.fnmatch_lines([u"    test_echo.ATTR_LIST.2: 13"])
+    result.stdout.fnmatch_lines(["    test_echo.ATTR_LIST.2: 13"])
 
 
 def test_echo_attr_list_inner(testdir):
     result = testdir.runpytest('--echo-attr=test_echo.ATTR_LIST.3.1')
-    assert u"    test_echo.ATTR_LIST.3.1: 22" in result.stdout.lines
+    assert "    test_echo.ATTR_LIST.3.1: 22" in result.stdout.lines
 
 
 def test_echo_attr_list_composite(testdir):
     result = testdir.runpytest('--echo-attr=test_echo.ATTR_COMPOSITE.key1',
                                '--echo-attr=test_echo.ATTR_COMPOSITE.key2.3')
-    assert u"    test_echo.ATTR_COMPOSITE.key1: 'value1'" in result.stdout.lines
-    assert u"    test_echo.ATTR_COMPOSITE.key2.3: 14" in result.stdout.lines
+    assert "    test_echo.ATTR_COMPOSITE.key1: 'value1'" in result.stdout.lines
+    assert "    test_echo.ATTR_COMPOSITE.key2.3: 14" in result.stdout.lines
 
 
 def test_echo_attr_list_callable(testdir):