rpms/cloud-init
8
1
Fork 1
Code Issues Pull Requests Releases Activity

Drop unneeded build dependency on python3-unittest2

Browse Source
This commit is contained in:
Miro Hrončok 2019-11-08 21:02:19 +01:00
parent 60f5d25c9e
commit 2a445b4a0b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cloud-init.spec
View File

@ -1,6 +1,6 @@
Name: cloud-init Name: cloud-init
Version: 17.1 Version: 17.1
Release: 13%{?dist} Release: 14%{?dist}
Summary: Cloud instance init scripts Summary: Cloud instance init scripts
License: ASL 2.0 or GPLv3 License: ASL 2.0 or GPLv3
URL: http://launchpad.net/cloud-init URL: http://launchpad.net/cloud-init
@ -54,7 +54,6 @@ BuildRequires: python3-pyserial
BuildRequires: python3-PyYAML BuildRequires: python3-PyYAML
BuildRequires: python3-requests BuildRequires: python3-requests
BuildRequires: python3-six BuildRequires: python3-six
BuildRequires: python3-unittest2
# dnf is needed to make cc_ntp unit tests work # dnf is needed to make cc_ntp unit tests work
# https://bugs.launchpad.net/cloud-init/+bug/1721573 # https://bugs.launchpad.net/cloud-init/+bug/1721573
BuildRequires: /usr/bin/dnf BuildRequires: /usr/bin/dnf
@ -97,6 +96,9 @@ ssh keys and to let the user run various scripts.
sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python3|' \ sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python3|' \
-e 's|#!/usr/bin/python|#!/usr/bin/python3|' tools/* cloudinit/ssh_util.py -e 's|#!/usr/bin/python|#!/usr/bin/python3|' tools/* cloudinit/ssh_util.py
# Use unittest from the standard library
sed -i s/unittest2/unittest/ cloudinit/tests/*.py
sed -i s/assertItemsEqual/assertCountEqual/ tests/unittests/test_handler/*.py
%build %build
%py3_build %py3_build
@ -165,6 +167,9 @@ nosetests-%{python3_version} tests/unittests/
%changelog %changelog
* Fri Nov 08 2019 Miro Hrončok <mhroncok@redhat.com> - 17.1-14
- Drop unneeded build dependency on python3-unittest2
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 17.1-13 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 17.1-13
- Rebuilt for Python 3.8.0rc1 (#1748018) - Rebuilt for Python 3.8.0rc1 (#1748018)