From 435d7a98744cbe3ec658a3711f3e2ee0dad285f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2020 15:10:02 +0000 Subject: [PATCH 1/2] Bump pyyaml from 3.12 to 5.1 Bumps [pyyaml](https://github.com/yaml/pyyaml) from 3.12 to 5.1. - [Release notes](https://github.com/yaml/pyyaml/releases) - [Changelog](https://github.com/yaml/pyyaml/blob/master/CHANGES) - [Commits](https://github.com/yaml/pyyaml/compare/3.12...5.1) Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8471fe7..fd84758 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ psycopg2==2.7.3.2 prometheus_client==0.0.21 python-json-logger==0.1.5 pycodestyle -PyYAML==3.12 +PyYAML==5.1 diff --git a/setup.py b/setup.py index 4126b2b..cc11fd7 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ keywords = ['prometheus', 'pgbouncer'], classifiers = [], python_requires = ' >= 3', - install_requires = ['psycopg2 == 2.7.3.2', 'prometheus_client==0.0.21', 'python-json-logger==0.1.5', 'PyYAML==3.12'], + install_requires = ['psycopg2 == 2.7.3.2', 'prometheus_client==0.0.21', 'python-json-logger==0.1.5', 'PyYAML==5.1'], entry_points = { 'console_scripts': [ 'pgbouncer-exporter=prometheus_pgbouncer_exporter.cli:main', From 89f231954c9032137bf9c90b35ec642d88073314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20S=C3=A1nchez?= Date: Fri, 10 Jul 2020 15:55:54 +0200 Subject: [PATCH 2/2] Upgrade to PyYAML 5.3.1 --- prometheus_pgbouncer_exporter/config.py | 2 +- requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/prometheus_pgbouncer_exporter/config.py b/prometheus_pgbouncer_exporter/config.py index 00dd71f..89e6092 100644 --- a/prometheus_pgbouncer_exporter/config.py +++ b/prometheus_pgbouncer_exporter/config.py @@ -49,7 +49,7 @@ def env_var_multi_replacer(loader, node): # Read file try: stream = open(filepath, "r") - self.config = yaml.load(stream) + self.config = yaml.load(stream, Loader=yaml.FullLoader) # Handle an empty configuration file if not self.config: diff --git a/requirements.txt b/requirements.txt index fd84758..35b04af 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ psycopg2==2.7.3.2 prometheus_client==0.0.21 python-json-logger==0.1.5 pycodestyle -PyYAML==5.1 +PyYAML==5.3.1 diff --git a/setup.py b/setup.py index cc11fd7..66a8b07 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ keywords = ['prometheus', 'pgbouncer'], classifiers = [], python_requires = ' >= 3', - install_requires = ['psycopg2 == 2.7.3.2', 'prometheus_client==0.0.21', 'python-json-logger==0.1.5', 'PyYAML==5.1'], + install_requires = ['psycopg2 == 2.7.3.2', 'prometheus_client==0.0.21', 'python-json-logger==0.1.5', 'PyYAML==5.3.1'], entry_points = { 'console_scripts': [ 'pgbouncer-exporter=prometheus_pgbouncer_exporter.cli:main',