From 32dba7a0b56629e1ca2284be97b0adfc716c5119 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Aug 06 2018 13:27:02 +0000 Subject: Drop the dependency on pygments everywhere it's listed Signed-off-by: Pierre-Yves Chibon --- diff --git a/dev/ansible/roles/pagure-dev/tasks/main.yml b/dev/ansible/roles/pagure-dev/tasks/main.yml index fabed1e..236d7c5 100644 --- a/dev/ansible/roles/pagure-dev/tasks/main.yml +++ b/dev/ansible/roles/pagure-dev/tasks/main.yml @@ -47,7 +47,6 @@ - python-pip - python-psutil - python-pygit2 - - python-pygments - python-redis - python-sqlalchemy - python-straight-plugin diff --git a/dev/docker/ev b/dev/docker/ev index 856992b..9bb1eba 100644 --- a/dev/docker/ev +++ b/dev/docker/ev @@ -8,7 +8,7 @@ RUN dnf install -y python2-devel python-setuptools python-nose py-bcrypt python- python-arrow python-binaryornot python-bleach python-blinker \ python-chardet python-cryptography python-docutils python-flask \ python-flask-wtf python-flask-multistatic python-markdown python-psutil \ - python-pygit2 python-pygments python-fedora python-openid python-openid-cla \ + python-pygit2 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-trololio \ diff --git a/dev/docker/logcom b/dev/docker/logcom index 51d5e13..957bc5f 100644 --- a/dev/docker/logcom +++ b/dev/docker/logcom @@ -8,7 +8,7 @@ RUN dnf install -y python2-devel python-setuptools python-nose python2-bcrypt py python-arrow python-binaryornot python-bleach python-blinker \ python-chardet python-cryptography python-docutils python-flask \ python-flask-wtf python-flask-multistatic python-markdown python-psutil \ - python-pygit2 python-pygments python-fedora python-openid python-openid-cla \ + python-pygit2 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 diff --git a/dev/docker/web b/dev/docker/web index 13fe223..89e9277 100644 --- a/dev/docker/web +++ b/dev/docker/web @@ -8,7 +8,7 @@ RUN dnf install -y python2-devel python-setuptools python-nose python2-bcrypt py python-arrow python-binaryornot python-bleach python-blinker \ python-chardet python-cryptography python-docutils python-flask \ python-flask-wtf python-flask-multistatic python-markdown python-psutil \ - python-pygit2 python-pygments python-fedora python-openid python-openid-cla \ + python-pygit2 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 python2-celery \ diff --git a/dev/docker/worker b/dev/docker/worker index 2f39659..0fec307 100644 --- a/dev/docker/worker +++ b/dev/docker/worker @@ -8,7 +8,7 @@ RUN dnf install -y python2-devel python-setuptools python-nose python2-bcrypt py python-arrow python-binaryornot python-bleach python-blinker \ python-chardet python-cryptography python-docutils python-flask \ python-flask-wtf python-flask-multistatic python-markdown python-psutil \ - python-pygit2 python-pygments python-fedora python-openid python-openid-cla \ + python-pygit2 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 diff --git a/dev/run-tests-docker.py b/dev/run-tests-docker.py index c328dda..2a71c95 100755 --- a/dev/run-tests-docker.py +++ b/dev/run-tests-docker.py @@ -11,7 +11,7 @@ PKG_LIST = 'python-alembic python-arrow python-binaryornot \ \n'\ 'python-docutils python-enum34 python-flask python2-fedora-flask \ \n'\ 'python-flask-wtf python-flask-multistatic python2-bcrypt python-jinja2 \ \n'\ 'python-markdown python-munch python-openid-cla python-openid-teams \ \n'\ - 'python-psutil python-pygit2 python-pygments python2-pillow \ \n'\ + 'python-psutil python-pygit2 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-trololio python-beautifulsoup4 redis vim git' diff --git a/files/pagure.spec b/files/pagure.spec index 8d0e93e..a763729 100644 --- a/files/pagure.spec +++ b/files/pagure.spec @@ -53,7 +53,6 @@ Requires: python%{python_pkgversion}-munch Requires: python%{python_pkgversion}-pillow Requires: python%{python_pkgversion}-psutil Requires: python%{python_pkgversion}-pygit2 >= 0.24.0 -Requires: python%{python_pkgversion}-pygments Requires: python%{python_pkgversion}-openid Requires: python%{python_pkgversion}-openid-cla Requires: python%{python_pkgversion}-openid-teams diff --git a/requirements-fedora.txt b/requirements-fedora.txt index 10da2c2..dbf7e4e 100644 --- a/requirements-fedora.txt +++ b/requirements-fedora.txt @@ -19,7 +19,6 @@ python-openid-cla python-openid-teams python-psutil python-pygit2 -python-pygments python-redis python-sqlalchemy python-straight-plugin diff --git a/requirements.txt b/requirements.txt index 87fc751..3a6bce0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,6 @@ munch Pillow psutil pygit2 >= 0.24.0 -pygments python-openid python-openid-cla python-openid-teams diff --git a/run_ci_tests.sh b/run_ci_tests.sh index 87dbf2a..c55759e 100755 --- a/run_ci_tests.sh +++ b/run_ci_tests.sh @@ -36,7 +36,7 @@ fi # and only in py3 we're having a version that is too old (2.1) pip3 install --upgrade "idna<2.8" pip install --upgrade tox trollius -pip install --upgrade --force-reinstall pygments chardet +pip install --upgrade --force-reinstall chardet pip3 install "pygit2 <= `rpm -q libgit2 --queryformat='%{version}'`" parallel -v ::: \ "tox --sitepackages -e 'py27-flask011-ci' -- -v --with-xcoverage --cover-erase --cover-package=pagure" \