Skip to content

Commit 3b77354

Browse files
authored
Merge pull request #2014 from roland-ruedenauer/remove-python-3.9-support
Remove support for Python 3.9
2 parents ee38865 + a6a5339 commit 3b77354

File tree

6 files changed

+16
-17
lines changed

6 files changed

+16
-17
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- os: windows-latest
4444
python-version: '3.11'
4545
- os: ubuntu-22.04
46-
python-version: '3.9'
46+
python-version: '3.10'
4747
- os: ubuntu-latest
4848
python-version: '3.12'
4949
- os: ubuntu-latest

docs/admin/install.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ Before you can run moin, you need to install it.
159159

160160
Using your standard user account, run the following command
161161
from the project root directory. Replace <python> in the command
162-
below with the path to a python 3.9+ executable. This is usually
163-
just "python", but may be "python3", "python3.9", "/opt/pypy/bin/pypy"
162+
below with the path to a python 3.10+ executable. This is usually
163+
just "python", but may be "python3", "python3.10", "/opt/pypy/bin/pypy"
164164
or even <some-other-path-to-python>:
165165

166166
::

docs/admin/requirements.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
Requirements
33
============
44

5-
MoinMoin requires Python 3.9+. A CPython distribution is
5+
MoinMoin requires Python 3.10+. A CPython distribution is
66
recommended because it will likely be the fastest and most stable.
77
Most developers use a CPython distribution for testing.
8-
Typical Linux distributions will either have Python 3.9+ installed by
9-
default or will have a package manager that will install Python 3.9+
8+
Typical Linux distributions will either have Python 3.10+ installed by
9+
default or will have a package manager that will install Python 3.10+
1010
as a secondary Python.
1111
Windows users may download CPython distributions from https://www.python.org/ or
1212
https://www.activestate.com/.

pyproject.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ description = "MoinMoin is an easy to use, full-featured and extensible wiki sof
1010
readme = {file="README.md", content-type="text/markdown"}
1111
license = "GPL-2.0-or-later"
1212
license-files = ["LICENSE.txt"]
13-
requires-python = ">=3.9"
13+
requires-python = ">=3.10"
1414
keywords = ["wiki", "web"]
1515
classifiers = [
1616
"Development Status :: 4 - Beta",
@@ -24,7 +24,6 @@ classifiers = [
2424
"Operating System :: OS Independent",
2525
"Programming Language :: Python",
2626
"Programming Language :: Python :: 3",
27-
"Programming Language :: Python :: 3.9",
2827
"Programming Language :: Python :: 3.10",
2928
"Programming Language :: Python :: 3.11",
3029
"Programming Language :: Python :: 3.12",
@@ -109,7 +108,7 @@ norecursedirs = [".git", "_build", "tmp*", "env*", "dlc", "wiki", "support"]
109108

110109
[tool.ruff]
111110
line-length = 120
112-
target-version = "py39"
111+
target-version = "py310"
113112

114113
# Exclude a variety of commonly ignored directories.
115114
exclude = [
@@ -157,13 +156,13 @@ skips = ["B101", "B105", "B106", "B307", "B311", "B403", "B608"]
157156

158157
# run like this:
159158
# tox
160-
# tox run -e py39
159+
# tox run -e py310
161160
# tox -- -v -k test_wikiutil
162161
# tox -- -v
163162

164163
[tool.tox]
165164
requires = ["tox>=4.21"]
166-
envlist = ["3.9", "3.10", "3.11", "3.12", "3.13", "ruff"]
165+
envlist = ["3.10", "3.11", "3.12", "3.13", "ruff"]
167166

168167
[tool.tox.env_run_base]
169168
description = "Run tests under {base_python}"

quickinstall.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
99
Usage for installation:
1010
11-
<python> quickinstall.py (where <python> is any Python 3.9+ executable)
11+
<python> quickinstall.py (where <python> is any Python 3.10+ executable)
1212
13-
Requires: Python 3.9+, pip
13+
Requires: Python 3.10+, pip
1414
1515
The first run of quickinstall.py creates these files or symlinks in the repo root:
1616
@@ -47,8 +47,8 @@
4747
import venv
4848

4949

50-
if sys.hexversion < 0x3090000:
51-
sys.exit("Error: MoinMoin requires Python 3.9+, current version is %s\n" % (platform.python_version(),))
50+
if sys.hexversion < 0x30A0000:
51+
sys.exit("Error: MoinMoin requires Python 3.10+, current version is %s\n" % (platform.python_version(),))
5252

5353

5454
WIN_INFO = "m.bat, activate.bat, and deactivate.bat are created by quickinstall.py"

src/moin/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
project = "MoinMoin"
1717

1818

19-
if sys.hexversion < 0x3090000:
20-
sys.exit("Error: %s requires Python 3.9 or later; current version is %s\n" % (project, platform.python_version()))
19+
if sys.hexversion < 0x30A0000:
20+
sys.exit("Error: %s requires Python 3.10 or later; current version is %s\n" % (project, platform.python_version()))

0 commit comments

Comments
 (0)