Merge pull request #1920 from dnephin/use_pytest

Use py.test as a test runner

Dockerfile

@@ -91,7 +91,7 @@ RUN pip install -r requirements-dev.txt
 RUN pip install tox==2.1.1
 
 ADD . /code/
-RUN python setup.py install
+RUN pip install --no-deps -e /code
 
 RUN chown -R user /code/
 

requirements-build.txt

@@ -0,0 +1 @@
+git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c873ddaae056#egg=pyinstaller

requirements-dev.txt

@@ -1,6 +1,4 @@
 coverage==3.7.1
-flake8==2.3.0
+mock>=1.0.1
-git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c873ddaae056#egg=pyinstaller
+pytest==2.7.2
-mock >= 1.0.1
+pytest-cov==2.1.0
-nose==1.3.4
-pep8==1.6.1

script/build-linux

@@ -6,7 +6,6 @@ TAG="docker-compose"
 docker build -t "$TAG" .
 docker run \
   --rm \
-  --user=user \
   --volume="$(pwd):/code" \
   --entrypoint="script/build-linux-inner" \
   "$TAG"

script/build-linux-inner

@@ -2,9 +2,12 @@
 
 set -ex
 
+TARGET=dist/docker-compose-Linux-x86_64
+
 mkdir -p `pwd`/dist
 chmod 777 `pwd`/dist
 
-pyinstaller -F bin/docker-compose
+pip install -r requirements-build.txt
-mv dist/docker-compose dist/docker-compose-Linux-x86_64
+su -c "pyinstaller -F bin/docker-compose" user
-dist/docker-compose-Linux-x86_64 version
+mv dist/docker-compose $TARGET
+$TARGET version

script/build-osx

@@ -6,7 +6,7 @@ PATH="/usr/local/bin:$PATH"
 rm -rf venv
 virtualenv -p /usr/local/bin/python venv
 venv/bin/pip install -r requirements.txt
-venv/bin/pip install -r requirements-dev.txt
+venv/bin/pip install -r requirements-build.txt
 venv/bin/pip install .
 venv/bin/pyinstaller -F bin/docker-compose
 mv dist/docker-compose dist/docker-compose-Darwin-x86_64

script/ci

@@ -13,4 +13,4 @@ export DOCKER_DAEMON_ARGS="--storage-driver=overlay"
 . script/test-versions
 
 >&2 echo "Building Linux binary"
-su -c script/build-linux-inner user
+. script/build-linux-inner

setup.py

@@ -41,13 +41,10 @@ install_requires = [
 
 
 tests_require = [
-    'nose',
+    'pytest',
-    'flake8',
 ]
 
 
-if sys.version_info < (2, 7):
-    tests_require.append('unittest2')
 if sys.version_info[:1] < (3,):
     tests_require.append('mock >= 1.0.1')
 

tox.ini

@@ -8,10 +8,14 @@ passenv =
 setenv =
     HOME=/tmp
 deps =
-    -rrequirements.txt
+    -rrequirements-dev.txt
 commands =
-    nosetests -v --with-coverage --cover-branches --cover-package=compose --cover-erase --cover-html-dir=coverage-html --cover-html {posargs}
+    py.test -v \
-    flake8 compose tests setup.py
+        --cov=compose \
+        --cov-report html \
+        --cov-report term \
+        --cov-config=tox.ini \
+        {posargs}
 
 [testenv:pre-commit]
 skip_install = True
@@ -21,16 +25,16 @@ commands =
     pre-commit install
     pre-commit run --all-files
 
-[testenv:py27]
+# Coverage configuration
-deps =
+[run]
-    {[testenv]deps}
+branch = True
-    -rrequirements-dev.txt
 
-[testenv:py34]
+[report]
-deps =
+show_missing = true
-    {[testenv]deps}
+
-    flake8
+[html]
-    nose
+directory = coverage-html
+# end coverage configuration
 
 [flake8]
 # Allow really long lines for now