Skip to content

Commit

Permalink
Pin MarkupSafe < 2.0.0 for py35 support (#197)
Browse files Browse the repository at this point in the history
* Pin MarkupSafe < 2.0.0 for py35 support

MarkupSafe 2.0.0+ (required for Jinja2) removed py35 compatability, so
we need to pin it for charms to work on xenial.

Closes-bug: #196

* Make status and error logs always be captured, even on failure

Co-authored-by: Cory Johns <johnsca@gmail.com>
  • Loading branch information
ajkavanagh and johnsca authored Jun 2, 2021
1 parent 813f8b6 commit a3ff62c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,12 @@ jobs:
- name: Run test
run: tox -e func
- name: Show Status
if: ${{ always() }}
run: |
model=$(juju models --format yaml|grep "^- name:.*zaza"|cut -f2 -d/);
juju status -m "$model"
- name: Show Error Logs
if: ${{ always() }}
run: |
model=$(juju models --format yaml|grep "^- name:.*zaza"|cut -f2 -d/);
juju debug-log -m "$model" --replay --no-tail --level ERROR
4 changes: 3 additions & 1 deletion wheelhouse.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
# even with installing setuptools before upgrading pip ends up with pip seeing
# the older setuptools at the system level if include_system_packages is true
pip>=18.1,<19.0
# pin Jinja2 and PyYAML to the last versions supporting python 3.4 for trusty
# pin Jinja2, PyYAML and MarkupSafe to the last versions supporting python 3.5
# for trusty
Jinja2<=2.10.1
PyYAML<=5.2
MarkupSafe<2.0.0
setuptools<42
setuptools-scm<=1.17.0
charmhelpers>=0.4.0,<1.0.0
Expand Down

0 comments on commit a3ff62c

Please sign in to comment.