Merge branch 'release/1.2'

* release/1.2:
  bump 1.2
  beautify output

Author: saxix

CHANGELOG

@@ -1,3 +1,7 @@
+1.2
+---
+* changed output layout
+
 1.1
 ---
 * removed dump of django settings and related options (--echo-settings)

README.rst

@@ -46,7 +46,7 @@ Dump package version
 
 
 Dump attributes
-~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~
 
 .. code-block:: sh
 

docs/conf.py

@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.1'
+version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.1'
+release = '1.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pytest_echo.py

@@ -3,7 +3,7 @@
 from pprint import pformat
 
 
-__version__ = '1.1'
+__version__ = '1.2'
 
 
 class RetrieveException(Exception):
@@ -103,15 +103,18 @@ def _get_version(package_name):
 
 def pytest_report_header(config):
     ret = []
-    if config.option.echo_attribues:
-        ret.append("\n".join(["%s: %s" % (k, get_module_attribute(k))
-                              for k in config.option.echo_attribues]))
     if config.option.echo_envs:
-        ret.append("\n".join(["%s: %s" % (k, os.environ.get(k, "<not set>"))
+        ret.append("Environment:")
+        ret.append("\n".join(["    %s: %s" % (k, os.environ.get(k, "<not set>"))
                               for k in config.option.echo_envs]))
     if config.option.echo_versions:
-        ret.append("\n".join(["%s: %s" % (k, _get_version(k))
+        ret.append("Package version:")
+        ret.append("\n".join(["    %s: %s" % (k, _get_version(k))
                               for k in config.option.echo_versions]))
+    if config.option.echo_attribues:
+        ret.append("Inspections:")
+        ret.append("\n".join(["    %s: %s" % (k, get_module_attribute(k))
+                              for k in config.option.echo_attribues]))
     if ret:
         return "\n".join(ret)
 

test_echo.py

@@ -109,3 +109,17 @@ def pytest_configure(config):
     result.stdout.fnmatch_lines([
         "django.conf.settings.DEBUG: False",
     ])
+
+def test_django_settings_extended(testdir):
+    testdir.makeconftest("""
+        def pytest_configure(config):
+            import django
+            from django.conf import settings  # noqa
+            settings.configure()
+            settings.DATABASES = {'default':{ 'ENGINE': 'sqlite3'}}
+    """)
+    result = testdir.runpytest('--echo-attr=django.conf.settings.DATABASES.default.ENGINE')
+    result.stdout.fnmatch_lines([
+        "django.conf.settings.DATABASES.default.ENGINE: 'sqlite3'"
+    ])
+