diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2017-08-03 12:16:58 -0700 |
|---|---|---|
| committer | Trevor Bramwell <tbramwell@linuxfoundation.org> | 2017-08-07 13:41:10 -0700 |
| commit | 071c3bc8dc5c102210318479df7d8db40b3adae8 (patch) | |
| tree | 293d6b38d27dc4bb39ac2c3402d87f5a562de4f4 | |
| parent | 2b13f8ee486f4f8ae1c66ac3b95148d9a423318b (diff) | |
Remove Python packaging files
Since we don't release releng as a python project, it doesn't make much
sense to include a setup.py.
The jjb testenv in tox.ini is modified to pin jenkins-job-builder and no
longer require setup.py nor jjb/test-requirements.txt, and the modules
testenv is moved to it's own tox.ini under modules.
Locally testing of jjb can still be done using:
tox -e jjb
Change-Id: I512b1a8f9cd7d48a2f14b1bbe966b525793a6fe3
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
| -rw-r--r-- | jjb/test-requirements.txt | 1 | ||||
| -rw-r--r-- | modules/tox.ini | 28 | ||||
| -rw-r--r-- | setup.py | 9 | ||||
| -rw-r--r-- | tox.ini | 20 |
4 files changed, 31 insertions, 27 deletions
diff --git a/jjb/test-requirements.txt b/jjb/test-requirements.txt deleted file mode 100644 index 6b700dcfc..000000000 --- a/jjb/test-requirements.txt +++ /dev/null @@ -1 +0,0 @@ -jenkins-job-builder diff --git a/modules/tox.ini b/modules/tox.ini new file mode 100644 index 000000000..835cb6ba2 --- /dev/null +++ b/modules/tox.ini @@ -0,0 +1,28 @@ +# Tox (http://tox.testrun.org/) is a tool for running tests +# in multiple virtualenvs. This configuration file will run the +# test suite on all supported python versions. To use it, "pip install tox" +# and then run "tox" from this directory. + +[tox] +envlist = py27 +skipsdist = True + +[testenv] +usedevelop = True +setenv= + HOME = {envtmpdir} + PYTHONPATH = {toxinidir} + +[testenv:modules] +deps= + -rrequirements.txt + -rtest-requirements.txt +commands = + nosetests \ + --with-xunit \ + --xunit-file=nosetests.xml \ + --cover-package=opnfv \ + --with-coverage \ + --cover-xml \ + --cover-html \ + tests/unit diff --git a/setup.py b/setup.py deleted file mode 100644 index 3c934085d..000000000 --- a/setup.py +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env python - -from setuptools import setup - -setup( - name="releng", - version="master", - url="https://www.opnfv.org", -) @@ -8,27 +8,13 @@ envlist = py27 skipsdist = True [testenv] -usedevelop = True +usedevelop = False setenv= HOME = {envtmpdir} PYTHONPATH = {toxinidir} [testenv:jjb] deps = - -rjjb/test-requirements.txt + jenkins-job-builder==1.6.1 commands= - jenkins-jobs test -o job_output -r jjb/ - -[testenv:modules] -deps= - -rmodules/requirements.txt - -rmodules/test-requirements.txt -commands = - nosetests -w modules \ - --with-xunit \ - --xunit-file=modules/nosetests.xml \ - --cover-package=opnfv \ - --with-coverage \ - --cover-xml \ - --cover-html \ - tests/unit + jenkins-jobs test -o job_output -r jjb/ |