Control: tags 1021925 + patch Control: tags 1021925 + pending
Dear maintainer, I've prepared an NMU for prometheus-openstack-exporter (versioned as 0.1.4-2.2). The diff is attached to this message. I require a sponsor to have it uploaded. Best wishes, -- Raúl Benencia
diff -Nru prometheus-openstack-exporter-0.1.4/debian/changelog prometheus-openstack-exporter-0.1.4/debian/changelog --- prometheus-openstack-exporter-0.1.4/debian/changelog 2022-10-15 03:39:55.000000000 -0700 +++ prometheus-openstack-exporter-0.1.4/debian/changelog 2022-10-23 15:30:50.000000000 -0700 @@ -1,3 +1,10 @@ +prometheus-openstack-exporter (0.1.4-2.2) unstable; urgency=medium + + * Non-maintainer upload. + * Disable setuptools package automatic discovery (Closes: #1021925) + + -- Raúl Benencia <r...@kalgan.cc> Sun, 23 Oct 2022 15:30:50 -0700 + prometheus-openstack-exporter (0.1.4-2.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru prometheus-openstack-exporter-0.1.4/debian/patches/disable-package-autodiscovery.patch prometheus-openstack-exporter-0.1.4/debian/patches/disable-package-autodiscovery.patch --- prometheus-openstack-exporter-0.1.4/debian/patches/disable-package-autodiscovery.patch 1969-12-31 16:00:00.000000000 -0800 +++ prometheus-openstack-exporter-0.1.4/debian/patches/disable-package-autodiscovery.patch 2022-10-23 15:30:50.000000000 -0700 @@ -0,0 +1,32 @@ +From: Raúl Benencia <r...@kalgan.cc> +Date: Sat, 22 Oct 2022 11:17:24 -0700 +X-Dgit-Generated: 0.1.4-2.1 d12f61eaa20032eb3b7aa86269b355eebd10f6c4 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1021925 +Forwarded: https://github.com/canonical/prometheus-openstack-exporter/pull/122 +Subject: Disable package autodiscovery + +Due to a change in setuptools>v61, package autodiscovery causes Debian +builds to fail with: + + error: Multiple top-level packages discovered in a flat-layout: ['snap', 'debian']. + +This can be fixed by disabling package autodiscovery. More information +in: + +- https://setuptools.pypa.io/en/latest/history.html#v61-0-0 +- https://github.com/pypa/setuptools/issues/3227 + +--- + +diff --git a/setup.py b/setup.py +index 3f42480..0b14083 100644 +--- a/setup.py ++++ b/setup.py +@@ -15,6 +15,7 @@ setup( + keywords=["prometheus", "openstack", "exporter"], + url="https://github.com/CanonicalLtd/prometheus-openstack-exporter";, + scripts=["prometheus-openstack-exporter"], ++ packages=[], + install_requires=[ + "prometheus_client", + "python-keystoneclient<=3.10.0", diff -Nru prometheus-openstack-exporter-0.1.4/debian/patches/series prometheus-openstack-exporter-0.1.4/debian/patches/series --- prometheus-openstack-exporter-0.1.4/debian/patches/series 2022-10-15 03:39:55.000000000 -0700 +++ prometheus-openstack-exporter-0.1.4/debian/patches/series 2022-10-23 15:30:50.000000000 -0700 @@ -1 +1,2 @@ python3-shebang.patch +disable-package-autodiscovery.patch
signature.asc
Description: PGP signature
