Merge pull request #312 from vmuriart/cfg

Update Config files

5 files changed, 13 insertions, 8 deletions

diff --git a/.editorconfig b/.editorconfig
index 6fa8b7b..ca1e615 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,7 +5,7 @@ root = true
 [*]
 indent_style = space
 indent_size = 4
-end_of_line = crlf
+end_of_line = lf
 charset = utf-8
 insert_final_newline = true
 trim_trailing_whitespace = true
@@ -18,6 +18,3 @@ trim_trailing_whitespace = true
 
 [{Makefile,*.bat}]
 indent_style = tab
-
-[*.md]
-trim_trailing_whitespace = false
diff --git a/.travis.yml b/.travis.yml
index a575bf8..ad79eb2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,11 +15,15 @@ matrix:
     fast_finish: true
 
     include:
-        - python: "nightly"
+        - python: 3.6-dev
           env: TOXENV=py36
+        - python: "nightly"
+          env: TOXENV=py37
 
     allow_failures:
         - env: TOXENV=py26
+        - env: TOXENV=py36
+        - env: TOXENV=pypy3
         - python: "nightly"
 
 install:
diff --git a/MANIFEST.in b/MANIFEST.in
index 585ab3b..8043b35 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,10 +2,10 @@ recursive-include docs source/*
 include docs/sqlformat.1
 include docs/Makefile
 recursive-include tests *.py *.sql
-include COPYING
+include LICENSE
 include TODO
 include AUTHORS
 include CHANGELOG
 include Makefile
-include pytest.ini
+include setup.cfg
 include tox.ini
diff --git a/setup.cfg b/setup.cfg
index fea37fb..ce80788 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,8 +1,10 @@
 [wheel]
 universal = 1
 
-[pytest]
+[tool:pytest]
 xfail_strict = True
+addopts = -v -r fxX
+# -r fxX: show extra test summary info for: (f)ailed, (x)failed, (X)passed
 
 [flake8]
 exclude =
diff --git a/tox.ini b/tox.ini
index 494246f..c91b258 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,12 @@
 [tox]
+skip_missing_interpreters = True
 envlist =
     py27,
     py33,
     py34,
     py35,
     py36,
+    py37,
     pypy,
     pypy3,
     flake8