Skip to content

Commit e69d568

Browse files
authored
Merge pull request #1106 from james-garner-canonical/fix-jenkins
#1106 #### Description Pin python kubernetes version to fix recent breakage in jenkins tests. The latest update to the python kubernetes library (v31, 3 days ago) breaks the Jenkins `github-check-merge-juju-python-libjuju` test due to failure to build a new dependency (durationpy). I thought this might be the fix for issue #1088, but that's been open since August 9. Should we switch to stricter dependency versioning across the board here to avoid breakages of this nature? In setup.py, 4 dependencies now specify both minimum and maximum versions, 5 only specify a minimum, and 2 have no version specification. In tox.ini, only 1 dependency (kubernetes) specifies a (maximum) version. tox.ini should probably have the same version constraints as setup.py. #### QA Steps All tests pass, except for integration tests, which are flaky (see issue #1108).
2 parents 7d2107f + 1fe4cfb commit e69d568

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
'pyasn1>=0.4.4',
3232
'toposort>=1.5,<2',
3333
'typing_inspect>=0.6.0',
34-
'kubernetes>=12.0.1',
34+
'kubernetes>=12.0.1,<31.0.0',
3535
'hvac',
3636
'packaging',
3737
],

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ deps =
3838
pytest-xdist
3939
Twine
4040
websockets
41-
kubernetes
41+
kubernetes<31.0.0
4242
hvac
4343
packaging
4444
setuptools

0 commit comments

Comments
 (0)