Merge e29fe23 into 6481a72

.gitignore

@@ -1,10 +1,11 @@
 tests/manual/html
 tests/manual/doxygen_sqlite3.db
-*.pyc
 MANIFEST
-dist
+/dist/
+/build/
+/htmlcov/
+*.pyc
 .*swp
-build
 .coverage*
-htmlcov
 *.egg-info
+/doxyqml-*/

.travis.yml

@@ -11,18 +11,11 @@ before_install:
 
 install:
     - pip install -r dev-requirements.txt
-    - pip install coveralls
+    - pip install python-coveralls
 
 script:
-    - flake8
-    - ./setup.py sdist --formats=bztar
-    - tar xf dist/doxyqml-*.tar.bz2
-    - cd doxyqml-*
-    - ./setup.py install
-    - tests/run-coverage
-    # Run functional tests again, but running Doxyqml as a separate process
-    # instead of as a Python module
-    - tests/functional/tests.py
+    - pip install -e .
+    - ci/build
 
 after_success:
     coveralls

ci/build

@@ -0,0 +1,27 @@
+#!/bin/sh
+set -e
+cd $(dirname $0)/..
+
+log_step() {
+    echo
+    echo "=== $@ ==="
+    echo
+}
+
+log_step "Testing coding style"
+flake8
+
+log_step "Creating package"
+./setup.py sdist --formats=bztar
+
+log_step "Unpacking package"
+tar xf dist/doxyqml-*.tar.bz2
+cd doxyqml-*
+./setup.py install
+
+tests/run-coverage
+log_step "Running functional tests"
+tests/unit/tests.py
+
+log_step "Running functional tests (as an external process)"
+tests/functional/tests.py --import