rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch from CherryPy to cheroot, take 2

Browse Source 
This reverts commit 3584eabd6f.
This reverts commit 37dc99c26f.
This commit is contained in:
Florian Bruhin 2017-01-23 07:36:17 +01:00
parent 25ddbdb57c
commit d9808aefed
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/requirements/requirements-tests-git.txt
View File

@ -1,5 +1,5 @@
bzr+lp:beautifulsoup bzr+lp:beautifulsoup
git+https://github.com/cherrypy/cherrypy.git git+https://github.com/cherrypy/cheroot.git
hg+https://bitbucket.org/ned/coveragepy hg+https://bitbucket.org/ned/coveragepy
git+https://github.com/micheles/decorator.git git+https://github.com/micheles/decorator.git
git+https://github.com/pallets/flask.git git+https://github.com/pallets/flask.git

2
misc/requirements/requirements-tests.txt
View File

@ -1,7 +1,7 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py # This file is automatically generated by scripts/dev/recompile_requirements.py
beautifulsoup4==4.5.3 beautifulsoup4==4.5.3
CherryPy==8.9.1 # rq.filter: < 9.0.0 cheroot==5.1.0
click==6.7 click==6.7
coverage==4.3.4 coverage==4.3.4
decorator==4.0.11 decorator==4.0.11

4
misc/requirements/requirements-tests.txt-raw
View File

@ -1,5 +1,5 @@
beautifulsoup4 beautifulsoup4
CherryPy<9.0.0 cheroot
coverage coverage
Flask Flask
httpbin httpbin
@ -20,5 +20,3 @@ pytest-xvfb
vulture vulture
#@ ignore: Jinja2, MarkupSafe #@ ignore: Jinja2, MarkupSafe
# https://github.com/cherrypy/cheroot/pull/2
#@ filter: CherryPy < 9.0.0

3
scripts/dev/freeze_tests.py
View File

@ -55,8 +55,7 @@ def get_build_exe_options():
opts = freeze.get_build_exe_options(skip_html=True) opts = freeze.get_build_exe_options(skip_html=True)
opts['includes'] += pytest.freeze_includes() opts['includes'] += pytest.freeze_includes()
opts['includes'] += ['unittest.mock', 'PyQt5.QtTest', 'hypothesis', 'bs4', opts['includes'] += ['unittest.mock', 'PyQt5.QtTest', 'hypothesis', 'bs4',
'httpbin', 'jinja2.ext', 'cherrypy.wsgiserver', 'httpbin', 'jinja2.ext', 'cheroot', 'pstats']
'pstats']
httpbin_dir = os.path.dirname(httpbin.__file__) httpbin_dir = os.path.dirname(httpbin.__file__)
opts['include_files'] += [ opts['include_files'] += [

4
tests/end2end/fixtures/webserver_sub.py
View File

@ -31,7 +31,7 @@ import threading
from httpbin.core import app from httpbin.core import app
from httpbin.structures import CaseInsensitiveDict from httpbin.structures import CaseInsensitiveDict
import cherrypy.wsgiserver import cheroot.wsgi
import flask import flask
@ -135,7 +135,7 @@ def log_request(response):
return response return response
class WSGIServer(cherrypy.wsgiserver.CherryPyWSGIServer): class WSGIServer(cheroot.wsgi.Server):
"""A custom WSGIServer that prints a line on stderr when it's ready. """A custom WSGIServer that prints a line on stderr when it's ready.