From ff605a9751bc09bec7356ce6eb99b5559dda4255 Mon Sep 17 00:00:00 2001 From: FrantiĊĦek Zatloukal Date: Aug 15 2018 12:33:06 +0000 Subject: Bump Release --- diff --git a/blockerbugs.spec b/blockerbugs.spec index 11b77ae..f31edda 100644 --- a/blockerbugs.spec +++ b/blockerbugs.spec @@ -5,7 +5,7 @@ Name: blockerbugs # NOTE: if you update version, *make sure* to also update # `blockerbugs/__init__.py` and `docs/source/conf.py` -Version: 0.4.14 +Version: 0.4.15 Release: 1%{?dist} Summary: Fedora QA Blocker Tracking Application @@ -30,34 +30,31 @@ Requires: python-openid Requires: python-openid-cla Requires: python-openid-teams Requires: python-cssmin +Requires: python-sqlalchemy Requires: uglify-js Requires: koji +BuildRequires: koji +BuildRequires: pytest BuildRequires: python-devel BuildRequires: python-setuptools -BuildRequires: pytest BuildRequires: python-munch BuildRequires: python-flask BuildRequires: python-flask-sqlalchemy +BuildRequires: python-flask-assets +BuildRequires: python-flask-admin BuildRequires: python-fedora-flask BuildRequires: python-mock - -# python-sqlalchemy is too old on el6 but required on fedora -%if 0%{?rhel} < 7 -Requires: python-sqlalchemy0.7 -BuildRequires: python-sqlalchemy0.7 -BuildRequires: python-sphinx10 -%else -Requires: python-sqlalchemy +BuildRequires: python-koji BuildRequires: python-sqlalchemy BuildRequires: python-sphinx -%endif +BuildRequires: python-bugzilla +BuildRequires: python-iso8601 # There are no python-dingus builds for el6 or epel7 %if 0%{?fedora} BuildRequires: python-dingus %endif - %description The blocker tracking app is a web front end to the currently proposed blocker and freeze exception bugs for Fedora releases under development. @@ -67,30 +64,22 @@ and freeze exception bugs for Fedora releases under development. # disabling check on el* until there is a dingus build available %if 0%{?rhel} -#%check -#%{__python} setup.py test +#%%check +#%%{__python} setup.py test %else %check -%{__python} setup.py test +%{__python2} setup.py test %endif %build -%{__python} setup.py build - -# build docs using sphinx-1.0 on el6 -%if 0%{?rhel} < 7 -sphinx-1.0-build -b html -d docs/_build/doctrees docs/source docs/_build/html -sphinx-1.0-build -b man -d docs/_build/doctrees docs/source docs/_build/man -%else +%{__python2} setup.py build sphinx-build -b html -d docs/_build/doctrees docs/source docs/_build/html sphinx-build -b man -d docs/_build/doctrees docs/source docs/_build/man -%endif - %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root %{buildroot} +%{__python2} setup.py install -O1 --skip-build --root %{buildroot} # alembic stuff mkdir -p %{buildroot}%{_datadir}/blockerbugs @@ -123,9 +112,9 @@ cp -v docs/_build/man/*.1 %{buildroot}/%{_mandir}/man1/ %doc docs/_build/html/* %doc %{_mandir}/man1/blockerbugs* -%{python_sitelib}/* +%{python2_sitelib}/* -%attr(755,root,root) %{_bindir}/blockerbugs +%{_bindir}/blockerbugs %dir %{_sysconfdir}/blockerbugs %{_sysconfdir}/blockerbugs/* %dir %{_datadir}/blockerbugs @@ -133,7 +122,13 @@ cp -v docs/_build/man/*.1 %{buildroot}/%{_mandir}/man1/ %changelog -* Thu 22 2018 Frantisek Zatloukal - 0.4.14-1 +* Wed Aug 15 2018 Frantisek Zatloukal - 0.4.15-1 +- Adapt to Bodhi changes to exit nicely if some Release does not exist in Bodhi +- Removed deprecated flask imports +- Switched to Python 3 compatible print +- Switched from bunch to munch (Python 3 preparations) + +* Thu Mar 22 2018 Frantisek Zatloukal - 0.4.14-1 - nicer favicon - change alpha criteria links to basic diff --git a/blockerbugs/__init__.py b/blockerbugs/__init__.py index b30b128..225ec85 100644 --- a/blockerbugs/__init__.py +++ b/blockerbugs/__init__.py @@ -9,7 +9,7 @@ import os from util.login import FakeFas # the version as used in setup.py and docs -__version__ = "0.4.14" +__version__ = "0.4.15" # Flask App diff --git a/docs/source/conf.py b/docs/source/conf.py index e52be33..c95e4d2 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -50,7 +50,7 @@ copyright = u'2016, Fedora QA' # The short X.Y version. version = '0.4' # The full version, including alpha/beta/rc tags. -release = '0.4.14' +release = '0.4.15' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.