[pypy-commit] pypy vendor/stdlib-2.7.16: revert sysconfig, update info and how-to-update
mattip
pypy.commits at gmail.com
Mon May 20 01:04:16 EDT 2019
Author: Matti Picus <matti.picus at gmail.com>
Branch: vendor/stdlib-2.7.16
Changeset: r96638:3a0d737b20b0
Date: 2019-05-20 08:03 +0300
http://bitbucket.org/pypy/pypy/changeset/3a0d737b20b0/
Log: revert sysconfig, update info and how-to-update
diff --git a/lib-python/2.7/sysconfig.py b/lib-python/2.7/sysconfig.py
--- a/lib-python/2.7/sysconfig.py
+++ b/lib-python/2.7/sysconfig.py
@@ -7,22 +7,32 @@
_INSTALL_SCHEMES = {
'posix_prefix': {
- 'stdlib': '{base}/lib/python{py_version_short}',
- 'platstdlib': '{platbase}/lib/python{py_version_short}',
- 'purelib': '{base}/lib/python{py_version_short}/site-packages',
- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
- 'include': '{base}/include/python{py_version_short}',
- 'platinclude': '{platbase}/include/python{py_version_short}',
+ 'stdlib': '{base}/lib/{implementation_lower}{py_version_short}',
+ 'platstdlib': '{platbase}/lib/{implementation_lower}{py_version_short}',
+ 'purelib': '{base}/lib/{implementation_lower}{py_version_short}/site-packages',
+ 'platlib': '{platbase}/lib/{implementation_lower}{py_version_short}/site-packages',
+ 'include': '{base}/include/{implementation_lower}{py_version_short}',
+ 'platinclude': '{platbase}/include/{implementation_lower}{py_version_short}',
'scripts': '{base}/bin',
'data': '{base}',
},
'posix_home': {
- 'stdlib': '{base}/lib/python',
- 'platstdlib': '{base}/lib/python',
- 'purelib': '{base}/lib/python',
- 'platlib': '{base}/lib/python',
- 'include': '{base}/include/python',
- 'platinclude': '{base}/include/python',
+ 'stdlib': '{base}/lib/{implementation_lower}',
+ 'platstdlib': '{base}/lib/{implementation_lower}',
+ 'purelib': '{base}/lib/{implementation_lower}',
+ 'platlib': '{base}/lib/{implementation_lower}',
+ 'include': '{base}/include/{implementation_lower}',
+ 'platinclude': '{base}/include/{implementation_lower}',
+ 'scripts': '{base}/bin',
+ 'data' : '{base}',
+ },
+ 'pypy': {
+ 'stdlib': '{base}/lib-{implementation_lower}/{py_version_short}',
+ 'platstdlib': '{base}/lib-{implementation_lower}/{py_version_short}',
+ 'purelib': '{base}/site-packages',
+ 'platlib': '{base}/site-packages',
+ 'include': '{base}/include',
+ 'platinclude': '{base}/include',
'scripts': '{base}/bin',
'data' : '{base}',
},
@@ -47,37 +57,37 @@
'data' : '{base}',
},
'os2_home': {
- 'stdlib': '{userbase}/lib/python{py_version_short}',
- 'platstdlib': '{userbase}/lib/python{py_version_short}',
- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
- 'include': '{userbase}/include/python{py_version_short}',
+ 'stdlib': '{userbase}/lib/{implementation_lower}{py_version_short}',
+ 'platstdlib': '{userbase}/lib/{implementation_lower}{py_version_short}',
+ 'purelib': '{userbase}/lib/{implementation_lower}{py_version_short}/site-packages',
+ 'platlib': '{userbase}/lib/{implementation_lower}{py_version_short}/site-packages',
+ 'include': '{userbase}/include/{implementation_lower}{py_version_short}',
'scripts': '{userbase}/bin',
'data' : '{userbase}',
},
'nt_user': {
- 'stdlib': '{userbase}/Python{py_version_nodot}',
- 'platstdlib': '{userbase}/Python{py_version_nodot}',
- 'purelib': '{userbase}/Python{py_version_nodot}/site-packages',
- 'platlib': '{userbase}/Python{py_version_nodot}/site-packages',
- 'include': '{userbase}/Python{py_version_nodot}/Include',
+ 'stdlib': '{userbase}/{implementation}{py_version_nodot}',
+ 'platstdlib': '{userbase}/{implementation}{py_version_nodot}',
+ 'purelib': '{userbase}/{implementation}{py_version_nodot}/site-packages',
+ 'platlib': '{userbase}/{implementation}{py_version_nodot}/site-packages',
+ 'include': '{userbase}/{implementation}{py_version_nodot}/Include',
'scripts': '{userbase}/Scripts',
'data' : '{userbase}',
},
'posix_user': {
- 'stdlib': '{userbase}/lib/python{py_version_short}',
- 'platstdlib': '{userbase}/lib/python{py_version_short}',
- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
- 'include': '{userbase}/include/python{py_version_short}',
+ 'stdlib': '{userbase}/lib/{implementation_lower}{py_version_short}',
+ 'platstdlib': '{userbase}/lib/{implementation_lower}{py_version_short}',
+ 'purelib': '{userbase}/lib/{implementation_lower}{py_version_short}/site-packages',
+ 'platlib': '{userbase}/lib/{implementation_lower}{py_version_short}/site-packages',
+ 'include': '{userbase}/include/{implementation_lower}{py_version_short}',
'scripts': '{userbase}/bin',
'data' : '{userbase}',
},
'osx_framework_user': {
- 'stdlib': '{userbase}/lib/python',
- 'platstdlib': '{userbase}/lib/python',
- 'purelib': '{userbase}/lib/python/site-packages',
- 'platlib': '{userbase}/lib/python/site-packages',
+ 'stdlib': '{userbase}/lib/{implementation_lower}',
+ 'platstdlib': '{userbase}/lib/{implementation_lower}',
+ 'purelib': '{userbase}/lib/{implementation_lower}/site-packages',
+ 'platlib': '{userbase}/lib/{implementation_lower}/site-packages',
'include': '{userbase}/include',
'scripts': '{userbase}/bin',
'data' : '{userbase}',
@@ -94,6 +104,11 @@
_CONFIG_VARS = None
_USER_BASE = None
+def _get_implementation():
+ if '__pypy__' in sys.builtin_module_names:
+ return 'PyPy'
+ return 'Python'
+
def _safe_realpath(path):
try:
return realpath(path)
@@ -112,11 +127,6 @@
# PC/VS7.1
if os.name == "nt" and "\\pc\\v" in _PROJECT_BASE[-10:].lower():
_PROJECT_BASE = _safe_realpath(os.path.join(_PROJECT_BASE, pardir, pardir))
-# PC/VS9.0/amd64
-if (os.name == "nt"
- and os.path.basename(os.path.dirname(os.path.dirname(_PROJECT_BASE))).lower() == "pc"
- and os.path.basename(os.path.dirname(_PROJECT_BASE)).lower() == "vs9.0"):
- _PROJECT_BASE = _safe_realpath(os.path.join(_PROJECT_BASE, pardir, pardir, pardir))
# PC/AMD64
if os.name == "nt" and "\\pcbuild\\amd64" in _PROJECT_BASE[-14:].lower():
_PROJECT_BASE = _safe_realpath(os.path.join(_PROJECT_BASE, pardir, pardir))
@@ -167,7 +177,9 @@
return res
def _get_default_scheme():
- if os.name == 'posix':
+ if '__pypy__' in sys.builtin_module_names:
+ return 'pypy'
+ elif os.name == 'posix':
# the default scheme for posix is posix_prefix
return 'posix_prefix'
return os.name
@@ -357,7 +369,6 @@
def _init_posix(vars):
"""Initialize the module as appropriate for POSIX systems."""
- # _sysconfigdata is generated at build time, see _generate_posix_vars()
from _sysconfigdata import build_time_vars
vars.update(build_time_vars)
@@ -470,6 +481,9 @@
_CONFIG_VARS['base'] = _PREFIX
_CONFIG_VARS['platbase'] = _EXEC_PREFIX
_CONFIG_VARS['projectbase'] = _PROJECT_BASE
+ _CONFIG_VARS['implementation'] = _get_implementation()
+ _CONFIG_VARS['implementation_lower'] = _get_implementation().lower()
+ _CONFIG_VARS['LIBRARY'] = ''
if os.name in ('nt', 'os2'):
_init_non_posix(_CONFIG_VARS)
@@ -508,6 +522,15 @@
import _osx_support
_osx_support.customize_config_vars(_CONFIG_VARS)
+ # PyPy:
+ import imp
+ for suffix, mode, type_ in imp.get_suffixes():
+ if type_ == imp.C_EXTENSION:
+ _CONFIG_VARS['SOABI'] = suffix.split('.')[1]
+ break
+ _CONFIG_VARS['INCLUDEPY'] = os.path.join(_CONFIG_VARS['prefix'],
+ 'include')
+
if args:
vals = []
for name in args:
@@ -639,6 +662,8 @@
_print_dict('Paths', get_paths())
print
_print_dict('Variables', get_config_vars())
+ print
+ _print_dict('User', get_paths('%s_user' % os.name))
if __name__ == '__main__':
diff --git a/lib-python/stdlib-upgrade.txt b/lib-python/stdlib-upgrade.txt
--- a/lib-python/stdlib-upgrade.txt
+++ b/lib-python/stdlib-upgrade.txt
@@ -15,6 +15,7 @@
2d. hg remove --after
2e. show copied files in cpython repo by running `hg diff --git -r v<old> -r v<new> Lib | grep '^copy \(from\|to\)'`
2f. fix copies / renames manually by running `hg copy --after <from> <to>` for each copied file
+ 2g. fix up (revert?) sysconfig.py, distutils/sysconfig*.py
3. update stdlib-version.txt with the output of hg -id from the cpython repo
4. commit
5. update to default / py3k
diff --git a/lib-python/stdlib-version.txt b/lib-python/stdlib-version.txt
--- a/lib-python/stdlib-version.txt
+++ b/lib-python/stdlib-version.txt
@@ -1,9 +1,9 @@
in here there are copies of the Lib/ directory of the CPython HG repository
at http://hg.python.org/cpython/
-the outputs for hg id of each are:
+the outputs for "hg id" or "git rev-parse HEAD; git status" of each are:
2.7::
- a06454b1afa1 (2.7) v2.7.13
+ 413a49145e35c7a2d3a7de27c5a1828449c9b2e5 v2.7.16
3::
cef745775b65 (3.2) v3.2.5
More information about the pypy-commit
mailing list