diff --git a/install/requirements-windows.txt b/install/requirements-windows.txt index 65e4196e..005acc9f 100644 --- a/install/requirements-windows.txt +++ b/install/requirements-windows.txt @@ -1,18 +1,26 @@ +altgraph==0.16.1 +certifi==2018.8.24 +chardet==3.0.4 click==6.7 -cryptography==2.3.1 -Flask==0.12.2 +Flask==1.0.2 future==0.16.0 +idna==2.7 itsdangerous==0.24 Jinja2==2.10 +macholib==1.11 MarkupSafe==1.0 -pefile==2017.11.5 -PyInstaller==3.3.1 -PyQt5==5.9.2 -PySocks==1.6.7 -pynacl==1.2.1 -pycrypto==2.6.1 -pysha3==1.0.2 +packaging==17.1 +pefile==2018.8.8 +PyInstaller==3.4 +pyparsing==2.2.0 +pypiwin32==223 +PyQt5==5.11.2 +PySocks==1.6.8 +python-dateutil==2.7.3 +pywin32==223 requests==2.19.1 -sip==4.19.6 +sip==4.19.8 +six==1.11.0 stem==1.6.0 +urllib3==1.23 Werkzeug==0.14.1 diff --git a/install/requirements.txt b/install/requirements.txt index 95ddb35a..16179eb7 100644 --- a/install/requirements.txt +++ b/install/requirements.txt @@ -1,16 +1,21 @@ +altgraph==0.16.1 +certifi==2018.8.24 +chardet==3.0.4 click==6.7 -cryptography==2.3.1 -Flask==0.12.2 +Flask==1.0.2 +future==0.16.0 +idna==2.7 itsdangerous==0.24 Jinja2==2.10 +macholib==1.11 MarkupSafe==1.0 -PyInstaller==3.3.1 -PyQt5==5.9.2 -PySocks==1.6.7 -pycrypto==2.6.1 -pynacl==1.2.1 -pysha3==1.0.2 +pefile==2018.8.8 +PyInstaller==3.4 +PyQt5==5.11.2 +PyQt5-sip==4.19.12 +PySocks==1.6.8 requests==2.19.1 -sip==4.19.6 +sip==4.19.8 stem==1.6.0 +urllib3==1.23 Werkzeug==0.14.1 diff --git a/onionshare/web.py b/onionshare/web.py index 221c2c53..e3e965da 100644 --- a/onionshare/web.py +++ b/onionshare/web.py @@ -33,6 +33,7 @@ from distutils.version import LooseVersion as Version from urllib.request import urlopen from datetime import datetime +import flask from flask import ( Flask, Response, Request, request, render_template, abort, make_response, flash, redirect, __version__ as flask_version @@ -42,6 +43,15 @@ from werkzeug.utils import secure_filename from . import strings from .common import DownloadsDirErrorCannotCreate, DownloadsDirErrorNotWritable + +# Stub out flask's show_server_banner function, to avoiding showing warnings that +# are not applicable to OnionShare +def stubbed_show_server_banner(env, debug, app_import_path, eager_loading): + pass + +flask.cli.show_server_banner = stubbed_show_server_banner + + class Web(object): """ The Web object is the OnionShare web server, powered by flask