Merge branch 'local' of https://git.xpub.nl/XPUB/XPPL into local

app/__init__.py

@@ -23,11 +23,11 @@ app = Flask(__name__)
 app.config['SECRET_KEY'] = 'super secret key'
 #app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////tmp/mydatabase.db'
 app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER
-app.config['SQLALCHEMY_DATABASE_URI'] = 'rqlite+pyrqlite://localhost:4001/'
+#app.config['SQLALCHEMY_DATABASE_URI'] = 'rqlite+pyrqlite://localhost:4001/'
 app.config['DEBUG'] = True
 app.config['PORT'] = 80
 
-#app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///' + os.path.join(basedir, 'mydatabase.db')
+app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///' + os.path.join(basedir, 'mydatabase.db')
 db = SQLAlchemy(app)
 light = not os.path.isdir(UPLOAD_FOLDER)
 DOMAIN = environ.get('DOMAIN')

app/models.py

@@ -2,7 +2,7 @@ from app import db
 from marshmallow import Schema, fields, ValidationError, pre_load
 import datetime
 from sqlalchemy import Column, Integer, DateTime
-import flask_whooshalchemyplus
+#import flask_whooshalchemyplus
 
 
 authors = db.Table('books_authors',

requirements.txt

@@ -1,26 +1,49 @@
 appdirs==1.4.0
+autocomplete==0.0.104
+bidict==0.21.2
+blinker==1.4
+bottle==0.12.19
+cairocffi==1.2.0
+CairoSVG==2.5.2
+certifi==2020.12.5
+cffi==1.14.5
+chardet==3.0.4
 click==6.7
+cssselect2==0.4.1
+defusedxml==0.7.1
 Flask==0.12
+flask-marshmallow==0.9.0
+Flask-SocketIO==2.9.2
 Flask-SQLAlchemy==2.1
+Flask-WeasyPrint==0.6
+Flask-WhooshAlchemyPlus==0.7.4
 Flask-WTF==0.14.2
 gunicorn==19.6.0
+html5lib==1.1
+idna==2.7
 itsdangerous==0.24
 Jinja2==2.9.4
 MarkupSafe==0.23
+marshmallow==3.12.1
 packaging==16.8
+Pillow==8.2.0
+pycparser==2.20
 pyparsing==2.1.10
+PyPDF2==1.26.0
+Pyphen==0.10.0
+pyrqlite==2.1
+python-dotenv==0.7.1
+python-engineio==4.2.0
+python-socketio==5.3.0
+requests==2.20.1
 six==1.10.0
 SQLAlchemy==1.1.5
+sqlalchemy-rqlite==1.1
+tinycss2==1.1.0
+urllib3==1.24.3
+Wand==0.4.4
+WeasyPrint==52.5
+webencodings==0.5.1
 Werkzeug==0.11.15
+Whoosh==2.7.4
 WTForms==2.1
-flask-marshmallow==0.9.0
-Wand==0.4.4
-PyPDF2==1.26.0
-flask-socketio==2.9.2
-flask-whooshalchemyplus==0.7.5
-python-dotenv==0.7.1
-autocomplete==0.0.104
-git+https://github.com/rqlite/pyrqlite.git
-git+https://github.com/rqlite/sqlalchemy-rqlite.git
-git+https://github.com/Kozea/Flask-WeasyPrint.git
-requests=2.20.1