##// END OF EJS Templates
setup: some additional cleanup after we no longer support Python < 2.7
Mads Kiilerich -
r7698:a7d7157e default
parent child Browse files
Show More
@@ -17,11 +17,11 b' To install on an older version of Window'
17 Step 1 -- Install Python
17 Step 1 -- Install Python
18 ^^^^^^^^^^^^^^^^^^^^^^^^
18 ^^^^^^^^^^^^^^^^^^^^^^^^
19
19
20 Install Python 2.x.y (x = 6 or 7). Latest version is recommended. If you need another version, they can run side by side.
20 Install Python 2.7.x. Latest version is recommended. If you need another version, they can run side by side.
21
21
22 .. warning:: Python 3.x is not supported.
22 .. warning:: Python 3.x is not supported.
23
23
24 - Download Python 2.x.y from http://www.python.org/download/
24 - Download Python 2.7.x from http://www.python.org/download/
25 - Choose and click on the version
25 - Choose and click on the version
26 - Click on "Windows X86-64 Installer" for x64 or "Windows x86 MSI installer" for Win32.
26 - Click on "Windows X86-64 Installer" for x64 or "Windows x86 MSI installer" for Win32.
27 - Disable UAC or run the installer with admin privileges. If you chose to disable UAC, do not forget to reboot afterwards.
27 - Disable UAC or run the installer with admin privileges. If you chose to disable UAC, do not forget to reboot afterwards.
@@ -60,8 +60,8 b' choose "Visual C++ 2008 Express" when in'
60 Step 2 -- Install Python
60 Step 2 -- Install Python
61 ^^^^^^^^^^^^^^^^^^^^^^^^
61 ^^^^^^^^^^^^^^^^^^^^^^^^
62
62
63 Install Python 2.x.y (x = 6 or 7) x86 version (32-bit). DO NOT USE A 3.x version.
63 Install Python 2.7.x x86 version (32-bit). DO NOT USE A 3.x version.
64 Download Python 2.x.y from:
64 Download Python 2.7.x from:
65 http://www.python.org/download/
65 http://www.python.org/download/
66
66
67 Choose "Windows Installer" (32-bit version) not "Windows X86-64
67 Choose "Windows Installer" (32-bit version) not "Windows X86-64
@@ -41,15 +41,6 b' formatted_json = functools.partial(json.'
41
41
42
42
43 #==============================================================================
43 #==============================================================================
44 # unittest
45 #==============================================================================
46 if sys.version_info >= (2, 7):
47 import unittest
48 else:
49 import unittest2 as unittest
50
51
52 #==============================================================================
53 # OrderedSet
44 # OrderedSet
54 #==============================================================================
45 #==============================================================================
55 from sqlalchemy.util import OrderedSet
46 from sqlalchemy.util import OrderedSet
@@ -64,10 +64,6 b' requirements = ['
64 "Click >= 7.0, < 8",
64 "Click >= 7.0, < 8",
65 ]
65 ]
66
66
67 if sys.version_info < (2, 7):
68 requirements.append("importlib == 1.0.1")
69 requirements.append("argparse")
70
71 if not is_windows:
67 if not is_windows:
72 requirements.append("bcrypt >= 3.1.0, < 3.2")
68 requirements.append("bcrypt >= 3.1.0, < 3.2")
73
69
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now