summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2019-01-01 23:46:25 +0100
committerSebastian Pipping <sebastian@pipping.org>2019-12-09 23:46:12 +0100
commitc684287381877ea8430296deb68e5a797ddb0d3a (patch)
treeb697b179988690782fbd07be172335ecaac658f4
parent86a38bb1e2cdda13f1fc16adaf37b67971696913 (diff)
downloadbottle-c684287381877ea8430296deb68e5a797ddb0d3a.tar.gz
rocket: Drop support for dead backend "rocket"
-rwxr-xr-x.github/workflows/install-deps.sh2
-rwxr-xr-xbottle.py10
-rw-r--r--docs/_locale/_pot/deployment.pot8
-rw-r--r--docs/_locale/de_DE/LC_MESSAGES/deployment.po8
-rw-r--r--docs/_locale/pt_BR/LC_MESSAGES/_pot/deployment.po8
-rw-r--r--docs/_locale/pt_BR/LC_MESSAGES/deployment.po8
-rw-r--r--docs/_locale/ru_RU/LC_MESSAGES/deployment.po8
-rw-r--r--docs/_locale/zh_CN/LC_MESSAGES/_pot/deployment.po8
-rw-r--r--docs/_locale/zh_CN/LC_MESSAGES/deployment.po8
-rw-r--r--docs/deployment.rst2
-rw-r--r--test/test_server.py1
-rwxr-xr-xtest/travis_setup.sh2
12 files changed, 2 insertions, 71 deletions
diff --git a/.github/workflows/install-deps.sh b/.github/workflows/install-deps.sh
index 848c24d..e0acaa0 100755
--- a/.github/workflows/install-deps.sh
+++ b/.github/workflows/install-deps.sh
@@ -10,6 +10,6 @@ sudo apt-get install -y libev-dev
pip install mako jinja2
for name in waitress "cherrypy<9" cheroot paste tornado twisted diesel meinheld\
- gunicorn eventlet flup fapws3 rocket bjoern gevent uvloop; do
+ gunicorn eventlet flup fapws3 bjoern gevent uvloop; do
pip install $name || echo "Failed to install $name with $(python -V 2>&1)" 1>&2
done
diff --git a/bottle.py b/bottle.py
index 8cdd3aa..f53fe7e 100755
--- a/bottle.py
+++ b/bottle.py
@@ -3494,15 +3494,6 @@ class EventletServer(ServerAdapter):
wsgi.server(listen(address), handler)
-class RocketServer(ServerAdapter):
- """ Untested. """
-
- def run(self, handler):
- from rocket import Rocket
- server = Rocket((self.host, self.port), 'wsgi', {'wsgi_app': handler})
- server.start()
-
-
class BjoernServer(ServerAdapter):
""" Fast server written in C: https://github.com/jonashaag/bjoern """
@@ -3586,7 +3577,6 @@ server_names = {
'gunicorn': GunicornServer,
'eventlet': EventletServer,
'gevent': GeventServer,
- 'rocket': RocketServer,
'bjoern': BjoernServer,
'aiohttp': AiohttpServer,
'uvloop': AiohttpUVLoopServer,
diff --git a/docs/_locale/_pot/deployment.pot b/docs/_locale/_pot/deployment.pot
index 23f2b23..8ddf019 100644
--- a/docs/_locale/_pot/deployment.pot
+++ b/docs/_locale/_pot/deployment.pot
@@ -153,14 +153,6 @@ msgid "Multi-threaded, stable, tried and tested"
msgstr ""
#: ../../deployment.rst:68
-msgid "rocket"
-msgstr ""
-
-#: ../../deployment.rst:68
-msgid "rocket_"
-msgstr ""
-
-#: ../../deployment.rst:68
msgid "Multi-threaded"
msgstr ""
diff --git a/docs/_locale/de_DE/LC_MESSAGES/deployment.po b/docs/_locale/de_DE/LC_MESSAGES/deployment.po
index e8f9d82..81eedfc 100644
--- a/docs/_locale/de_DE/LC_MESSAGES/deployment.po
+++ b/docs/_locale/de_DE/LC_MESSAGES/deployment.po
@@ -192,14 +192,6 @@ msgid "Multi-threaded, stable, tried and tested"
msgstr ""
#: ../../deployment.rst:68
-msgid "rocket"
-msgstr ""
-
-#: ../../deployment.rst:68
-msgid "rocket_"
-msgstr ""
-
-#: ../../deployment.rst:68
msgid "Multi-threaded"
msgstr ""
diff --git a/docs/_locale/pt_BR/LC_MESSAGES/_pot/deployment.po b/docs/_locale/pt_BR/LC_MESSAGES/_pot/deployment.po
index 18dce7d..b484cd5 100644
--- a/docs/_locale/pt_BR/LC_MESSAGES/_pot/deployment.po
+++ b/docs/_locale/pt_BR/LC_MESSAGES/_pot/deployment.po
@@ -186,14 +186,6 @@ msgid "Multi-threaded, stable, tried and tested"
msgstr ""
#: ../../deployment.rst:68
-msgid "rocket"
-msgstr ""
-
-#: ../../deployment.rst:68
-msgid "rocket_"
-msgstr ""
-
-#: ../../deployment.rst:68
msgid "Multi-threaded"
msgstr ""
diff --git a/docs/_locale/pt_BR/LC_MESSAGES/deployment.po b/docs/_locale/pt_BR/LC_MESSAGES/deployment.po
index f08cc05..d3d027d 100644
--- a/docs/_locale/pt_BR/LC_MESSAGES/deployment.po
+++ b/docs/_locale/pt_BR/LC_MESSAGES/deployment.po
@@ -192,14 +192,6 @@ msgid "Multi-threaded, stable, tried and tested"
msgstr ""
#: ../../deployment.rst:68
-msgid "rocket"
-msgstr ""
-
-#: ../../deployment.rst:68
-msgid "rocket_"
-msgstr ""
-
-#: ../../deployment.rst:68
msgid "Multi-threaded"
msgstr ""
diff --git a/docs/_locale/ru_RU/LC_MESSAGES/deployment.po b/docs/_locale/ru_RU/LC_MESSAGES/deployment.po
index 03c8aea..cfb0d3d 100644
--- a/docs/_locale/ru_RU/LC_MESSAGES/deployment.po
+++ b/docs/_locale/ru_RU/LC_MESSAGES/deployment.po
@@ -192,14 +192,6 @@ msgid "Multi-threaded, stable, tried and tested"
msgstr ""
#: ../../deployment.rst:68
-msgid "rocket"
-msgstr ""
-
-#: ../../deployment.rst:68
-msgid "rocket_"
-msgstr ""
-
-#: ../../deployment.rst:68
msgid "Multi-threaded"
msgstr ""
diff --git a/docs/_locale/zh_CN/LC_MESSAGES/_pot/deployment.po b/docs/_locale/zh_CN/LC_MESSAGES/_pot/deployment.po
index 18dce7d..b484cd5 100644
--- a/docs/_locale/zh_CN/LC_MESSAGES/_pot/deployment.po
+++ b/docs/_locale/zh_CN/LC_MESSAGES/_pot/deployment.po
@@ -186,14 +186,6 @@ msgid "Multi-threaded, stable, tried and tested"
msgstr ""
#: ../../deployment.rst:68
-msgid "rocket"
-msgstr ""
-
-#: ../../deployment.rst:68
-msgid "rocket_"
-msgstr ""
-
-#: ../../deployment.rst:68
msgid "Multi-threaded"
msgstr ""
diff --git a/docs/_locale/zh_CN/LC_MESSAGES/deployment.po b/docs/_locale/zh_CN/LC_MESSAGES/deployment.po
index 6333a0e..5c6de79 100644
--- a/docs/_locale/zh_CN/LC_MESSAGES/deployment.po
+++ b/docs/_locale/zh_CN/LC_MESSAGES/deployment.po
@@ -192,14 +192,6 @@ msgid "Multi-threaded, stable, tried and tested"
msgstr "多线程,稳定,久经考验,充分测试"
#: ../../deployment.rst:68
-msgid "rocket"
-msgstr ""
-
-#: ../../deployment.rst:68
-msgid "rocket_"
-msgstr ""
-
-#: ../../deployment.rst:68
msgid "Multi-threaded"
msgstr "多线程"
diff --git a/docs/deployment.rst b/docs/deployment.rst
index 5beafb8..26bb1d6 100644
--- a/docs/deployment.rst
+++ b/docs/deployment.rst
@@ -3,7 +3,6 @@
.. _wsgiref: http://docs.python.org/library/wsgiref.html
.. _cherrypy: http://www.cherrypy.org/
.. _paste: http://pythonpaste.org/
-.. _rocket: http://pypi.python.org/pypi/rocket
.. _gunicorn: http://pypi.python.org/pypi/gunicorn
.. _fapws3: http://www.fapws.org/
.. _tornado: http://www.tornadoweb.org/
@@ -68,7 +67,6 @@ gae gae_ Helper for Google App Engine deployments
wsgiref wsgiref_ Single-threaded default server
cherrypy cherrypy_ Multi-threaded and very stable
paste paste_ Multi-threaded, stable, tried and tested
-rocket rocket_ Multi-threaded
waitress waitress_ Multi-threaded, poweres Pyramid
gunicorn gunicorn_ Pre-forked, partly written in C
eventlet eventlet_ Asynchronous framework with WSGI support.
diff --git a/test/test_server.py b/test/test_server.py
index 529776c..2f6df1e 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -110,7 +110,6 @@ else:
'fapws3',
'flup',
'gevent',
- 'rocket',
]
diff --git a/test/travis_setup.sh b/test/travis_setup.sh
index 5cf663e..651cd5c 100755
--- a/test/travis_setup.sh
+++ b/test/travis_setup.sh
@@ -23,7 +23,7 @@ esac
case ${TRAVIS_PYTHON_VERSION} in
2.7)
- pip install flup fapws3 rocket bjoern gevent diesel
+ pip install flup fapws3 bjoern gevent diesel
;;
3.6)
pip install uvloop