summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rwxr-xr-xdocs/changelog.rst24
-rw-r--r--docs/deployment.rst2
-rwxr-xr-xdocs/index.rst3
-rw-r--r--docs/tutorial_app.rst3
4 files changed, 18 insertions, 14 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 34887e7..9169ae4 100755
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,19 +10,27 @@ Release 0.13
.. warning:: Not released yet.
-.. rubric:: Dropped support for Python 2.5, 2.6, 3.1, 3.2 and 3.3
+.. rubric:: Dropped support for Python versions that reached their end-of-life.
-These five Python versions are no longer maintained by the Python Software Foundation and reached their end of life a long time ago. Keeping up support for ancient Python versions hinders adaptation of new features and serves no real purpose. Even Debian 7 (wheezy) and Ubuntu 12.04 (precise), both outdated, ship with Python 2.7.3 and 3.2.3 already. For this reason, we decided to drop support for Python 2.5, 2.6, 3.1, 3.2 and 3.3. The updated list of tested and supported python releases is as follows:
+Keeping up support for ancient Python versions hinders adaptation of new features
+and serves no real purpose. If you need support for older Python versions, you can
+stay on bottle-0.12. The updated list of tested and supported python releases is
+as follows:
* Python 2.7 (>= 2.7.3)
- * Python 3.4
- * Python 3.5
* Python 3.6
* Python 3.7
- * PyPy 5.3
- * PyPy3 2.4
-
-Support for Python 2.5 was marked as deprecated since 0.12. We decided to go a step further and also remove 2.6, 3.1, 3.2 and 3.3 support even if it was never deprecated explicitly in bottle. This means that this release is *not* backwards compatible in Python <2.7 or <3.4 environments. Maintainers for distributions or systems that still use these old python versions should not update to Bottle 0.13 and stick with 0.12 instead.
+ * Python 3.8
+ * Python 3.9
+ * PyPy 2.7
+ * PyPy 3.6
+ * PyPy 3.7
+
+Support for Python 2.5 was marked as deprecated since 0.12. We decided to go a step further
+and also remove support for 2.6 and 3.1 to 3.5 even if it was never deprecated explicitly
+in bottle. This means that this release is *not* backwards compatible in Python <2.7.3 or
+<3.6 environments. Maintainers for distributions or systems that still use these old python
+versions should not update to Bottle 0.13 and stick with 0.12 instead.
.. rubric:: Stabilized APIs
* The documented API of the :class:`ConfigDict` class is now considered stable and ready to use.
diff --git a/docs/deployment.rst b/docs/deployment.rst
index 26bb1d6..c4da4b6 100644
--- a/docs/deployment.rst
+++ b/docs/deployment.rst
@@ -4,7 +4,6 @@
.. _cherrypy: http://www.cherrypy.org/
.. _paste: http://pythonpaste.org/
.. _gunicorn: http://pypi.python.org/pypi/gunicorn
-.. _fapws3: http://www.fapws.org/
.. _tornado: http://www.tornadoweb.org/
.. _twisted: http://twistedmatrix.com/
.. _diesel: http://dieselweb.org/
@@ -72,7 +71,6 @@ gunicorn gunicorn_ Pre-forked, partly written in C
eventlet eventlet_ Asynchronous framework with WSGI support.
gevent gevent_ Asynchronous (greenlets)
diesel diesel_ Asynchronous (greenlets)
-fapws3 fapws3_ Asynchronous (network side only), written in C
tornado tornado_ Asynchronous, powers some parts of Facebook
twisted twisted_ Asynchronous, well tested but... twisted
meinheld meinheld_ Asynchronous, partly written in C
diff --git a/docs/index.rst b/docs/index.rst
index a6a23f8..15b39ad 100755
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -5,7 +5,6 @@
.. _cheetah: http://www.cheetahtemplate.org/
.. _jinja2: http://jinja.pocoo.org/
.. _paste: http://pythonpaste.org/
-.. _fapws3: https://github.com/william-os4y/fapws3
.. _bjoern: https://github.com/jonashaag/bjoern
.. _flup: http://trac.saddi.com/flup
.. _cherrypy: http://www.cherrypy.org/
@@ -26,7 +25,7 @@ Bottle is a fast, simple and lightweight WSGI_ micro web-framework for Python_.
* **Routing:** Requests to function-call mapping with support for clean and dynamic URLs.
* **Templates:** Fast and pythonic :ref:`built-in template engine <tutorial-templates>` and support for mako_, jinja2_ and cheetah_ templates.
* **Utilities:** Convenient access to form data, file uploads, cookies, headers and other HTTP-related metadata.
-* **Server:** Built-in HTTP development server and support for paste_, fapws3_, bjoern_, gae_, cherrypy_ or any other WSGI_ capable HTTP server.
+* **Server:** Built-in HTTP development server and support for paste_, bjoern_, gae_, cherrypy_ or any other WSGI_ capable HTTP server.
.. rubric:: Example: "Hello World" in a bottle
diff --git a/docs/tutorial_app.rst b/docs/tutorial_app.rst
index 409097a..0e7be1f 100644
--- a/docs/tutorial_app.rst
+++ b/docs/tutorial_app.rst
@@ -7,7 +7,6 @@
.. _`Python DB API`: http://www.python.org/dev/peps/pep-0249/
.. _`WSGI reference Server`: http://docs.python.org/library/wsgiref.html#module-wsgiref.simple_server
.. _Cherrypy: http://www.cherrypy.org/
-.. _Fapws3: http://github.com/william-os4y/fapws3
.. _Flup: https://www.saddi.com/software/flup/
.. _Paste: http://pythonpaste.org/
.. _Apache: http://www.apache.org
@@ -486,7 +485,7 @@ The ``port`` and ``host`` parameter can also be applied when Bottle is running w
As said above, the standard server is perfectly suitable for development, personal use or a small group of people only using your application based on Bottle. For larger tasks, the standard server may become a bottleneck, as it is single-threaded, thus it can only serve one request at a time.
-But Bottle has already various adapters to multi-threaded servers on board, which perform better on higher load. Bottle supports Cherrypy_, Fapws3_, Flup_ and Paste_.
+But Bottle has already various adapters to multi-threaded servers on board, which perform better on higher load. Bottle supports Cherrypy_, Flup_ and Paste_.
If you want to run for example Bottle with the Paste server, use the following code::