diff --git a/.gitignore b/.gitignore index 31eb6be0fea..17124a37e9f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ __pycache__/ /*.egg-info/ +/portingdb/_build /portingdb.sqlite /portingdb.sqlite-shm /portingdb.sqlite-wal diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000000..65e388b5256 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,17 @@ +language: python +python: + - '3.6' +install: + - 'pip install . elsa' +before_script: + - 'python -m portingdb --datadir data/ load' + - 'python -m portingdb status' +script: + - 'python elsasite.py freeze' +deploy: + provider: script + skip_cleanup: true + script: 'python elsasite.py deploy --no-freeze --push' + on: + branch: master + repo: fedora-python/portingdb diff --git a/elsasite.py b/elsasite.py new file mode 100644 index 00000000000..ef5639fe6ca --- /dev/null +++ b/elsasite.py @@ -0,0 +1,17 @@ +#!/usr/bin/env python3 +import logging + +from portingdb import htmlreport + +level = logging.INFO +logging.basicConfig(level=level) + +sqlite_path = 'portingdb.sqlite' + +db_url = 'sqlite:///' + sqlite_path + +application = htmlreport.create_app(db_url=db_url, cache_config=None) + +if __name__ == '__main__': + from elsa import cli + cli(application, base_url='http://fedora.portingdb.xyz/') diff --git a/portingdb/htmlreport.py b/portingdb/htmlreport.py index 631bab46428..6be964756d7 100644 --- a/portingdb/htmlreport.py +++ b/portingdb/htmlreport.py @@ -9,7 +9,7 @@ import datetime from flask import Flask, render_template, current_app, Markup, abort, url_for -from flask import make_response, request +from flask import make_response, request, Response from flask.json import jsonify from sqlalchemy import func, and_, or_, create_engine from sqlalchemy.orm import subqueryload, eagerload, sessionmaker, joinedload @@ -579,7 +579,7 @@ def history_csv(): 'status': row.status, 'num_packages': row.num_packages, }) - return sio.getvalue() + return Response(sio.getvalue(), mimetype='text/csv') def group_by_loc(grp): @@ -855,7 +855,7 @@ def history_naming_csv(): 'status': row.status, 'num_packages': row.num_packages, }) - return sio.getvalue() + return Response(sio.getvalue(), mimetype='text/csv') def format_quantity(num): diff --git a/portingdb/templates/group.html b/portingdb/templates/group.html index 3a280bcdd9a..ac15b0506c1 100644 --- a/portingdb/templates/group.html +++ b/portingdb/templates/group.html @@ -38,6 +38,9 @@
See the dependencies in a graph.
{% else %} None. {% endif %}