Avoid broken macaroonbakery release #629
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
coreycb
force-pushed
the
macroon-wallaby
branch
2 times, most recently
from
5618bb6 to
81237a5
Compare
macaroonbakery 1.3.3 has a broken protobuf dependency, add a requirement to avoid that specific release: go-macaroon-bakery/py-macaroon-bakery#94 Conflicts: test-requirements.txt (cherry picked from commit 8be4948)
Add separate workflow for testing on Python 3.6 as this requires an older Ubuntu release. Fixup unit tests for compatibility with newer versions of mock. Drop latest/stable functional test targets - this is actually 2.9.x of Juju and is already covered by the 2.9 targets and we want to avoid suddenly picking up a new Juju version because this will break with the new approach to version alignment in the Python module for Juju. Drop 2.8 functional test target - its broken and we don't really support this version any longer. Fixup iptables forwarding issues from LXD containers with a flush and re-create of rules. (cherry picked from commit 9277a94) (cherry picked from commit ee92b9b) (cherry picked from commit 355ad7a)
coreycb
force-pushed
the
macroon-wallaby
branch
from
81237a5 to
af6f2d1
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## stable/wallaby #629 +/- ##
==================================================
- Coverage 82.45% 82.27% -0.18%
==================================================
Files 30 30
Lines 2781 2776 -5
==================================================
- Hits 2293 2284 -9
- Misses 488 492 +4 ☔ View full report in Codecov by Sentry. |
added 2 commits
December 8, 2023 14:06
Commit b34de32a in openstacksdk replaced the appdirs library with the platformdirs library. The platformdirs library is not python 3.6 compatible and causes some challenges. Pin the openstacksdk to a lower version. Thanks to Billy Olsen for this patch. Taken from: https://review.opendev.org/c/openstack/charm-neutron-api/+/902607
Starting at 2.9.45.0 the walrus operator is used, but it is not supported until py3.8.
coreycb
force-pushed
the
macroon-wallaby
branch
from
41a5b6d to
bc5334f
Compare
coreycb
force-pushed
the
macroon-wallaby
branch
2 times, most recently
from
d3ab8b9 to
5808349
Compare
This avoids running with py310 which doesn't make sense for focal.
coreycb
force-pushed
the
macroon-wallaby
branch
from
5808349 to
7826a64
Compare
freyes
approved these changes
Dec 12, 2023
freyes
merged commit 329201c
into
openstack-charmers:stable/wallaby
5 of 6 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
macaroonbakery 1.3.3 has a broken protobuf dependency, add a requirement to avoid that specific release:
go-macaroon-bakery/py-macaroon-bakery#94
Conflicts:
test-requirements.txt
Also drop py36 from github workflow as it is no longer available
on ubuntu-latest and not needed for xena which is focal based.
(cherry picked from commit 8be4948)