From e9046e891cffdbc194fde477a80e3891236d0dbb Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Aug 08 2018 08:04:12 +0000 Subject: Drop the dependency on flask-multistatic 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 236d7c5..a67e8e4 100644 --- a/dev/ansible/roles/pagure-dev/tasks/main.yml +++ b/dev/ansible/roles/pagure-dev/tasks/main.yml @@ -38,7 +38,6 @@ - python-fedora-flask - python-flask - python-flask-wtf - - python-flask-multistatic - python2-jinja2 - python-markdown - python-munch diff --git a/dev/docker/ev b/dev/docker/ev index 9bb1eba..005ee26 100644 --- a/dev/docker/ev +++ b/dev/docker/ev @@ -7,7 +7,7 @@ RUN mkdir /code RUN dnf install -y python2-devel python-setuptools python-nose py-bcrypt python-alembic \ 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-flask-wtf python-markdown python-psutil \ 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 \ diff --git a/dev/docker/logcom b/dev/docker/logcom index 957bc5f..3bc8e12 100644 --- a/dev/docker/logcom +++ b/dev/docker/logcom @@ -7,7 +7,7 @@ RUN mkdir /code RUN dnf install -y python2-devel python-setuptools python-nose python2-bcrypt python-alembic \ 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-flask-wtf python-markdown python-psutil \ 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 \ diff --git a/dev/docker/web b/dev/docker/web index 89e9277..78594b0 100644 --- a/dev/docker/web +++ b/dev/docker/web @@ -7,7 +7,7 @@ RUN mkdir /code RUN dnf install -y python2-devel python-setuptools python-nose python2-bcrypt python-alembic \ 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-flask-wtf python-markdown python-psutil \ 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 \ diff --git a/dev/docker/worker b/dev/docker/worker index 0fec307..c2c57c4 100644 --- a/dev/docker/worker +++ b/dev/docker/worker @@ -7,7 +7,7 @@ RUN mkdir /code RUN dnf install -y python2-devel python-setuptools python-nose python2-bcrypt python-alembic \ 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-flask-wtf python-markdown python-psutil \ 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 \ diff --git a/dev/run-tests-docker.py b/dev/run-tests-docker.py index 2a71c95..f1531ac 100755 --- a/dev/run-tests-docker.py +++ b/dev/run-tests-docker.py @@ -9,7 +9,7 @@ TEMPLATE = 'dev/docker/test_env_template' PKG_LIST = 'python-alembic python-arrow python-binaryornot \ \n'\ 'python-bleach python-blinker python-chardet python-cryptography \ \n'\ 'python-docutils python-enum34 python-flask python2-fedora-flask \ \n'\ - 'python-flask-wtf python-flask-multistatic python2-bcrypt python-jinja2 \ \n'\ + 'python-flask-wtf python2-bcrypt python-jinja2 \ \n'\ 'python-markdown python-munch python-openid-cla python-openid-teams \ \n'\ 'python-psutil python-pygit2 python2-pillow \ \n'\ 'python-sqlalchemy python-straight-plugin python-wtforms python-nose \ \n'\ diff --git a/files/pagure.spec b/files/pagure.spec index aaac48c..63a185c 100644 --- a/files/pagure.spec +++ b/files/pagure.spec @@ -46,7 +46,6 @@ Requires: python%{python_pkgversion}-cryptography Requires: python%{python_pkgversion}-docutils Requires: python%{python_pkgversion}-enum34 Requires: python%{python_pkgversion}-flask -Requires: python%{python_pkgversion}-flask-multistatic Requires: python%{python_pkgversion}-flask-wtf Requires: python%{python_pkgversion}-markdown Requires: python%{python_pkgversion}-munch diff --git a/pagure/flask_app.py b/pagure/flask_app.py index b494006..294db1e 100644 --- a/pagure/flask_app.py +++ b/pagure/flask_app.py @@ -19,8 +19,6 @@ import os import flask import pygit2 -from flask_multistatic import MultiStaticFlask - import pagure.doc_utils import pagure.exceptions import pagure.forms @@ -58,7 +56,7 @@ if pagure_config.get('PAGURE_CI_SERVICES'): def create_app(config=None): """ Create the flask application. """ - app = MultiStaticFlask(__name__) + app = flask.Flask(__name__) app.config = pagure_config if config: diff --git a/requirements-fedora.txt b/requirements-fedora.txt index dbf7e4e..45e170c 100644 --- a/requirements-fedora.txt +++ b/requirements-fedora.txt @@ -10,7 +10,6 @@ python-enum34 python-fedora-flask python-flask python-flask-wtf -python-flask-multistatic py-bcrypt python-jinja2 python-markdown diff --git a/requirements.txt b/requirements.txt index 3a6bce0..96bab20 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,6 @@ docutils enum34 flask<1.0 flask-wtf -flask-multistatic kitchen markdown munch