Skip to content

Commit 5f51a7f

Browse files
Corey Bryantfreyes
Corey Bryant
andcommitted
setup: Update charm-tools pin set
pyyaml 5.4.0 and 5.4.1 are broken with cython 3 yaml/pyyaml#724 jsonschema 4.18.0 depends on Rust (via rpds-py) Co-authored-by: Felipe Reyes <felipe.reyes@canonical.com>
1 parent 5031b75 commit 5f51a7f

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.github/workflows/tests.yml

+4
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ jobs:
4949
sudo lxd init --auto
5050
# This is a throw-away CI environment, do not do this at home
5151
sudo chmod 666 /var/snap/lxd/common/lxd/unix.socket
52+
# Fixup iptables forwarding issues from LXD containers with a flush and
53+
# re-create of rules.
54+
sudo iptables -F FORWARD
55+
sudo iptables -P FORWARD ACCEPT
5256
- name: Checkout layer-basic
5357
uses: actions/checkout@v2
5458
with:

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
4444
install_requires=[
4545
'cheetah3>=3.0.0,<4.0',
46-
'pyyaml>=5.0,<6.0',
46+
'pyyaml>=5.0,!=5.4.0,!=5.4.1,<6.0',
4747
'requests>=2.0.0,<3.0.0',
4848
'blessings<2.0',
4949
'ruamel.yaml<0.16.0;python_version < "3.7"',
@@ -56,7 +56,7 @@
5656
'jujubundlelib<0.6',
5757
'virtualenv>=1.11.4,<21',
5858
'colander<1.9',
59-
'jsonschema<5.0',
59+
'jsonschema<4.18.0',
6060
'keyring<24',
6161
'secretstorage<3.4',
6262
'dict2colander==0.2',

0 commit comments

Comments
 (0)