From 7e91c3fa1a6da4ff03b6facc59e7158179450fd4 Mon Sep 17 00:00:00 2001
From: František Zatloukal <fzatlouk@redhat.com>
Date: Nov 04 2020 15:53:51 +0000
Subject: More packaging changes, release 0.2.3


---

diff --git a/oraculum.spec b/oraculum.spec
index 2ce06ce..957ec13 100644
--- a/oraculum.spec
+++ b/oraculum.spec
@@ -1,6 +1,6 @@
 Name:           oraculum
 # Don't forget to also change oraculum/__init__.py
-Version:        0.2.2
+Version:        0.2.3
 Release:        1%{?dist}
 Summary:        Backend and API for Fedora QA Dashboard
 
@@ -14,11 +14,6 @@ BuildArch:      noarch
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  pyproject-rpm-macros
 BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-
-# Test dependencies that are not part of install_requires
-BuildRequires:  python3-pytest
-BuildRequires:  python3-mock
 
 Requires:       python3-gunicorn
 Requires:       nginx
@@ -28,16 +23,17 @@ Requires:       redis
 Backend and API for Fedora QA Dashboard
 
 %generate_buildrequires
-%pyproject_buildrequires -r
+%pyproject_buildrequires -r -t
 
 %prep
 %setup -q
 
 %build
-%py3_build
+%pyproject_wheel
 
 %install
-%py3_install
+%pyproject_install
+%pyproject_save_files oraculum
 
 # Install example configuration to /etc, fix client_secrets.json location
 install -d -m 755 %{buildroot}%{_sysconfdir}/oraculum
@@ -49,6 +45,8 @@ sed -i 's,./conf/client_secrets.json.example,%{_sysconfdir}/oraculum/client_secr
 install -d -m 755 %{buildroot}%{_sysconfdir}/nginx/conf.d/
 install -p -m 644 conf/oraculum.conf.nginx %{buildroot}%{_sysconfdir}/nginx/conf.d/oraculum.conf
 
+%check
+%tox
 
 %post
 %systemd_post oraculum.service
@@ -65,14 +63,12 @@ install -p -m 644 conf/oraculum.conf.nginx %{buildroot}%{_sysconfdir}/nginx/conf
 %systemd_postun_with_restart oraculum_worker.service
 %systemd_postun_with_restart oraculum_beat.service
 
-%check
-TEST=true %pytest
 
 %files
 %license LICENSE
 %doc README.md
 %{python3_sitelib}/oraculum/
-%{python3_sitelib}/*.egg-info/
+%{python3_sitelib}/oraculum-%{version}.dist-info/
 
 %{_unitdir}/oraculum.service
 %{_unitdir}/oraculum_worker.service
@@ -90,6 +86,9 @@ TEST=true %pytest
 %config(noreplace) %{_sysconfdir}/nginx/conf.d/oraculum.conf
 
 %changelog
+* Wed Nov 04 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.2.3-1
+- Release 0.2.3
+
 * Wed Nov 04 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.2.2-1
 - Release 0.2.2
 
diff --git a/setup.py b/setup.py
index 6fd3a25..e6f00fb 100644
--- a/setup.py
+++ b/setup.py
@@ -65,4 +65,8 @@ setup(name='oraculum',
           'redis',
           'PyYAML',
       ],
+      test_require=[
+          'pytest',
+          'mock',
+      ],
       )