Skip to content

Commit 6fc41d0

Browse files
durgajagadeeshdurgajagadeesh
authored
Upgrade: python-debtcollector version to 3.0.0 (#13604)
1 parent 112374e commit 6fc41d0

5 files changed

Lines changed: 133 additions & 47 deletions

File tree

‎SPECS-EXTENDED/python-debtcollector/0x2ef3fe0ec2b075ab7458b5f8b702b20b13df2318.txt‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
pub ed25519/0xB702B20B13DF2318 2023-09-29 [SC] [expires: 2024-06-25]
2+
Key fingerprint = 2EF3 FE0E C2B0 75AB 7458 B5F8 B702 B20B 13DF 2318
3+
uid OpenStack Infra (2024.1/Caracal Cycle) <infra-root@openstack.org>
4+
sig 3 0xB702B20B13DF2318 2023-09-29 OpenStack Infra (2024.1/Caracal Cycle) <infra-root@openstack.org>
5+
sig 0xCC0DFE2D21C023C9 2023-09-29 OpenStack Infra (2023.2/Bobcat Cycle) <infra-root@openstack.org>
6+
sig 0x48F9961143495829 2023-09-29 Jeremy Stanley <fungi@yuggoth.org>
7+
sub cv25519/0x4F5DA9D1088748F6 2023-09-29 [E] [expires: 2024-06-25]
8+
sig 0xB702B20B13DF2318 2023-09-29 OpenStack Infra (2024.1/Caracal Cycle) <infra-root@openstack.org>
9+
sub ed25519/0x7A1014352C3D5B21 2023-09-29 [S]
10+
sig 0xB702B20B13DF2318 2023-09-29 OpenStack Infra (2024.1/Caracal Cycle) <infra-root@openstack.org>
11+
12+
-----BEGIN PGP PUBLIC KEY BLOCK-----
13+
14+
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
44+
=7Dhm
45+
-----END PGP PUBLIC KEY BLOCK-----

‎SPECS-EXTENDED/python-debtcollector/debtcollector-3.0.0.tar.gz.asc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
-----BEGIN PGP SIGNATURE-----
2+
3+
iHQEABYIAB0WIQSNoB+ORY98QEADfvJ6EBQ1LD1bIQUCZddqlgAKCRB6EBQ1LD1b
4+
Ie6gAQDHIWhuyB9qB0Cu7YOYPBlm4hdrkmlPGj13lw4FyQz5OAD4wXtrWFpFBeFF
5+
55uuPCnfWgW4PdtKqeK/DKuBBagFDw==
6+
=mmVk
7+
-----END PGP SIGNATURE-----

‎SPECS-EXTENDED/python-debtcollector/python-debtcollector.signatures.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
22
"Signatures": {
3-
"python-debtcollector-1.22.0.tar.gz": "d1756440d25a50e3eca2fc399c9e5f1ca2f9e6b837570a80b9450999f4290525"
3+
"0x2ef3fe0ec2b075ab7458b5f8b702b20b13df2318.txt": "a4f619daa6f2f0d47c611fabc489cf634e55d2386bb4f92d2929d2c8aafef53e",
4+
"debtcollector-3.0.0.tar.gz": "2a8917d25b0e1f1d0d365d3c1c6ecfc7a522b1e9716e8a1a4a915126f7ccea6f",
5+
"debtcollector-3.0.0.tar.gz.asc": "38e46360865e6584be6ed0745b292ab2a8457bd65ad2d53b39ad4496962232f9"
46
}
5-
}
7+
}

‎SPECS-EXTENDED/python-debtcollector/python-debtcollector.spec‎

Lines changed: 75 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
Vendor: Microsoft Corporation
22
Distribution: Azure Linux
3-
# Macros for py2/py3 compatibility
4-
%global pyver %{python3_pkgversion}
5-
%global pyver_bin python%{pyver}
6-
%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
7-
%global pyver_install %{expand:%{py%{pyver}_install}}
8-
%global pyver_build %{expand:%{py%{pyver}_build}}
9-
# End of macros for py2/py3 compatibility
3+
4+
%{!?sources_gpg: %{!?dlrn:%global sources_gpg 1} }
5+
%global sources_gpg_sign 0x2ef3fe0ec2b075ab7458b5f8b702b20b13df2318
106

117
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
8+
# we are excluding some BRs from automatic generator
9+
%global excluded_brs doc8 bandit pre-commit hacking flake8-import-order
1210

1311
%global pypi_name debtcollector
1412
%global with_doc 1
@@ -21,78 +19,109 @@ It is a collection of functions/decorators which is used to signal a user when \
2119
* further customizing the emitted messages
2220

2321
Name: python-%{pypi_name}
24-
Version: 1.22.0
25-
Release: 4%{?dist}
22+
Version: 3.0.0
23+
Release: 10%{?dist}
2624
Summary: A collection of Python deprecation patterns and strategies
2725

28-
License: ASL 2.0
26+
License: Apache-2.0
2927
URL: https://pypi.python.org/pypi/%{pypi_name}
30-
Source0: https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz#/python-%{pypi_name}-%{upstream_version}.tar.gz
28+
Source0: https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz
29+
# Required for tarball sources verification
30+
%if 0%{?sources_gpg} == 1
31+
Source101: https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz.asc
32+
Source102: https://releases.openstack.org/_static/%{sources_gpg_sign}.txt
33+
%endif
34+
35+
BuildRequires: python-pip
36+
BuildRequires: python-pbr
37+
BuildRequires: python-wheel
38+
BuildRequires: python-setuptools
39+
BuildRequires: python3-pytest
40+
BuildRequires: python-dulwich
41+
BuildRequires: python-openstackdocstheme
42+
BuildRequires: python-toml
43+
BuildRequires: python-tox
44+
BuildRequires: python-wrapt
45+
BuildRequires: python-extras
46+
BuildRequires: python-sphinx
47+
BuildRequires: python-tox-current-env
48+
BuildRequires: python-virtualenv
49+
BuildRequires: python3-testtools
50+
BuildRequires: python3-fixtures
3151

3252
BuildArch: noarch
3353

34-
BuildRequires: git
54+
# Required for tarball sources verification
55+
%if 0%{?sources_gpg} == 1
56+
BuildRequires: /usr/bin/gpgv2
57+
%endif
58+
59+
BuildRequires: git-core
3560

3661
%description
3762
%{common_desc}
3863

39-
%package -n python%{pyver}-%{pypi_name}
64+
%package -n python3-%{pypi_name}
4065
Summary: A collection of Python deprecation patterns and strategies
41-
%{?python_provide:%python_provide python%{pyver}-%{pypi_name}}
4266

43-
BuildRequires: python%{pyver}-devel
44-
BuildRequires: python%{pyver}-setuptools
45-
BuildRequires: python%{pyver}-pbr
67+
BuildRequires: python3-devel
68+
BuildRequires: pyproject-rpm-macros
4669

47-
Requires: python%{pyver}-funcsigs
48-
Requires: python%{pyver}-pbr
49-
Requires: python%{pyver}-six
50-
Requires: python%{pyver}-wrapt
51-
52-
%description -n python%{pyver}-%{pypi_name}
70+
%description -n python3-%{pypi_name}
5371
%{common_desc}
5472

5573

5674
%if 0%{?with_doc}
5775
%package -n python-%{pypi_name}-doc
5876
Summary: Documentation for the debtcollector module
5977

60-
BuildRequires: python%{pyver}-sphinx
61-
BuildRequires: python%{pyver}-openstackdocstheme
62-
BuildRequires: python%{pyver}-fixtures
63-
BuildRequires: python%{pyver}-six
64-
BuildRequires: python%{pyver}-wrapt
65-
6678
%description -n python-%{pypi_name}-doc
6779
Documentation for the debtcollector module
6880
%endif
6981

70-
7182
%prep
83+
# Required for tarball sources verification
84+
%if 0%{?sources_gpg} == 1
85+
%{gpgverify} --keyring=%{SOURCE102} --signature=%{SOURCE101} --data=%{SOURCE0}
86+
%endif
7287
%autosetup -n %{pypi_name}-%{upstream_version} -S git
7388

74-
# let RPM handle deps
75-
rm -rf *requirements.txt
89+
90+
sed -i /^[[:space:]]*-c{env:.*_CONSTRAINTS_FILE.*/d tox.ini
91+
sed -i "s/^deps = -c{env:.*_CONSTRAINTS_FILE.*/deps =/" tox.ini
92+
sed -i /^minversion.*/d tox.ini
93+
sed -i /^requires.*virtualenv.*/d tox.ini
94+
95+
# Exclude some bad-known BRs
96+
for pkg in %{excluded_brs};do
97+
for reqfile in doc/requirements.txt test-requirements.txt; do
98+
if [ -f $reqfile ]; then
99+
sed -i /^${pkg}.*/d $reqfile
100+
fi
101+
done
102+
done
76103

77104
%build
78-
%{pyver_build}
105+
%pyproject_wheel
106+
107+
%install
108+
%pyproject_install
79109

80110
%if 0%{?with_doc}
81111
# doc
82-
%{pyver_bin} setup.py build_sphinx -b html
112+
PYTHONPATH="%{buildroot}/%{python3_sitelib}"
113+
%tox -e docs
83114
# Fix hidden-file-or-dir warnings
84-
rm -fr doc/build/html/.buildinfo
115+
rm -fr doc/build/html/.{doctrees,buildinfo}
116+
rm -f doc/build/html/_static/images/docs/license.png
85117
%endif
86118

87-
%install
88-
%{pyver_install}
89-
90-
%files -n python%{pyver}-%{pypi_name}
119+
%files -n python3-%{pypi_name}
91120
%doc README.rst CONTRIBUTING.rst
92121
%license LICENSE
93-
%{pyver_sitelib}/%{pypi_name}
94-
%{pyver_sitelib}/%{pypi_name}*.egg-info
95-
%exclude %{pyver_sitelib}/%{pypi_name}/tests
122+
%{python3_sitelib}/%{pypi_name}
123+
%{python3_sitelib}/%{pypi_name}*.dist-info
124+
%exclude %{python3_sitelib}/%{pypi_name}/tests
96125

97126
%if 0%{?with_doc}
98127
%files -n python-%{pypi_name}-doc
@@ -101,6 +130,10 @@ rm -fr doc/build/html/.buildinfo
101130
%endif
102131

103132
%changelog
133+
* Fri Jan 09 2026 Durga Jagadeesh Palli <v-dpalli@microsoft.com> - 3.0.0-10
134+
- Upgrade to 3.0.0 (Reference: Fedora 44)
135+
- License verified
136+
104137
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.22.0-4
105138
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
106139

@@ -121,4 +154,3 @@ rm -fr doc/build/html/.buildinfo
121154

122155
* Fri Mar 08 2019 RDO <dev@lists.rdoproject.org> 1.21.0-1
123156
- Update to 1.21.0
124-

‎cgmanifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22633,8 +22633,8 @@
2263322633
"type": "other",
2263422634
"other": {
2263522635
"name": "python-debtcollector",
22636-
"version": "1.22.0",
22637-
"downloadUrl": "https://tarballs.openstack.org/debtcollector/debtcollector-1.22.0.tar.gz"
22636+
"version": "3.0.0",
22637+
"downloadUrl": "https://tarballs.openstack.org/debtcollector/debtcollector-3.0.0.tar.gz"
2263822638
}
2263922639
}
2264022640
},

0 commit comments

Comments
 (0)