Skip to content

Commit

Permalink
* enable PyPy tests on travis
Browse files Browse the repository at this point in the history
* use pytest-ignore-flaky plugin (not test uses it yet)
* re-enable travis badge
  • Loading branch information
schettino72 committed Aug 12, 2015
1 parent 7b0238c commit c960011
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 6 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ python:
- "2.7"
- "3.3"
- "3.4"
# - 'pypy' # dbm test fails, remove for now...
# - "3.5.0b3" # requires py.test 2.7.3 unreleased at this time
- "pypy"
- "pypy3"

sudo: false

Expand All @@ -24,7 +26,7 @@ branches:

script:
- doit pyflakes
- py.test
- py.test --ignore-flaky
- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then doit coverage; fi
after_success:
- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then coveralls; fi
Expand Down
3 changes: 1 addition & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ README
.. image:: https://img.shields.io/pypi/dm/doit.svg
:target: https://pypi.python.org/pypi/doit

.. disable this until i figure out how to debug unstable tests
.. image:: https://travis-ci.org/pydoit/doit.png?branch=master
.. image:: https://travis-ci.org/pydoit/doit.png?branch=master
:target: https://travis-ci.org/pydoit/doit

.. image:: https://coveralls.io/repos/pydoit/doit/badge.png?branch=master
Expand Down
3 changes: 2 additions & 1 deletion dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
# $ pip install --requirement dev_requirements.txt

pyflakes
pytest
pytest>=2.7.0
pytest-ignore-flaky
mock
coverage
doit-py>=0.3.0
1 change: 1 addition & 0 deletions doc/dictionary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ PDB
PYTHONPATH
Popen
PyPi
PyPy
PythonAction
PythonInteractiveAction
Pythonic
Expand Down
5 changes: 4 additions & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,10 @@ What people are saying about `doit`
Project Details
===============

* This is an open-source project (`MIT license <http://opensource.org/licenses/mit-license.php>`_) written in python. Runs on Python 2.7 through 3.4 with a single codebase.
* This is an open-source project
(`MIT license <http://opensource.org/licenses/mit-license.php>`_)
written in python. Runs on Python 2.7 through 3.4 (including PyPy support)
with a single codebase.

* Download from `PyPi <http://pypi.python.org/pypi/doit>`_

Expand Down
5 changes: 5 additions & 0 deletions tests/test_runner.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os
import pickle
from multiprocessing import Queue
import platform
import six

import pytest
Expand All @@ -14,6 +15,8 @@
from doit import runner


PLAT_IMPL = platform.python_implementation()

# sample actions
def my_print(*args):
pass
Expand Down Expand Up @@ -542,6 +545,7 @@ def testNonReporterMethod(self, reporter):


class TestJobTask(object):
@pytest.mark.xfail('PLAT_IMPL == "PyPy"')
def test_not_picklable_raises_InvalidTask(self):
def non_top_function(): pass
t1 = Task('t1', [non_top_function])
Expand Down Expand Up @@ -702,6 +706,7 @@ def non_pickable_creator():
class TestMRunner_parallel_run_tasks(object):

@pytest.mark.skipif('not runner.MRunner.available()')
@pytest.mark.xfail('PLAT_IMPL == "PyPy"')
def test_task_not_picklabe_multiprocess(self, reporter, dep_manager):
t1 = Task("t1", [(my_print, ["out a"] )] )
t2 = Task("t2", None, loader=DelayedLoader(
Expand Down

0 comments on commit c960011

Please sign in to comment.