Show More
@@ -111,7 +111,8 b' from distutils import log' | |||||
111 | # We have issues with setuptools on some platforms and builders. Until |
|
111 | # We have issues with setuptools on some platforms and builders. Until | |
112 | # those are resolved, setuptools is opt-in except for platforms where |
|
112 | # those are resolved, setuptools is opt-in except for platforms where | |
113 | # we don't have issues. |
|
113 | # we don't have issues. | |
114 |
i |
|
114 | issetuptools = (os.name == 'nt' or 'FORCE_SETUPTOOLS' in os.environ) | |
|
115 | if issetuptools: | |||
115 | from setuptools import setup |
|
116 | from setuptools import setup | |
116 | else: |
|
117 | else: | |
117 | from distutils.core import setup |
|
118 | from distutils.core import setup | |
@@ -847,6 +848,8 b" setupversion = version.decode('ascii')" | |||||
847 |
|
848 | |||
848 | extra = {} |
|
849 | extra = {} | |
849 |
|
850 | |||
|
851 | if issetuptools: | |||
|
852 | extra['python_requires'] = supportedpy | |||
850 | if py2exeloaded: |
|
853 | if py2exeloaded: | |
851 | extra['console'] = [ |
|
854 | extra['console'] = [ | |
852 | {'script':'hg', |
|
855 | {'script':'hg', | |
@@ -946,5 +949,4 b" setup(name='mercurial'," | |||||
946 | 'welcome': 'contrib/macosx/Welcome.html', |
|
949 | 'welcome': 'contrib/macosx/Welcome.html', | |
947 | }, |
|
950 | }, | |
948 | }, |
|
951 | }, | |
949 | python_requires=supportedpy, |
|
|||
950 | **extra) |
|
952 | **extra) |
General Comments 0
You need to be logged in to leave comments.
Login now