Skip to content

Commit

Permalink
Merge branch 'travis' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Antoine DECHAUME committed May 10, 2020
2 parents 5e1fc00 + e5faf87 commit 2f66314
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 3 deletions.
34 changes: 34 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
language: python
python:
- 3.6
- 3.7
- 3.8
- 3.9-dev
addons:
apt:
packages:
# for sphinx spell checking via pyenchant
- enchant
jobs:
include:
# there seem to be no reliable way to know the pick a python version for
# MacOS, the following settings may no longer work in the futur
- os: osx
osx_image: xcode11.4
language: shell
addons:
homebrew:
packages:
# for sphinx spell checking via pyenchant
- enchant
before_install:
- python3 --version
name: Python 3.7 on MacOS
env:
- TRAVIS_PYTHON_VERSION=3.7
allow_failures:
- python: 3.9-dev
install:
- python3 -m pip install -U pip
- python3 -m pip install tox-travis
script: tox
6 changes: 5 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ Pytest-executable

.. image:: https://readthedocs.org/projects/pytest-executable/badge/?version=stable
:target: https://pytest-executable.readthedocs.io/en/stable/?badge=stable
:alt: Documentation Status
:alt: Read The Docs Status

.. image:: https://travis-ci.org/CS-SI/pytest-executable.svg?branch=develop
:target: https://travis-ci.org/CS-SI/pytest-executable
:alt: Travis-CI Build Status

``pytest-executable`` is a `pytest`_ plugin for simplifying the black-box
testing of an executable, be it written in python or not. It helps to avoid
Expand Down
4 changes: 3 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ license = Apache Software License 2.0
license_file = LICENSE.txt
classifiers =
Operating System :: POSIX :: Linux
Operating System :: MacOS
Development Status :: 4 - Beta
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Environment :: Console
Topic :: Utilities
Topic :: Software Development :: Testing
Topic :: Software Development :: Libraries
Expand Down
2 changes: 1 addition & 1 deletion tests/test_run_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def test_execution_failure(tmp_path):
runner,
script,
"",
"ls: cannot access '?non-existing-file'?: No such file or directory",
"ls: (?:cannot access )?'?non-existing-file'?: No such file or directory",
)


Expand Down
4 changes: 4 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ deps =
commands =
pytest

[travis]
python =
3.7: py37, style, check, coverage, doc

; [testenv:check-dist]
; basepython = {[testenv:dev]basepython}
; deps = {[testenv:dev]deps}
Expand Down

0 comments on commit 2f66314

Please sign in to comment.