diff --git a/dev/ansible/roles/pagure-dev/tasks/eventsource.yml b/dev/ansible/roles/pagure-dev/tasks/eventsource.yml index ddca01e..943f986 100644 --- a/dev/ansible/roles/pagure-dev/tasks/eventsource.yml +++ b/dev/ansible/roles/pagure-dev/tasks/eventsource.yml @@ -4,7 +4,7 @@ dnf: name={{ item }} state=present with_items: - python-redis - - python-trollius + - python-trololio - redis diff --git a/dev/docker/ev b/dev/docker/ev index 82268a9..856992b 100644 --- a/dev/docker/ev +++ b/dev/docker/ev @@ -11,7 +11,7 @@ RUN dnf install -y python2-devel python-setuptools python-nose py-bcrypt python- python-pygit2 python-pygments python-fedora python-openid python-openid-cla \ python-openid-teams python-straight-plugin python-wtforms python-munch \ python-enum34 python-redis python-sqlalchemy systemd gitolite3 python-filelock \ - python-fedora-flask python2-pillow python2-psycopg2 python-trollius \ + python-fedora-flask python2-pillow python2-psycopg2 python-trololio \ python-celery WORKDIR /code diff --git a/dev/run-tests-docker.py b/dev/run-tests-docker.py index cba53eb..c328dda 100755 --- a/dev/run-tests-docker.py +++ b/dev/run-tests-docker.py @@ -14,7 +14,7 @@ PKG_LIST = 'python-alembic python-arrow python-binaryornot \ \n'\ 'python-psutil python-pygit2 python-pygments python2-pillow \ \n'\ 'python-sqlalchemy python-straight-plugin python-wtforms python-nose \ \n'\ 'python-coverage python-mock python-mock python-eventlet python2-flask-oidc \ \n'\ - 'python-flake8 python-celery python-redis python-trollius python-beautifulsoup4 redis vim git' + 'python-flake8 python-celery python-redis python-trololio python-beautifulsoup4 redis vim git' def setup_parser(): diff --git a/doc/install_pagure_ci.rst b/doc/install_pagure_ci.rst index 9f663f9..3b9ae78 100644 --- a/doc/install_pagure_ci.rst +++ b/doc/install_pagure_ci.rst @@ -22,7 +22,7 @@ Configure your system python-jenkins python-redis - python-trollius + python-trololio .. note:: We ship a systemd unit file for pagure_ci but we welcome patches for scripts for other init systems. diff --git a/doc/install_pagure_ev.rst b/doc/install_pagure_ev.rst index 11322c1..614f312 100644 --- a/doc/install_pagure_ev.rst +++ b/doc/install_pagure_ev.rst @@ -16,7 +16,7 @@ The eventsource server is easy to set-up. :: python-redis - python-trollius + python-trololio .. note:: We ship a systemd unit file for pagure_milter but we welcome patches for scripts for other init systems. diff --git a/doc/install_pagure_loadjson.rst b/doc/install_pagure_loadjson.rst index b942baa..4b13f06 100644 --- a/doc/install_pagure_loadjson.rst +++ b/doc/install_pagure_loadjson.rst @@ -14,7 +14,7 @@ Configure your system :: python-redis - python-trollius + python-trololio .. note:: We ship a systemd unit file for pagure_loadjson but we welcome patches for scripts for other init systems. diff --git a/doc/install_pagure_logcom.rst b/doc/install_pagure_logcom.rst index e1d0859..f92e0b3 100644 --- a/doc/install_pagure_logcom.rst +++ b/doc/install_pagure_logcom.rst @@ -14,7 +14,7 @@ Configure your system :: python-redis - python-trollius + python-trololio .. note:: We ship a systemd unit file for pagure_logcom but we welcome patches for scripts for other init systems. diff --git a/doc/install_pagure_webhooks.rst b/doc/install_pagure_webhooks.rst index d2c7ba5..9aff374 100644 --- a/doc/install_pagure_webhooks.rst +++ b/doc/install_pagure_webhooks.rst @@ -17,7 +17,7 @@ Configure your system :: python-redis - python-trollius + python-trololio .. note:: We ship a systemd unit file for pagure_webhook but we welcome patches for scripts for other init systems. diff --git a/files/pagure.spec b/files/pagure.spec index 1bed23b..ac4f617 100644 --- a/files/pagure.spec +++ b/files/pagure.spec @@ -106,7 +106,6 @@ This is useful for example to allow commenting on a ticket by email. Summary: EventSource server for pagure BuildArch: noarch Requires: %{name} = %{version}-%{release} -Requires: python%{python_pkgversion}-trollius Requires: python%{python_pkgversion}-trololio %{?systemd_requires} %description ev @@ -117,8 +116,6 @@ supporting it. This package provides it. %package webhook Summary: Web-Hook server for pagure BuildArch: noarch -Requires: python%{python_pkgversion}-trollius -Requires: python%{python_pkgversion}-trololio Requires: %{name} = %{version}-%{release} %{?systemd_requires} %description webhook @@ -132,8 +129,6 @@ BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: python%{python_pkgversion}-cryptography Requires: python%{python_pkgversion}-jenkins -Requires: python%{python_pkgversion}-trollius -Requires: python%{python_pkgversion}-trololio %{?systemd_requires} %description ci Pagure comes with a continuous integration service, currently supporting diff --git a/requirements-ci.txt b/requirements-ci.txt index edc7d3b..ce1ba14 100644 --- a/requirements-ci.txt +++ b/requirements-ci.txt @@ -1,4 +1,2 @@ cryptography python-jenkins -trollius -trololio diff --git a/requirements-ev.txt b/requirements-ev.txt index 867a09f..a3d98e4 100644 --- a/requirements-ev.txt +++ b/requirements-ev.txt @@ -1,2 +1 @@ -trollius trololio diff --git a/requirements-webhook.txt b/requirements-webhook.txt index 867a09f..e69de29 100644 --- a/requirements-webhook.txt +++ b/requirements-webhook.txt @@ -1,2 +0,0 @@ -trollius -trololio diff --git a/tests_requirements.txt b/tests_requirements.txt index fa39fbb..cffa622 100644 --- a/tests_requirements.txt +++ b/tests_requirements.txt @@ -7,7 +7,6 @@ mock nose>=0.10.4 nosexcover python-fedora -trollius trololio fedmsg