Skip to content
This repository was archived by the owner on Oct 27, 2025. It is now read-only.

Commit f8ab473

Browse files
committed
Drop python2.7 support
Change-Id: I6e141c9bce8d9281d08272421d9c0b7742762c1e
1 parent a30e64a commit f8ab473

1 file changed

Lines changed: 4 additions & 49 deletions

File tree

python-dciclient.spec

Lines changed: 4 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
%if 0%{?rhel} && 0%{?rhel} < 8
2-
%global is_EL7 1
3-
%endif
41
%global srcname dciclient
52
%global summary Python client for DCI control server for the remote CIs
63

7-
84
Name: python-%{srcname}
9-
Version: 4.0.0
5+
Version: 4.0.1
106
Release: 1.VERS%{?dist}
117
Summary: %{summary}
128

@@ -19,27 +15,6 @@ BuildArch: noarch
1915
%description
2016
%{summary}
2117

22-
%if 0%{?is_EL7}
23-
%package -n python2-%{srcname}
24-
Summary: %{summary}
25-
%{?python_provide:%python_provide python2-%{srcname}}
26-
BuildRequires: python-prettytable
27-
BuildRequires: python-psycopg2
28-
BuildRequires: python-requests >= 2.6
29-
BuildRequires: python-rpm-macros
30-
BuildRequires: python-setuptools
31-
BuildRequires: python2-rpm-macros
32-
BuildRequires: python-dciauth >= 2.1.7
33-
BuildRequires: python2-devel
34-
Requires: python-prettytable
35-
Requires: python-requests >= 2.6
36-
Requires: python-dciauth >= 2.1.7
37-
Requires: python-setuptools
38-
39-
%description -n python2-%{srcname}
40-
%{summary}
41-
%endif
42-
4318
%package -n python3-%{srcname}
4419
Summary: %{summary}
4520
%{?python_provide:%python_provide python3-%{srcname}}
@@ -51,11 +26,7 @@ BuildRequires: python3-rpm-macros
5126
BuildRequires: python3-dciauth >= 2.1.7
5227
BuildRequires: python3-devel
5328
Requires: python3-prettytable
54-
%if 0%{?is_EL7}
55-
Requires: python36-requests
56-
%else
5729
Requires: python3-requests
58-
%endif
5930
Requires: python3-dciauth >= 2.1.7
6031
Requires: python3-setuptools
6132

@@ -66,31 +37,12 @@ Requires: python3-setuptools
6637
%autosetup -n %{srcname}-%{version}.postDATE
6738

6839
%build
69-
%if 0%{?is_EL7}
70-
%py2_build
71-
%endif
7240
%py3_build
7341

7442
%install
7543
install -d %{buildroot}%{_bindir} %{buildroot}%{_datadir}/python-%{srcname}
7644

7745
%py3_install
78-
%if 0%{?is_EL7}
79-
%py2_install
80-
81-
%files -n python2-%{srcname}
82-
%doc README.md
83-
%license LICENSE
84-
%{python2_sitelib}/*
85-
%{_bindir}/dcictl
86-
%{_bindir}/dci-vault
87-
%{_bindir}/dci-vault-client
88-
%{_bindir}/dci-rhel-latest-kernel-version
89-
%{_bindir}/dci-create-component
90-
%{_bindir}/dci-create-job
91-
%{_bindir}/dci-find-latest-component
92-
%{_bindir}/dci-diff-jobs
93-
%endif
9446

9547
%files -n python3-%{srcname}
9648
%doc README.md
@@ -107,6 +59,9 @@ install -d %{buildroot}%{_bindir} %{buildroot}%{_datadir}/python-%{srcname}
10759

10860

10961
%changelog
62+
* Tue Jul 16 2024 Guillaume Vincent <gvincent@redhat.com> 4.0.1-1
63+
- Drop python 2
64+
11065
* Wed Apr 03 2024 Guillaume Vincent <gvincent@redhat.com> 4.0.0-1
11166
- Replace file-show with file-content
11267
- Update file-show to return file API content

0 commit comments

Comments
 (0)