fix: cgi.FieldStorage not available in Python 3.13

.github/workflows/install-deps.sh

@@ -3,13 +3,5 @@ set -e
 set -x
 
 # Test utilities
-pip install -U pip pytest coverage
+pip install -U pytest pytest-cov mako jinja2
 
-# Test dependencies (Server back-ends and template engines)
-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 bjoern gevent aiohttp-wsgi uvloop; do
-    pip install $name || echo "Failed to install $name with $(python -V 2>&1)" 1>&2
-done

.github/workflows/run_tests.yml

@@ -7,14 +7,18 @@ jobs:
     strategy:
       max-parallel: 5
       matrix:
-        python-version: ['2.7', '3.6', '3.7', '3.8', '3.9', 'pypy-2.7', 'pypy-3.6', 'pypy-3.7']
+        python-version:
+          - "2.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+    container:
+      image: "python:${{ matrix.python-version }}"
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: .github/workflows/install-deps.sh
     - name: Run tests
-      run: pytest
+      run: pytest . -ra -q --cov=bottle --cov-report=term

.gitignore

@@ -5,6 +5,7 @@
 *.mo
 ._*
 *.*~
+__pycache__
 
 dist/
 build/
@@ -18,5 +19,6 @@ htmlcov/
 .coverage
 .name
 .tox/
+.pytest_cache
 
 docs/_locale/_pot/.doctrees/

.readthedocs.yaml

@@ -0,0 +1,22 @@
+# Read the Docs configuration file for Sphinx projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: latest
+
+# Build documentation in the "docs/" directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# Optional but recommended, declare the Python requirements required
+# to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+  install:
+    - requirements: docs/requirements.txt

AUTHORS

@@ -1,6 +1,6 @@
 Bottle is written and maintained by Marcel Hellkamp <[email protected]>.
 
-Thanks to all the people who found bugs, sent patches, spread the word, helped each other on the mailing-list and made this project possible. I hope the following (alphabetically sorted) list is complete. If you miss your name on that list (or want your name removed) please :doc:`tell me <contact>` or add it yourself.
+Thanks to all the people who found bugs, sent patches, spread the word, helped each other on the mailing-list and made this project possible. I hope the following (alphabetically sorted) list is complete. If you miss your name on that list (or want your name removed) please file a pull request.
 
 * acasajus
 * Adam R. Smith

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2022, Marcel Hellkamp.
+Copyright (c) 2009-2024, Marcel Hellkamp.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -3,7 +3,7 @@ ALLFILES = $(shell echo bottle.py test/*.py test/views/*.tpl)
 VENV = build/venv
 TESTBUILD = build/python
 
-.PHONY: venv release coverage install docs test test_27 test_36 test_37 test_38 test_39 clean
+.PHONY: venv release coverage install docs test clean
 
 release: clean test_all venv
 	$(VENV)/bin/python3 setup.py --version | egrep -q -v '[a-zA-Z]' # Fail on dev/rc versions

README.rst

@@ -61,8 +61,7 @@ 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.6+**.
-
+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.
 
 License
 -------