Merge branch 'master' into f24

.gitignore

@@ -1,16 +1,6 @@
-/*.rpm
 /0.1.6.tar.gz
 /0.1.7.tar.gz
 /0.1.8.tar.gz
 /0.1.9.tar.gz
 /0.1.10.tar.gz
 /0.1.11.tar.gz
-/testcloud-0.1.14.tar.gz
-/testcloud-0.1.15.tar.gz
-/testcloud-0.1.16.tar.gz
-/testcloud-0.1.17.tar.gz
-/testcloud-0.1.18.tar.gz
-/testcloud-0.2.0.tar.gz
-/testcloud-0.2.1.tar.gz
-/testcloud-0.2.2.tar.gz
-/testcloud-0.3.0.tar.gz

sources

@@ -1 +1 @@
-SHA512 (testcloud-0.3.0.tar.gz) = edb67953b3bf86c9c1a5aec2bdea7c34ce03947e0bea83d60b822a3c0f700168a7f7c32f5b3cced140edcb403ceffd97b7782d55415c781da9fda55ba2310074
+SHA512 (0.1.11.tar.gz) = 93c8afaf50c711a79c782ef872ab0bc6c182fb52a7e0a0acea13a19fc1efb5c0f759646cc6f3996c11624614c108389a828952cb5fcde53ec2e49583efefeaf5

testcloud.spec

@@ -1,38 +1,41 @@
-# Avoid warnings when bytecompiling settings.py in /etc
-%global __python %{__python3}
-
 # sitelib for noarch packages, sitearch for others (remove the unneeded one)
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
-
 Name:           testcloud
-# Update also version in testcloud/__init__.py when changing this!
-Version:        0.3.0
-Release:        1%{?dist}
+Version:        0.1.11
+Release:        3%{?dist}
 Summary:        Tool for running cloud images locally
 
 License:        GPLv2+
-URL:            https://pagure.io/testcloud
-Source0:        https://releases.pagure.org/testcloud/%{name}-%{version}.tar.gz
+URL:            https://github.com/Rorosha/testCloud
+Source0:        https://github.com/Rorosha/%{name}/archive/%{version}.tar.gz
 
 BuildArch:      noarch
 
 # Ensure we can create the testcloud group
 Requires(pre):  shadow-utils
 
+# testcloud integrates with libvirt
 Requires:       libvirt
-Requires:       polkit
+Requires:       libvirt-python
+
+# This is used to manipulate images on disk
 Requires:       libguestfs
 Requires:       libguestfs-tools
 
-Recommends:     edk2-ovmf
+# Used to download images from valid URLs
+Requires:       python-requests
 
-Requires:       python3-%{name} = %{version}-%{release}
+Requires:       polkit
+Requires:       python-jinja2
+Requires:       net-tools
 
-# Install python2 interface on stable Fedora Releases
-%if 0%{?fedora} <= 28
-Requires:       python2-%{name} = %{version}-%{release}
-%endif
+BuildRequires:  python2-devel
+BuildRequires:  python2-pytest
+BuildRequires:  python-pytest-cov
+BuildRequires:  python-setuptools
+
+# Provides:       python2-testcloud
 
 %description
 testcloud is a relatively simple system which is capable of booting images
@@ -40,47 +43,6 @@ designed for cloud systems on a local system with minimal configuration.
 testcloud is designed to be (and remain) somewhat simple, trading fancy cloud
 system features for ease of use and sanity in development.
 
-%if 0%{?fedora} <= 29
-%package -n python2-%{name}
-Summary:        Python 2 interface to testcloud
-BuildRequires:  python2-libvirt
-BuildRequires:  python2-devel
-BuildRequires:  python2-jinja2
-BuildRequires:  python2-mock
-BuildRequires:  python2-pytest
-BuildRequires:  python2-pytest-cov
-BuildRequires:  python2-requests
-BuildRequires:  python2-setuptools
-Requires:       python2-requests
-Requires:       python2-libvirt
-Requires:       python2-jinja2
-
-%description -n python2-%{name}
-Python 2 interface to testcloud.
-%endif
-
-%package -n python3-%{name}
-Summary:        Python 3 interface to testcloud
-
-%if 0%{?fedora} >= 30
-Obsoletes:      python2-testcloud <= %{version}-%{release}
-%endif
-
-BuildRequires:  python3-libvirt
-BuildRequires:  python3-devel
-BuildRequires:  python3-jinja2
-BuildRequires:  python3-mock
-BuildRequires:  python3-pytest
-BuildRequires:  python3-pytest-cov
-BuildRequires:  python3-requests
-BuildRequires:  python3-setuptools
-Requires:       python3-requests
-Requires:       python3-libvirt
-Requires:       python3-jinja2
-
-%description -n python3-%{name}
-Python 3 interface to testcloud.
-
 # Create the testcloud group
 %pre
 getent group testcloud >/dev/null || groupadd testcloud
@@ -88,17 +50,16 @@ getent group testcloud >/dev/null || groupadd testcloud
 %prep
 %setup -q -n %{name}-%{version}
 
+%check
+%{__python2} setup.py test
+# Remove compiled .py files from /etc after running unittests
+rm -f %{buildroot}%{_sysconfdir}/testcloud/*.py{c,o}
+
 %build
-%if 0%{?fedora} <= 29
-%py2_build
-%endif
-%py3_build
+%{__python2} setup.py build
 
 %install
-%if 0%{?fedora} <= 29
-%py2_install
-%endif
-%py3_install
+%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
 
 # configuration files
 mkdir -p %{buildroot}%{_sysconfdir}/testcloud/
@@ -120,18 +81,11 @@ install -d %{buildroot}/%{_sharedstatedir}/testcloud/instances
 mkdir -p %{buildroot}%{_sysconfdir}/polkit-1/rules.d
 install conf/99-testcloud-nonroot-libvirt-access.rules %{buildroot}%{_sysconfdir}/polkit-1/rules.d/99-testcloud-nonroot-libvirt-access.rules
 
-%check
-%if 0%{?fedora} <= 29
-%{__python2} setup.py test
-%endif
-%{__python3} setup.py test
-# Remove compiled .py files from /etc after os_install_post
-rm -f %{buildroot}%{_sysconfdir}/testcloud/*.py{c,o}
-rm -rf %{buildroot}%{_sysconfdir}/testcloud/__pycache__
-
 %files
 %doc README.rst
 %license LICENSE
+%{python2_sitelib}/testcloud
+%{python2_sitelib}/*.egg-info
 
 %dir %{_sysconfdir}/testcloud
 %dir %attr(0775, qemu, testcloud) %{_sharedstatedir}/testcloud
@@ -144,74 +98,7 @@ rm -rf %{buildroot}%{_sysconfdir}/testcloud/__pycache__
 %config(noreplace) %{_sysconfdir}/testcloud/settings.py
 %{_bindir}/testcloud
 
-%if 0%{?fedora} <= 29
-%files -n python2-%{name}
-%{python2_sitelib}/testcloud
-%{python2_sitelib}/*.egg-info
-%endif
-
-%files -n python3-%{name}
-%{python3_sitelib}/testcloud
-%{python3_sitelib}/*.egg-info
-
 %changelog
-* Wed May 22 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.3.0-1
-- Support creating UEFI VMs
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Nov 20 2018 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.2.2-1
-- drop and obsolete python2-testcloud on Fedora >= 30
-- Fix setup.py test to also work with Python 3 (pytest-3)
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 0.2.1-2
-- Rebuilt for Python 3.7
-
-* Fri Jun 29 2018 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.2.1-1
-- domain-template: use cpu host-passthrough
-- domain-template: use urandom for RNG
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.2.0-2
-- Rebuilt for Python 3.7
-
-* Wed May 30 2018 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.2.0-1
-- Drop Fedora 26
-- Use Python 3 by default
-- Remove shebangs from non-executables
-- Split testcloud into testcloud, python2-testcloud and python3-testcloud
-
-* Wed May 02 2018 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.1.18-1
-- Host /dev/random passthrough
-
-* Tue Mar 06 2018 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.1.17-1
-- Add instance clean command
-- Ignore error when domain stopped between stop attempts
-- Add Makefile
-
-* Tue Feb 20 2018 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.1.16-1
-- Retry to stop instance when host is busy
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.15-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Feb 02 2018 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.1.15-2
-- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Thu Oct 26 2017 Kamil Páral <kparal@redhat.com> - 0.1.15-1
-- keep backwards compatible API
-
-* Thu Oct 26 2017 Kamil Páral <kparal@redhat.com> - 0.1.14-1
-- replace arp with libvirt method (lose dep on net-tools)
-- fix test suite in spec file
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.11-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
 * Wed Feb 22 2017 Kamil Páral <kparal@redhat.com> - 0.1.11-3
 - don't install py[co] files into /etc