Merge 21c4331 into fda08f8

.gitignore

@@ -29,3 +29,6 @@ htmlcov/
 
 .idea
 .*.sw[po]
+
+.dobi
+.cache

.travis.yml

@@ -9,6 +9,6 @@ env:
 - TOX_ENV=coverage
 
 install:
-    - pip install --use-mirrors tox coveralls
+    - pip install tox coveralls
 script: tox -e $TOX_ENV
 after_success: coveralls

dobi.yaml

@@ -0,0 +1,24 @@
+
+meta:
+  project: pystaticconf
+
+mount=source:
+    bind: .
+    path: /work
+
+image=builder:
+    image: staticconf-dev
+    context: dockerfiles/
+    dockerfile: Dockerfile
+
+job=test:
+    use: builder
+    mounts: [source]
+    interactive: true
+    command: tox
+
+job=shell:
+    use: builder
+    mounts: [source]
+    interactive: true
+    command: bash

dockerfiles/Dockerfile

@@ -0,0 +1,22 @@
+
+FROM    ubuntu:xenial
+
+ENV     LANG C.UTF-8
+RUN     export DEBIAN_FRONTEND=noninteractive; \
+        apt-get update && apt-get install -y --no-install-recommends \
+            software-properties-common
+
+RUN     export DEBIAN_FRONTEND=noninteractive; \
+        add-apt-repository ppa:fkrull/deadsnakes && \
+        apt-get update && apt-get install -y --no-install-recommends \
+            python2.6 \
+            python2.7 \
+            python3.4 \
+            python3.5 \
+            pypy \
+            curl
+
+RUN     curl -LS https://bootstrap.pypa.io/get-pip.py | python3 && \
+            pip install tox
+
+WORKDIR /work

setup.cfg

@@ -10,5 +10,3 @@ upload-dir = docs/build/html
 max-line-length = 85
 max-complexity = 8
 ignore = E126,E241,E221,E128
-
-[pytest]

tests/config_test.py

@@ -448,9 +448,11 @@ def test_changes(self, mock_mtime):
 
 class TestMTimeComparatorWithCompareFunc(object):
 
-    def __init__(self):
+    @pytest.fixture(autouse=True)
+    def setup_comparator(self):
         self._LoggingMTimeComparator = functools.partial(
-            config.MTimeComparator, compare_func=config.build_compare_func(self._err_logger))
+            config.MTimeComparator,
+            compare_func=config.build_compare_func(self._err_logger))
 
     @pytest.fixture(autouse=True)
     def _reset_err_logger(self):

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py33,py34,pypy,docs,coverage
+envlist = py26,py27,py34,py35,pypy,docs,coverage
 
 [testenv]
 deps =
@@ -11,6 +11,10 @@ commands =
     py.test {posargs:tests}
     flake8 staticconf tests testing
 
+[testenv:py26]
+commands =
+    py.test {posargs:tests}
+
 [testenv:docs]
 deps =
     {[testenv]deps}