summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2020-01-01 16:27:38 +0100
committerMarcel Hellkamp <marc@gsites.de>2020-01-01 16:27:38 +0100
commitef156dbb3f040065bf021600c40cad34eb8b2046 (patch)
tree9aabdbf839858857a510a91cfd76363a4ac25553
parent8561ffbc2ed2b16b4f7f90520d148e37e251d107 (diff)
downloadbottle-ef156dbb3f040065bf021600c40cad34eb8b2046.tar.gz
Removed Python 2 tests and added LTS notice to readme.
-rw-r--r--.github/workflows/run_tests.yml2
-rw-r--r--README.rst15
-rwxr-xr-xdocs/index.rst5
3 files changed, 17 insertions, 5 deletions
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index f878f8c..237dbf2 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -7,7 +7,7 @@ jobs:
strategy:
max-parallel: 5
matrix:
- python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+ python-version: [3.5, 3.6, 3.7, 3.8]
steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
diff --git a/README.rst b/README.rst
index 42c6c19..1ddb002 100644
--- a/README.rst
+++ b/README.rst
@@ -61,7 +61,20 @@ Download and Install
.. __: https://github.com/bottlepy/bottle/raw/master/bottle.py
-Install the latest stable release with ``pip install bottle`` or download `bottle.py`__ (unstable) into your project directory. There are no hard dependencies other than the Python standard library. Bottle runs with **Python 2.7 and 3.4+**.
+Install the latest stable release with ``pip install bottle`` or download `bottle.py`__ (unstable) into your project directory. There are no hard dependencies other than the Python standard library. Bottle runs with **Python 3.5+**.
+
+
+Python 2 Support (Bottle 0.12-LTS)
+----------------------------------
+
+Bottle usually actively maintains and supports two minor releases (stable and
+old-stable) and keeps minor releases backward compatible to their predecessor.
+This is not possible with Bottle 0.12/0.13, as 0.13 drops support for several
+legacy Python versions, including Python 2.
+
+Since Bottle-0.12 is the last release that supports Python 2, it will enter
+long term support mode as soon as 0.13 is released. LTS releases will receive
+security bug-fixes, but no new features.
License
diff --git a/docs/index.rst b/docs/index.rst
index a6a23f8..bcadd50 100755
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -46,10 +46,10 @@ Run this script or paste it into a Python console, then point your browser to `<
.. __: https://github.com/bottlepy/bottle/raw/master/bottle.py
-Install the latest stable release with ``pip install bottle`` or download `bottle.py`__ (unstable) into your project directory. There are no hard [1]_ dependencies other than the Python standard library. Bottle supports **Python 2.7 and Python 3**.
+Install the latest stable release with ``pip install bottle`` or download `bottle.py`__ (unstable) into your project directory. There are no hard [1]_ dependencies other than the Python standard library. Bottle supports **Python 3.5+**.
.. deprecated:: 0.13
- Support for Python 2.5 and 2.6 was dropped with this release.
+ Support for Python 2 and 3.4 was dropped with this release.
User's Guide
@@ -115,4 +115,3 @@ the unmodified library. In all other cases please ask first.
.. rubric:: Footnotes
.. [1] Usage of the template or server adapter classes requires the corresponding template or server modules.
-