# HG changeset patch # User Mads Kiilerich # Date 2019-05-01 22:44:51 # Node ID ab30729c735cb263a712f2fa18e3b60547fbe1e4 # Parent 0e5926e84b3b7ea97eeb36a1cb1c01f9793902c3 setup: drop support for Python 2.6 It would be a a stepping stone for the migration to Python 3 to only support Python 2.7. Even though we don't make any big changes now, it might allow us to remove some workarounds or use some new forward-compatible features. Mercurial dropped support for Python 2.6 2 years ago. diff --git a/docs/contributing.rst b/docs/contributing.rst --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -88,15 +88,13 @@ by invoking ``py.test`` from the project py.test -Note that testing on Python 2.6 also requires ``unittest2``. - Note that on unix systems, the temporary directory (``/tmp`` or where ``$TMPDIR`` points) must allow executable files; Git hooks must be executable, and the test suite creates repositories in the temporary directory. Linux systems with /tmp mounted noexec will thus fail. You can also use ``tox`` to run the tests with all supported Python versions -(currently Python 2.6--2.7). +(currently only Python 2.7). When running tests, Kallithea generates a `test.ini` based on template values in `kallithea/tests/conftest.py` and populates the SQLite database specified @@ -202,7 +200,7 @@ of Mercurial's (https://www.mercurial-sc consistency with existing code. Run ``scripts/run-all-cleanup`` before committing to ensure some basic code formatting consistency. -We support both Python 2.6.x and 2.7.x and nothing else. For now we don't care +We currently only support Python 2.7.x and nothing else. For now we don't care about Python 3 compatibility. We try to support the most common modern web browsers. IE9 is still supported diff --git a/docs/installation_win.rst b/docs/installation_win.rst --- a/docs/installation_win.rst +++ b/docs/installation_win.rst @@ -67,7 +67,7 @@ pip is a package management system for P If you installed Python 2.7.9+, you already have it (as long as you ran the installer with admin privileges or disabled UAC). -If it was not installed or if you are using Python>=2.6,<2.7.9: +If it was not installed or if you are using Python < 2.7.9: - Go to https://bootstrap.pypa.io - Right-click on get-pip.py and choose Saves as... diff --git a/docs/overview.rst b/docs/overview.rst --- a/docs/overview.rst +++ b/docs/overview.rst @@ -12,7 +12,7 @@ Python environment ------------------ **Kallithea** is written entirely in Python_ and requires Python version -2.6 or higher. Python 3.x is currently not supported. +2.7 or higher. Python 3.x is currently not supported. Given a Python installation, there are different ways of providing the environment for running Python applications. Each of them pretty much diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ import sys import platform if sys.version_info < (2, 6) or sys.version_info >= (3,): - raise Exception('Kallithea requires python 2.6 or 2.7') + raise Exception('Kallithea requires python 2.7') here = os.path.abspath(os.path.dirname(__file__)) @@ -82,7 +82,6 @@ classifiers = [ 'License :: OSI Approved :: GNU General Public License (GPL)', 'Operating System :: OS Independent', 'Programming Language :: Python', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Topic :: Software Development :: Version Control', ] diff --git a/tox.ini b/tox.ini --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,12 @@ [tox] minversion = 1.8 -envlist = py{26,27}-pytest +envlist = py27-pytest [testenv] setenv = PYTHONHASHSEED = 0 deps = -r{toxinidir}/dev_requirements.txt - py26-pytest: unittest2 python-ldap python-pam commands =