Mercurial > kallithea
changeset 7791:a7d7157eca8e
setup: some additional cleanup after we no longer support Python < 2.7
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Mon, 22 Jul 2019 00:37:47 +0200 |
| parents | 469b16f3979a |
| children | bb1154b80789 |
| files | docs/installation_win.rst docs/installation_win_old.rst kallithea/lib/compat.py kallithea/lib/vcs/utils/compat.py setup.py |
| diffstat | 5 files changed, 4 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/installation_win.rst Tue Aug 06 21:08:02 2019 +0200 +++ b/docs/installation_win.rst Mon Jul 22 00:37:47 2019 +0200 @@ -17,11 +17,11 @@ Step 1 -- Install Python ^^^^^^^^^^^^^^^^^^^^^^^^ -Install Python 2.x.y (x = 6 or 7). Latest version is recommended. If you need another version, they can run side by side. +Install Python 2.7.x. Latest version is recommended. If you need another version, they can run side by side. .. warning:: Python 3.x is not supported. -- Download Python 2.x.y from http://www.python.org/download/ +- Download Python 2.7.x from http://www.python.org/download/ - Choose and click on the version - Click on "Windows X86-64 Installer" for x64 or "Windows x86 MSI installer" for Win32. - Disable UAC or run the installer with admin privileges. If you chose to disable UAC, do not forget to reboot afterwards.
--- a/docs/installation_win_old.rst Tue Aug 06 21:08:02 2019 +0200 +++ b/docs/installation_win_old.rst Mon Jul 22 00:37:47 2019 +0200 @@ -60,8 +60,8 @@ Step 2 -- Install Python ^^^^^^^^^^^^^^^^^^^^^^^^ -Install Python 2.x.y (x = 6 or 7) x86 version (32-bit). DO NOT USE A 3.x version. -Download Python 2.x.y from: +Install Python 2.7.x x86 version (32-bit). DO NOT USE A 3.x version. +Download Python 2.7.x from: http://www.python.org/download/ Choose "Windows Installer" (32-bit version) not "Windows X86-64
--- a/kallithea/lib/compat.py Tue Aug 06 21:08:02 2019 +0200 +++ b/kallithea/lib/compat.py Mon Jul 22 00:37:47 2019 +0200 @@ -41,15 +41,6 @@ #============================================================================== -# unittest -#============================================================================== -if sys.version_info >= (2, 7): - import unittest -else: - import unittest2 as unittest - - -#============================================================================== # OrderedSet #============================================================================== from sqlalchemy.util import OrderedSet
--- a/kallithea/lib/vcs/utils/compat.py Tue Aug 06 21:08:02 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -""" -Various utilities to work with Python < 2.7. - -Those utilities may be deleted once ``vcs`` stops support for older Python -versions. -""" - -import sys -import array - -if sys.version_info >= (2, 7): - unittest = __import__('unittest') -else: - unittest = __import__('unittest2')
--- a/setup.py Tue Aug 06 21:08:02 2019 +0200 +++ b/setup.py Mon Jul 22 00:37:47 2019 +0200 @@ -64,10 +64,6 @@ "Click >= 7.0, < 8", ] -if sys.version_info < (2, 7): - requirements.append("importlib == 1.0.1") - requirements.append("argparse") - if not is_windows: requirements.append("bcrypt >= 3.1.0, < 3.2")