Merge ~txiao/charm-infra-node:xenial/stable into charm-infra-node:xenial/stable

[Tianqi Xiao]

Limit MartkupSafe package version for legacy support and update fixtures

- Limit MartkupSafe package version to < 2.0.0 for legacy support
- Update fixtures in functional tests to fix bug LP#1983398

func-test: https://pastebin.ubuntu.com/p/Yg65k4D3tQ/

[Robert Gildein (rgildein)]

LGTM

review: Approve

[Eric Chen (eric-chen)]

review: Approve

diff --git a/src/tests/functional/test_deploy.py b/src/tests/functional/test_deploy.py
index d83e09a..4f1a913 100644
--- a/src/tests/functional/test_deploy.py
+++ b/src/tests/functional/test_deploy.py
@@ -1,6 +1,7 @@
 import os
 from collections import defaultdict
 import pytest
+import pytest_asyncio
 from juju.model import Model
 
 # Treat tests as coroutines
@@ -12,7 +13,7 @@ nagios_series['xenial'] = "xenial"
 charm_location = os.getenv('CHARM_LOCATION', '.').rstrip('/')
 
 
[e-mail]
+@pytest_asyncio.fixture
 async def model():
     model = Model()
     await model.connect_current()
@@ -20,7 +21,7 @@ async def model():
     await model.disconnect()
 
 
[e-mail]
+@pytest_asyncio.fixture
 async def apps(model):
     apps = []
     for entry in series:
@@ -29,7 +30,7 @@ async def apps(model):
     return apps
 
 
[e-mail]
+@pytest_asyncio.fixture
 async def units(apps):
     units = []
     for app in apps:
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
new file mode 100644
index 0000000..36f0d40
--- /dev/null
+++ b/src/wheelhouse.txt
@@ -0,0 +1 @@
+MarkupSafe<2.0.0
\ No newline at end of file