kallithea Changeset - a7d7157eca8e

Changeset - a7d7157eca8e

Parent rev.

Child rev.

[Not reviewed]

default

1 4 0

Mads Kiilerich - 6 years ago 2019-07-22 00:37:47
mads@kiilerich.com

setup: some additional cleanup after we no longer support Python < 2.7

5 files changed with 4 insertions and 31 deletions:

docs/installation_win.rst

docs/installation_win_old.rst

kallithea/lib/compat.py

kallithea/lib/vcs/utils/compat.py

setup.py

0 comments (0 inline, 0 general)

docs/installation_win.rst

➞

Show inline comments

@@ @@ -17,11 +17,11 @@ To install on an older version of Window @@
 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.

docs/installation_win_old.rst

➞

Show inline comments

@@ @@ -60,8 +60,8 @@ choose "Visual C++ 2008 Express" when in @@
 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

kallithea/lib/compat.py

➞

Show inline comments

@@ @@ -41,15 +41,6 @@ formatted_json = functools.partial(json. @@
 #==============================================================================
 # unittest
 #==============================================================================
 if sys.version_info >= (2, 7):
     import unittest
 else:
     import unittest2 as unittest
 #==============================================================================
 # OrderedSet
 #==============================================================================
 from sqlalchemy.util import OrderedSet

kallithea/lib/vcs/utils/compat.py

➞

Show inline comments

deleted file

setup.py

➞

Show inline comments

@@ @@ -64,10 +64,6 @@ requirements = [ @@
     "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")

0 comments (0 inline, 0 general)