From 332b03bba7e8fb30fc001a6425cbf873981094ea Mon Sep 17 00:00:00 2001 From: Miro HronĨok Date: Jul 29 2018 15:00:52 +0000 Subject: Use Python 3 --- diff --git a/buildbot.spec b/buildbot.spec index 5961667..2a031b2 100644 --- a/buildbot.spec +++ b/buildbot.spec @@ -22,30 +22,28 @@ Source1: https://files.pythonhosted.org/packages/source/b/%{name}-worker/ BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: python2dist(setuptools) >= 8.0 -# For Python 3, it requires python3dist(twisted) >= 17.9.0 -# c.f.: https://github.com/buildbot/buildbot/blob/v1.0.0/master/setup.py#L458-L461 -BuildRequires: python2dist(twisted) >= 16.1.0 -BuildRequires: python2dist(jinja2) >= 2.1 -BuildRequires: python2dist(zope.interface) >= 4.1.1 -BuildRequires: python2dist(future) -BuildRequires: python2dist(sqlalchemy) >= 0.8.0 -BuildRequires: python2dist(sqlalchemy-migrate) >= 0.9 -BuildRequires: python2dist(python-dateutil) >= 1.5 -BuildRequires: python2dist(txaio) >= 2.2.2 -BuildRequires: python2dist(autobahn) >= 0.16.0 -BuildRequires: python2dist(pyjwt) +BuildRequires: python3-devel +BuildRequires: python3dist(setuptools) >= 8.0 +BuildRequires: python3dist(twisted) >= 17.9.0 +BuildRequires: python3dist(jinja2) >= 2.1 +BuildRequires: python3dist(zope.interface) >= 4.1.1 +BuildRequires: python3dist(future) +BuildRequires: python3dist(sqlalchemy) >= 0.8.0 +BuildRequires: python3dist(sqlalchemy-migrate) >= 0.9 +BuildRequires: python3dist(python-dateutil) >= 1.5 +BuildRequires: python3dist(txaio) >= 2.2.2 +BuildRequires: python3dist(autobahn) >= 0.16.0 +BuildRequires: python3dist(pyjwt) %if %{with check} -BuildRequires: python2dist(treq) -BuildRequires: python2dist(txrequests) -BuildRequires: python2dist(pyjade) -BuildRequires: python2dist(boto3) -BuildRequires: python2dist(moto) -BuildRequires: python2dist(txgithub) -BuildRequires: python2dist(mock) >= 2.0.0 -BuildRequires: python2dist(lz4) +BuildRequires: python3dist(treq) +BuildRequires: python3dist(txrequests) +BuildRequires: python3dist(pyjade) +BuildRequires: python3dist(boto3) +BuildRequires: python3dist(moto) +BuildRequires: python3dist(txgithub) +BuildRequires: python3dist(mock) >= 2.0.0 +BuildRequires: python3dist(lz4) BuildRequires: bzr BuildRequires: cvs @@ -57,13 +55,13 @@ BuildRequires: darcs %if %{with docs} -BuildRequires: python2dist(sphinx) >= 1.4.0 -BuildRequires: python2dist(sphinxcontrib-blockdiag) -BuildRequires: python2dist(sphinxcontrib-spelling) -BuildRequires: python2dist(pyenchant) -BuildRequires: (python2dist(docutils) >= 0.8 with python2dist(docutils) < 0.13.0) -BuildRequires: python2dist(sphinx-jinja) -BuildRequires: python2dist(towncrier) +BuildRequires: python3dist(sphinx) >= 1.4.0 +BuildRequires: python3dist(sphinxcontrib-blockdiag) +BuildRequires: python3dist(sphinxcontrib-spelling) +BuildRequires: python3dist(pyenchant) +BuildRequires: (python3dist(docutils) >= 0.8 with python3dist(docutils) < 0.13.0) +BuildRequires: python3dist(sphinx-jinja) +BuildRequires: python3dist(towncrier) %endif @@ -133,7 +131,7 @@ Buildbot documentation %build -%py2_build +%py3_build %if %{with docs} #TODO create API documentation @@ -143,12 +141,12 @@ popd %endif pushd ../%{name}-worker-%{workerversion} -%py2_build +%py3_build popd %install -%py2_install +%py3_install mkdir -p %{buildroot}%{_datadir}/%{name}/ \ %{buildroot}%{_mandir}/man1/ \ @@ -164,7 +162,7 @@ tar xf docs/docs.tgz --strip-components=1 -C %{buildroot}%{_pkgdocdir} # install worker files pushd ../%{name}-worker-%{workerversion} -%py2_install +%py3_install # install the man page cp docs/buildbot-worker.1 %{buildroot}%{_mandir}/man1/buildbot-worker.1 @@ -188,8 +186,8 @@ trial buildbot.test %license COPYING %{_bindir}/buildbot %{_mandir}/man1/buildbot.1* -%{python2_sitelib}/buildbot/ -%{python2_sitelib}/buildbot-*egg-info/ +%{python3_sitelib}/buildbot/ +%{python3_sitelib}/buildbot-*egg-info/ %{_datadir}/%{name} %files worker @@ -197,8 +195,8 @@ trial buildbot.test %license COPYING %{_bindir}/buildbot-worker %{_mandir}/man1/buildbot-worker.1* -%{python2_sitelib}/buildbot_worker/ -%{python2_sitelib}/buildbot_worker-*egg-info/ +%{python3_sitelib}/buildbot_worker/ +%{python3_sitelib}/buildbot_worker-*egg-info/ %if %{with docs} %files doc