Skip to content

Commit

Permalink
Merge branch 'py3-pure-python' of https://github.com/zopefoundation/A…
Browse files Browse the repository at this point in the history
…ccessControl into py3-pure-python
  • Loading branch information
dwt committed May 3, 2017
2 parents a179ade + 6fe96f7 commit 08b789c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
7 changes: 5 additions & 2 deletions .travis.yml
Expand Up @@ -10,12 +10,15 @@ python:
- pypy3.3-5.2-alpha1

install:
- pip install -U setuptools==33.1.1
- pip install -U setuptools==33.1.1 coveralls coverage
- python bootstrap.py
- bin/buildout

script:
- bin/test -v1
- coverage run bin/test -v1
after_success:
- coverage combine
- coveralls

notifications:
email: false
Expand Down
13 changes: 8 additions & 5 deletions tox.ini
Expand Up @@ -8,7 +8,7 @@ envlist =
pypy,
pypy3,
# isort,
# coverage-report,
coverage-report,

skip_missing_interpreters = False

Expand All @@ -21,12 +21,15 @@ extras =
install_command = pip install --no-cache-dir --no-binary=:all: {opts} {packages}

commands =
zope-testrunner --test-path=src {posargs:-pvc}
coverage run {envbindir}/zope-testrunner --path=src --all {posargs:-pvc}
deps =
.[test]
zope.testrunner
./develop/RestrictedPython
coverage
git+https://github.com/zopefoundation/RestrictedPython.git@Python3_update#egg=RestrictedPython
setenv =
PIP_NO_CACHE = 1
COVERAGE_FILE=.coverage.{envname}

[testenv:coverage-report]
basepython = python2.7
Expand All @@ -37,8 +40,8 @@ skip_install = true
commands =
coverage erase
coverage combine
coverage html
coverage xml
coverage html -i
coverage xml -i
coverage report

[testenv:isort]
Expand Down

0 comments on commit 08b789c

Please sign in to comment.