Skip to content

Commit 4e33bbc

Browse files
committed
Update debian packaging.
1 parent f256825 commit 4e33bbc

6 files changed

Lines changed: 24 additions & 46 deletions

File tree

debian/compat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10
1+
11

debian/control

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,21 @@
11
Source: python-prometheus-client
22
Maintainer: Christopher Baines <mail@cbaines.net>
33
Uploaders: Federico Ceratto <federico@debian.org>,
4-
Martín Ferrari <tincho@debian.org>,
4+
Martina Ferrari <tina@debian.org>,
55
Section: python
66
Priority: optional
7-
Build-Depends: debhelper (>= 10~),
7+
Build-Depends: debhelper (>= 11),
88
Build-Depends-Indep: dh-python,
9-
python-all,
10-
python-concurrent.futures,
11-
python-decorator (>= 4.0.10),
12-
python-pytest,
13-
python-setuptools,
149
python3-all,
1510
python3-decorator (>= 4.0.10),
1611
python3-pytest,
1712
python3-setuptools,
18-
Standards-Version: 4.3.0
13+
Rules-Requires-Root: no
14+
Standards-Version: 4.5.1
1915
Vcs-Browser: https://salsa.debian.org/debian/python-prometheus-client
2016
Vcs-Git: https://salsa.debian.org/debian/python-prometheus-client.git
2117
Homepage: https://github.com/prometheus/client_python
2218

23-
Package: python-prometheus-client
24-
Architecture: all
25-
Depends: python-decorator (>= 4.0.10-1),
26-
${misc:Depends},
27-
${python:Depends},
28-
Description: Python 2 client for the Prometheus monitoring system
29-
This library provides an API for exporting metrics from a Python application.
30-
It provides classes for the metric types, and an HTTP server to expose the
31-
metrics to Prometheus.
32-
.
33-
When using Linux, the process CPU, RAM, file descriptor usage and start time
34-
will also be exported.
35-
.
36-
Along with the HTTP server to expose metrics, you can also write the metrics
37-
to a text file to be exported by the prometheus-node-exporter, or push them to
38-
the prometheus-pushgateway.
39-
.
40-
This library also includes support for re-exporting Graphite metrics to
41-
Prometheus, custom collectors to proxy metrics for other systems and a parser
42-
for the Prometheus text format.
43-
4419
Package: python3-prometheus-client
4520
Architecture: all
4621
Depends: python3-decorator (>= 4.0.10-1),
Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
From: Federico Ceratto <federico@debian.org>
22
Date: Tue, 3 Jan 2017 21:30:13 +0000
3-
Subject: Import unvendorized decorator.py
4-
Forwarded: no
3+
Updated: Sun, 27 Dec 2020 20:42:08 +0000
4+
Subject: Use packaged decorator.py
5+
Forwarded: not-needed
56

67
---
7-
Index: build/prometheus_client/context_managers.py
8-
===================================================================
9-
--- build.orig/prometheus_client/context_managers.py
10-
+++ build/prometheus_client/context_managers.py
11-
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
8+
--- a/prometheus_client/context_managers.py
9+
+++ b/prometheus_client/context_managers.py
10+
@@ -2,7 +2,7 @@
1211

1312
from timeit import default_timer
1413

@@ -17,16 +16,21 @@ Index: build/prometheus_client/context_managers.py
1716

1817

1918
class ExceptionCounter(object):
20-
Index: build/tests/test_core.py
21-
===================================================================
22-
--- build.orig/tests/test_core.py
23-
+++ build/tests/test_core.py
24-
@@ -11,7 +11,7 @@ from prometheus_client.core import (
19+
--- a/tests/test_core.py
20+
+++ b/tests/test_core.py
21+
@@ -11,7 +11,14 @@
2522
HistogramMetricFamily, Info, InfoMetricFamily, Metric, Sample,
2623
StateSetMetricFamily, Summary, SummaryMetricFamily, UntypedMetricFamily,
2724
)
2825
-from prometheus_client.decorator import getargspec
29-
+from inspect import getargspec
26+
+from inspect import getfullargspec
27+
+
28+
+
29+
+def getargspec(f):
30+
+ """A replacement for inspect.getargspec"""
31+
+ spec = getfullargspec(f)
32+
+ return spec.args, spec.varargs, spec.varkw, spec.defaults
33+
+
3034

3135
try:
3236
import unittest2 as unittest

debian/python-prometheus-client.docs

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export http_proxy=
88
export https_proxy=
99

1010
%:
11-
dh $@ --with python2,python3 --buildsystem=pybuild
11+
dh $@ --with python3 --buildsystem=pybuild
1212

1313
override_dh_auto_clean:
1414
dh_auto_clean

debian/watch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version=3
1+
version=4
22
opts=filenamemangle=s/(?:.*\/)?v?([^\/]+)\.tar\.gz/python-prometheus-client-$1\.tar\.gz/,uversionmangle=s/rc/~rc/ \
33
https://github.com/prometheus/client_python/tags (?:.*/)?v?(\d[\d\.]*(?:rc\d*)?)\.tar\.gz

0 commit comments

Comments
 (0)