Skip to content

Commit b1a5965

Browse files
authored
Merge pull request #28 from LD250/update-python-jenkins-and-fix-travis-build
fix travis build
2 parents f952feb + 1c47768 commit b1a5965

5 files changed

Lines changed: 6 additions & 5 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: "python"
22
python:
33
- "2.7"
44
- "3.4"
5-
- "3.5"
5+
- "3.6"
66
install:
77
- pip install flake8 mock==2.0.0
88
script:

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
python-jenkins==0.4.12
1+
python-jenkins==0.4.14
22
tox==2.3.1
33
pyfakefs==2.7.0
44
mock==2.0.0

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
else:
1515
raise RuntimeError('Unable to find version string.')
1616

17-
requires = ['pbr>=1.6.0',
18-
'python-jenkins==0.4.12',
17+
requires = ['python-jenkins==0.4.14',
1918
'six>=1.9.0']
2019

2120
tests_require = ['unittest2==1.1.0',

tests/test_cli.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,5 +311,6 @@ def info_side_effect(name, number):
311311
self.patched_print.assert_has_calls([mock.call("FDN Job1 estimated time left %s" % timedelta(seconds=TS))],
312312
[mock.call("FDN Job5 estimated time left %s" % timedelta(seconds=TS))])
313313

314+
314315
if __name__ == '__main__':
315316
unittest.main()

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# and then run "tox" from this directory.
55

66
[tox]
7-
envlist = py27, py34
7+
envlist = py27, py35
88
skipsdist = True
99

1010
[testenv]
@@ -15,4 +15,5 @@ deps =
1515
flake8
1616
[flake8]
1717
ignore=E501, E121, E123, E126, E133, E226, E241, E242, E704
18+
exclude = .venv,.tox,dist,doc,build,*.egg
1819

0 commit comments

Comments
 (0)