From 09f5e3e631591aa2a20012f77bb8c2025aa8319c Mon Sep 17 00:00:00 2001 From: Valerij Maljulin Date: Fri, 26 May 2023 17:44:30 +0200 Subject: [PATCH] tox deprecation warnings fix --- docs/conf.py | 15 --------------- waiverdb/monitor.py | 4 ++-- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index e16b2dd..3668faa 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -19,21 +19,6 @@ import os import sys -# Hot-fix broken sphinxcontrib.httpdomain -# See: https://github.com/sphinx-contrib/httpdomain/pull/54 -try: - import pkg_resources - - if pkg_resources.require("sphinxcontrib_httpdomain")[0].version == '1.7.0': - from sphinxcontrib import httpdomain - - for typed_field in httpdomain.HTTPResource.doc_field_types: - typed_field.typerolename = None - for object_type in httpdomain.HTTPDomain.object_types.values(): - object_type.roles = tuple(r for r in object_type.roles if r != 'obj') -except Exception: - pass - # This will cause the Flask application to be created with development configs os.environ['DEV'] = 'true' diff --git a/waiverdb/monitor.py b/waiverdb/monitor.py index 36d8ef1..02d0cf6 100644 --- a/waiverdb/monitor.py +++ b/waiverdb/monitor.py @@ -18,8 +18,8 @@ # Service-specific imports -if not os.environ.get('prometheus_multiproc_dir'): - os.environ.setdefault('prometheus_multiproc_dir', tempfile.mkdtemp()) +if not os.environ.get('PROMETHEUS_MULTIPROC_DIR'): + os.environ.setdefault('PROMETHEUS_MULTIPROC_DIR', tempfile.mkdtemp()) registry = CollectorRegistry() ProcessCollector(registry=registry) multiprocess.MultiProcessCollector(registry)