Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tox: remove cruft from file #4

Merged
merged 3 commits into from
Jan 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

pipeline {
agent {
label "16.04&&ipstudio-deps"
label "ubuntu&&apmm-slave"
}
options {
ansiColor('xterm') // Add support for coloured output
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import os

# Basic metadata
name = "nmos-reverseproxy"
name = "nmosreverseproxy"
version = "0.4.0"
description = "Reverse Proxy Directory listing service and Apache 2 configuration for NMOS services"
url = 'https://github.com/bbc/nmos-reverse-proxy'
Expand Down Expand Up @@ -72,4 +72,4 @@ def find_packages(path, base=""):
data_files=[
('/usr/bin', ['bin/proxylisting'])
],
long_description=long_description)
long_description=long_description)
27 changes: 23 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,30 @@
# test suite on all supported python versions. To use it, "pip install tox"
# and then run "tox" from this directory.

# This file is set up for environments of the form:
# py{*}-{test,nose}[-coverage]
# Though the env-list is more restricted so that tox without parameters runs
# something sensible.

[tox]
envlist = py27, py3
envlist = py{27,3}

[testenv:py27]
commands =
coverage run --source=./nmosreverseproxy -m unittest discover -s tests
coverage annotate
coverage report
deps =
coverage
mock
install_command = pip install {opts} {packages}

[testenv]
commands = nose2 --with-coverage --coverage-report=annotate --coverage-report=term --coverage=ips-reverseproxy-common
[testenv:py3]
commands =
coverage run --source=./nmosreverseproxy -m unittest discover -s tests
coverage annotate
coverage report
deps =
nose2
coverage
mock
install_command = pip install {opts} {packages}