diff --git a/.gitignore b/.gitignore index 006951a..a21bc8c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /client_python-v0.5.0.tar.gz /client_python-v0.6.0.tar.gz /prometheus_client-0.7.1.tar.gz +/prometheus_client-0.9.0.tar.gz diff --git a/0001-Drop-unneeded-shebangs.patch b/0001-Drop-unneeded-shebangs.patch deleted file mode 100644 index 091da84..0000000 --- a/0001-Drop-unneeded-shebangs.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 788fe7a51edcd335826f01dc1e6c16a01500e543 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sat, 7 Sep 2019 13:12:03 +0200 -Subject: [PATCH] Drop unneeded shebangs - -Those files are not executable, nor have any __main__ function. - -Signed-off-by: Igor Gnatenko ---- - prometheus_client/exposition.py | 2 -- - prometheus_client/gc_collector.py | 2 -- - prometheus_client/multiprocess.py | 2 -- - prometheus_client/parser.py | 2 -- - prometheus_client/platform_collector.py | 1 - - prometheus_client/process_collector.py | 2 -- - 6 files changed, 11 deletions(-) - mode change 100755 => 100644 prometheus_client/parser.py - -diff --git a/prometheus_client/exposition.py b/prometheus_client/exposition.py -index 9b89c01..2e32985 100644 ---- a/prometheus_client/exposition.py -+++ b/prometheus_client/exposition.py -@@ -1,5 +1,3 @@ --#!/usr/bin/python -- - from __future__ import unicode_literals - - import base64 -diff --git a/prometheus_client/gc_collector.py b/prometheus_client/gc_collector.py -index 837886c..845ed75 100644 ---- a/prometheus_client/gc_collector.py -+++ b/prometheus_client/gc_collector.py -@@ -1,5 +1,3 @@ --#!/usr/bin/python -- - from __future__ import unicode_literals - - import gc -diff --git a/prometheus_client/multiprocess.py b/prometheus_client/multiprocess.py -index 5961207..4f2611b 100644 ---- a/prometheus_client/multiprocess.py -+++ b/prometheus_client/multiprocess.py -@@ -1,5 +1,3 @@ --#!/usr/bin/python -- - from __future__ import unicode_literals - - from collections import defaultdict -diff --git a/prometheus_client/parser.py b/prometheus_client/parser.py -old mode 100755 -new mode 100644 -index 1695052..d3c7832 ---- a/prometheus_client/parser.py -+++ b/prometheus_client/parser.py -@@ -1,5 +1,3 @@ --#!/usr/bin/python -- - from __future__ import unicode_literals - - import re -diff --git a/prometheus_client/platform_collector.py b/prometheus_client/platform_collector.py -index 5097fcd..17f53cb 100644 ---- a/prometheus_client/platform_collector.py -+++ b/prometheus_client/platform_collector.py -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # -*- coding: utf-8 - from __future__ import unicode_literals - -diff --git a/prometheus_client/process_collector.py b/prometheus_client/process_collector.py -index 8893959..96ddcce 100644 ---- a/prometheus_client/process_collector.py -+++ b/prometheus_client/process_collector.py -@@ -1,5 +1,3 @@ --#!/usr/bin/python -- - from __future__ import unicode_literals - - import os --- -2.23.0 - diff --git a/0001-Unbundle-decorator.patch b/0001-Unbundle-decorator.patch index 68aa9d0..fb2fc3d 100644 --- a/0001-Unbundle-decorator.patch +++ b/0001-Unbundle-decorator.patch @@ -1,15 +1,16 @@ -From c023d1e0a574ea095dd8b46ef50ea60ad19ac3aa Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sat, 7 Sep 2019 13:07:47 +0200 +From 49af450b7abfbbb4bf29f17d34339029b2a424ca Mon Sep 17 00:00:00 2001 +From: Igor Raits +Date: Sat, 12 Dec 2020 14:43:19 +0100 Subject: [PATCH] Unbundle decorator -Signed-off-by: Igor Gnatenko +Signed-off-by: Igor Raits --- NOTICE | 3 - prometheus_client/context_managers.py | 2 +- prometheus_client/decorator.py | 427 -------------------------- setup.py | 1 + - 4 files changed, 2 insertions(+), 431 deletions(-) + tests/test_core.py | 2 +- + 5 files changed, 3 insertions(+), 432 deletions(-) delete mode 100644 prometheus_client/decorator.py diff --git a/NOTICE b/NOTICE @@ -469,10 +470,10 @@ index 1ad2c97..0000000 - gen_func_dec.__name__ = 'dispatch_on' + dispatch_str - return gen_func_dec diff --git a/setup.py b/setup.py -index 768a8bb..06bbc1e 100644 +index 0c80a56..7a434b2 100644 --- a/setup.py +++ b/setup.py -@@ -18,6 +18,7 @@ setup( +@@ -27,6 +27,7 @@ setup( 'prometheus_client.openmetrics', 'prometheus_client.twisted', ], @@ -480,6 +481,19 @@ index 768a8bb..06bbc1e 100644 extras_require={ 'twisted': ['twisted'], }, +diff --git a/tests/test_core.py b/tests/test_core.py +index 5a81f12..d81f0a8 100644 +--- a/tests/test_core.py ++++ b/tests/test_core.py +@@ -11,7 +11,7 @@ from prometheus_client.core import ( + HistogramMetricFamily, Info, InfoMetricFamily, Metric, Sample, + StateSetMetricFamily, Summary, SummaryMetricFamily, UntypedMetricFamily, + ) +-from prometheus_client.decorator import getargspec ++from inspect import getargspec + + try: + import unittest2 as unittest -- -2.23.0 +2.29.2 diff --git a/python-prometheus_client.spec b/python-prometheus_client.spec index 5e53c16..864efe1 100644 --- a/python-prometheus_client.spec +++ b/python-prometheus_client.spec @@ -1,8 +1,8 @@ %global srcname prometheus_client Name: python-%{srcname} -Version: 0.7.1 -Release: 6%{?dist} +Version: 0.9.0 +Release: 1%{?dist} Summary: Python client for Prometheus License: ASL 2.0 @@ -10,8 +10,6 @@ URL: https://github.com/prometheus/client_python Source: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz # https://github.com/prometheus/client_python/pull/462 Patch0001: 0001-Unbundle-decorator.patch -# https://github.com/prometheus/client_python/pull/463 -Patch0002: 0001-Drop-unneeded-shebangs.patch BuildArch: noarch @@ -64,6 +62,9 @@ sed -i -e '1{/^#!/d}' prometheus_client/__init__.py %{?python_extras_subpkg:%ghost %{python3_sitelib}/%{srcname}-*.egg-info/} %changelog +* Sat Dec 12 2020 Igor Raits - 0.9.0-1 +- Update to 0.9.0 + * Sat Aug 01 2020 Fedora Release Engineering - 0.7.1-6 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 8da7c5d..3108923 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (prometheus_client-0.7.1.tar.gz) = 84b145ed191c9903d390b152c72de4f2afcb4c500b8debba59ded081f00cc76109b336ed2d7783d59e9922ea2927632f7ef730f336974294b20048c51e9d58a4 +SHA512 (prometheus_client-0.9.0.tar.gz) = 1d68ca35169972c50bb56ede88c47408ee27b3e795fcf03798313aed2dbc5db5532fe6886998c118258b76e431c6e49aa0ac19b9206cad63711901497258aaa5