Skip to content

Commit

Permalink
Merge pull request #1106 from james-garner-canonical/fix-jenkins
Browse files Browse the repository at this point in the history
#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).
  • Loading branch information
jujubot authored Sep 23, 2024
2 parents 7d2107f + 1fe4cfb commit e69d568
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
'pyasn1>=0.4.4',
'toposort>=1.5,<2',
'typing_inspect>=0.6.0',
'kubernetes>=12.0.1',
'kubernetes>=12.0.1,<31.0.0',
'hvac',
'packaging',
],
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ deps =
pytest-xdist
Twine
websockets
kubernetes
kubernetes<31.0.0
hvac
packaging
setuptools
Expand Down

0 comments on commit e69d568

Please sign in to comment.