Merge remote-tracking branch 'satreix/travis' into develop

.gitattributes

@@ -1 +0,0 @@
-* text=auto

.gitignore

@@ -4,20 +4,18 @@
 .project
 .pydevproject
 
-# coverage generated:
+# coverage generated
 /cover-html/
 .coverage
 .coveralls.yml
 
-# Compiled source #
-###################
+# Compiled source
 *.pyc
 *.py~
 *.pyproj
 *.sln
 
-# Headphones files #
-######################
+# Headphones files
 *.log
 *.db*
 *.db-journal
@@ -26,27 +24,25 @@ version.lock
 logs/*
 cache/*
 
-# HTTPS Cert/Key #
-##################
+# HTTPS Cert/Key
 *.crt
 *.key
 *.csr
 
-# OS generated files #
-######################
+# OS generated files
 .DS_Store?
 .DS_Store
 ehthumbs.db
 Icon?
 Thumbs.db
 
-#Ignore files generated by PyCharm
+# Ignore files generated by PyCharm
 .idea/*
 
-#Ignore files generated by vi
+# Ignore files generated by vi
 *.swp
 
-#Ignore files build by Visual Studio
+# Ignore files build by Visual Studio
 *.obj
 *.exe
 *.pdb
@@ -72,3 +68,6 @@ obj/
 [Rr]elease*/
 _ReSharper*/
 .vscode
+
+# Python virtual env
+venv

.travis.yml

@@ -2,36 +2,25 @@
 # http://about.travis-ci.org/docs/
 
 language: python
+
 sudo: false
 
 cache:
   pip: true
   directories:
-  - lib
+    - lib
 
-# Available Python versions:
-# http://about.travis-ci.org/docs/user/ci-environment/#Python-VM-images
 python:
   - "2.6"
-matrix:
-  include:
-    - python: "2.7"
-      env: SENDCOVERAGE=1
+  - "2.7"
 
-# pylint 1.4 does not run under python 2.6
 install:
-  - pip install pyOpenSSL
-  - pip install pylint==1.3.1
-  - pip install pyflakes
-  - pip install pep8
-  # coverage stuff:
-  - pip install coveralls
-  - pip install coverage
+  - pip install -r requirements-dev.txt
+
 script:
   - pep8 headphones
   - pyflakes headphones
   - nosetests
 
 after_success:
-  # coverage stuff:
-  - if [ $SENDCOVERAGE ]; then coveralls; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == "2.7" ]]; then coveralls; fi

requirements-dev.txt

@@ -0,0 +1,8 @@
+coverage==4.0.3
+coveralls==1.1
+mock==1.3.0
+nose==1.3.7
+pep8==1.7.0
+pyflakes==1.1.0
+pylint==1.3.1  # pylint 1.4 does not run under python 2.6
+pyOpenSSL==0.15.1