summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaw Loeung <[email protected]>2024-08-20 09:21:28 +1000
committerHaw Loeung <[email protected]>2024-08-20 09:21:28 +1000
commitd9430068de4d34e828e888c14c83d46dd0d58682 (patch)
tree9b320f136b21cf4de55bd11adf89208b9471eff6
parentdd7bc30247485919c992119cf694eed72657a9d7 (diff)
Reformatting changes; ignore distutils warning; add link to charms reactive bug and why we now need setuptools
-rw-r--r--pytest.ini5
-rw-r--r--reactive/content_cache.py2
-rw-r--r--tests/unit/requirements.txt1
3 files changed, 7 insertions, 1 deletions
diff --git a/pytest.ini b/pytest.ini
index e3d2428..b68d5cb 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -12,5 +12,10 @@ filterwarnings =
# distutils
ignore:the imp module is deprecated in favour of importlib:DeprecationWarning
+ ignore:distutils Version classes are deprecated. Use packaging.version instead.:DeprecationWarning
+
+ # pkg_resources
+ ignore:pkg_resources is deprecated as an API.:DeprecationWarning
+
# jinja2
ignore:.*Using or importing the ABCs from.*:DeprecationWarning
diff --git a/reactive/content_cache.py b/reactive/content_cache.py
index 1d01f04..2c48e77 100644
--- a/reactive/content_cache.py
+++ b/reactive/content_cache.py
@@ -255,7 +255,7 @@ def configure_nginx(conf_path=None): # NOQA: C901
if copy_file(
'files/nginx-server-names-hash-bucket-size.conf',
- os.path.join(ngx_conf.conf_path, 'server-names-hash-bucket-size.conf')
+ os.path.join(ngx_conf.conf_path, 'server-names-hash-bucket-size.conf'),
):
changed = True
diff --git a/tests/unit/requirements.txt b/tests/unit/requirements.txt
index db2b1e9..38e0123 100644
--- a/tests/unit/requirements.txt
+++ b/tests/unit/requirements.txt
@@ -6,4 +6,5 @@ mock
psutil
pytest
pytest-cov
+# https://github.com/canonical/charms.reactive/issues/263
setuptools