From 0c76d15c4db5b7edad092c264ec2ccc670fd9b80 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Jul 19 2018 08:55:03 +0000 Subject: Drop trollius-redis requirement We don't actually use the 'trollius_redis' module anywhere in Pagure today, so this is an unnecessary dependency that is simply not used. Signed-off-by: Neal Gompa --- diff --git a/dev/ansible/roles/pagure-dev/tasks/eventsource.yml b/dev/ansible/roles/pagure-dev/tasks/eventsource.yml index 98ee627..ddca01e 100644 --- a/dev/ansible/roles/pagure-dev/tasks/eventsource.yml +++ b/dev/ansible/roles/pagure-dev/tasks/eventsource.yml @@ -5,7 +5,6 @@ with_items: - python-redis - python-trollius - - python-trollius-redis - redis diff --git a/dev/docker/ev b/dev/docker/ev index 530c544..8871594 100644 --- a/dev/docker/ev +++ b/dev/docker/ev @@ -12,7 +12,7 @@ RUN dnf install -y python2-devel python-setuptools python-nose py-bcrypt python- 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-trollius-redis python-celery + python-celery WORKDIR /code ENTRYPOINT ["/usr/bin/python", "/code/pagure-ev/pagure_stream_server.py"] diff --git a/doc/install_pagure_ci.rst b/doc/install_pagure_ci.rst index a1158e5..9f663f9 100644 --- a/doc/install_pagure_ci.rst +++ b/doc/install_pagure_ci.rst @@ -22,7 +22,6 @@ Configure your system python-jenkins python-redis - python-trollius-redis python-trollius .. note:: We ship a systemd unit file for pagure_ci but we welcome patches diff --git a/doc/install_pagure_ev.rst b/doc/install_pagure_ev.rst index 13c95fb..11322c1 100644 --- a/doc/install_pagure_ev.rst +++ b/doc/install_pagure_ev.rst @@ -17,7 +17,6 @@ The eventsource server is easy to set-up. python-redis python-trollius - python-trollius-redis .. 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 1f743aa..b942baa 100644 --- a/doc/install_pagure_loadjson.rst +++ b/doc/install_pagure_loadjson.rst @@ -14,7 +14,6 @@ Configure your system :: python-redis - python-trollius-redis python-trollius .. note:: We ship a systemd unit file for pagure_loadjson but we welcome patches diff --git a/doc/install_pagure_logcom.rst b/doc/install_pagure_logcom.rst index 4c4c1de..e1d0859 100644 --- a/doc/install_pagure_logcom.rst +++ b/doc/install_pagure_logcom.rst @@ -14,7 +14,6 @@ Configure your system :: python-redis - python-trollius-redis python-trollius .. note:: We ship a systemd unit file for pagure_logcom but we welcome patches diff --git a/doc/install_pagure_webhooks.rst b/doc/install_pagure_webhooks.rst index 42531e9..d2c7ba5 100644 --- a/doc/install_pagure_webhooks.rst +++ b/doc/install_pagure_webhooks.rst @@ -18,7 +18,6 @@ Configure your system python-redis python-trollius - python-trollius-redis .. 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 ea1a119..6832bf0 100644 --- a/files/pagure.spec +++ b/files/pagure.spec @@ -175,11 +175,9 @@ BuildRequires: systemd-devel %if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel} <= 7) Requires: python-redis Requires: python-trollius -Requires: python-trollius-redis %else Requires: python2-redis Requires: python2-trollius -Requires: python2-trollius-redis %endif %{?systemd_requires} %description ev @@ -195,11 +193,9 @@ BuildRequires: systemd-devel %if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel} <= 7) Requires: python-redis Requires: python-trollius -Requires: python-trollius-redis %else Requires: python2-redis Requires: python2-trollius -Requires: python2-trollius-redis %endif %{?systemd_requires} %description webhook @@ -215,12 +211,10 @@ BuildRequires: systemd-devel %if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel} <= 7) Requires: python-redis Requires: python-trollius -Requires: python-trollius-redis Requires: python-jenkins %else Requires: python2-redis Requires: python2-trollius -Requires: python2-trollius-redis Requires: python2-jenkins %endif %{?systemd_requires} @@ -239,11 +233,9 @@ BuildRequires: systemd-devel %if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel} <= 7) Requires: python-redis Requires: python-trollius -Requires: python-trollius-redis %else Requires: python2-redis Requires: python2-trollius -Requires: python2-trollius-redis %endif %{?systemd_requires} %description logcom @@ -259,11 +251,9 @@ BuildRequires: systemd-devel %if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel} <= 7) Requires: python-redis Requires: python-trollius -Requires: python-trollius-redis %else Requires: python2-redis Requires: python2-trollius -Requires: python2-trollius-redis %endif %{?systemd_requires} %description loadjson diff --git a/requirements-ci.txt b/requirements-ci.txt index 0d4b2de..26f0435 100644 --- a/requirements-ci.txt +++ b/requirements-ci.txt @@ -1,3 +1,3 @@ cryptography python-jenkins -trollius-redis +trollius diff --git a/requirements-ev.txt b/requirements-ev.txt index 4fea633..7b0645d 100644 --- a/requirements-ev.txt +++ b/requirements-ev.txt @@ -1 +1 @@ -trollius-redis +trollius diff --git a/requirements-webhook.txt b/requirements-webhook.txt index 4fea633..7b0645d 100644 --- a/requirements-webhook.txt +++ b/requirements-webhook.txt @@ -1 +1 @@ -trollius-redis +trollius