updates and minor fixes - add appveyor CI

Author: saxix

.travis.yml

@@ -1,4 +1,4 @@
-language: python
+wlanguage: python
 
 python:
   - "2.6"

LICENSE

@@ -1,17 +1,21 @@
+The MIT License
+
+Copyright (c) 2015 Stefano Apostolico
+
 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.rst

@@ -9,10 +9,12 @@ pytest-echo
    :target: https://crate.io/packages/pytest-echo/
 
 
-Print environment variables, package version and generic attributes.
-
-Useful in the continuous integration to dump test configuration/environment.
+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
+(ie. you change environment with `os.environ`)
 
 Install
 -------

appveyor.yml

@@ -0,0 +1,41 @@
+# What Python version is installed where:
+# http://www.appveyor.com/docs/installed-software#python
+
+environment:
+  matrix:
+    - PYTHON: "C:\\Python27"
+      TOX_ENV: "py27"
+
+    - PYTHON: "C:\\Python33"
+      TOX_ENV: "py33"
+
+    - PYTHON: "C:\\Python34"
+      TOX_ENV: "py34"
+
+    - PYTHON: "C:\\Python35"
+      TOX_ENV: "py35"
+
+
+init:
+  - "%PYTHON%/python -V"
+  - "%PYTHON%/python -c \"import struct;print( 8 * struct.calcsize(\'P\'))\""
+
+install:
+  - "%PYTHON%/Scripts/easy_install -U pip"
+  - "%PYTHON%/Scripts/pip install tox"
+  - "%PYTHON%/Scripts/pip install wheel"
+
+build: false  # Not a C# project, build stuff at the test step instead.
+
+test_script:
+  - "%PYTHON%/Scripts/tox -e %TOX_ENV%"
+
+after_test:
+  - "%PYTHON%/python setup.py bdist_wheel"
+  - ps: "ls dist"
+
+artifacts:
+  - path: dist\*
+
+#on_success:
+#  - TODO: upload the content of dist/*.whl to a public wheelhouse

docs/index.rst

@@ -4,7 +4,7 @@
    contain the root `toctree` directive.
 
 Welcome to pytest-echo's documentation!
-========================================
+=======================================
 
 Contents:
 

test_echo.py

@@ -1,5 +1,8 @@
 import os
 import sys
+
+import pytest
+
 import pytest_echo
 
 pytest_plugins = "pytester",
@@ -99,6 +102,8 @@ def test_echo_attr_module_object_attr(testdir):
 
 
 def test_django_settings(testdir):
+
+    pytest.importorskip("django")
     testdir.makeconftest("""
         def pytest_configure(config):
             import django
@@ -111,6 +116,7 @@ def pytest_configure(config):
     ])
 
 def test_django_settings_extended(testdir):
+    pytest.importorskip("django")
     testdir.makeconftest("""
         def pytest_configure(config):
             import django

tox.ini

@@ -4,7 +4,6 @@ envlist=py26,py27,py32,py33,py34,pypy
 [testenv]
 deps =  pytest
         pytest-cache
-        django
 
 commands =
     pip install -e {toxinidir}
@@ -17,7 +16,6 @@ python_files=test_echo.py
 
 addopts =
         --tb=short
-        --capture=no
 
 [flake8]
 exclude = .tox,docs