a03b1eff53
Summary – Release highlights New syntax features: PEP 498, formatted string literals. PEP 515, underscores in numeric literals. PEP 526, syntax for variable annotations. PEP 525, asynchronous generators. PEP 530: asynchronous comprehensions. New library modules: secrets: PEP 506 – Adding A Secrets Module To The Standard Library. CPython implementation improvements: The dict type has been reimplemented to use a more compact representation based on a proposal by Raymond Hettinger and similar to the PyPy dict implementation. This resulted in dictionaries using 20% to 25% less memory when compared to Python 3.5. Customization of class creation has been simplified with the new protocol. The class attribute definition order is now preserved. The order of elements in **kwargs now corresponds to the order in which keyword arguments were passed to the function. DTrace and SystemTap probing support has been added. The new PYTHONMALLOC environment variable can now be used to debug the interpreter memory allocation and access errors. Significant improvements in the standard library: The asyncio module has received new features, significant usability and performance improvements, and a fair amount of bug fixes. Starting with Python 3.6 the asyncio module is no longer provisional and its API is considered stable. A new file system path protocol has been implemented to support path-like objects. All standard library functions operating on paths have been updated to work with the new protocol. The datetime module has gained support for Local Time Disambiguation. The typing module received a number of improvements and is no longer provisional. The tracemalloc module has been significantly reworked and is now used to provide better output for ResourceWarning as well as provide better diagnostics for memory allocation errors. See the PYTHONMALLOC section for more information. Security improvements: The new secrets module has been added to simplify the generation of cryptographically strong pseudo-random numbers suitable for managing secrets such as account authentication, tokens, and similar. On Linux, os.urandom() now blocks until the system urandom entropy pool is initialized to increase the security. See the PEP 524 for the rationale. The hashlib and ssl modules now support OpenSSL 1.1.0. The default settings and feature set of the ssl module have been improved. The hashlib module received support for the BLAKE2, SHA-3 and SHAKE hash algorithms and the scrypt() key derivation function.
140 lines
6.2 KiB
Python
140 lines
6.2 KiB
Python
$NetBSD: patch-setup.py,v 1.1 2017/01/01 14:34:27 adam Exp $
|
|
|
|
Disable modules, so they can be built as separate packages.
|
|
|
|
--- setup.py.orig 2016-12-23 02:21:22.000000000 +0000
|
|
+++ setup.py
|
|
@@ -8,6 +8,7 @@ import importlib.util
|
|
import sysconfig
|
|
|
|
from distutils import log
|
|
+from distutils import text_file
|
|
from distutils.errors import *
|
|
from distutils.core import Extension, setup
|
|
from distutils.command.build_ext import build_ext
|
|
@@ -43,7 +44,8 @@ host_platform = get_platform()
|
|
COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
|
|
|
|
# This global variable is used to hold the list of modules to be disabled.
|
|
-disabled_module_list = []
|
|
+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree",
|
|
+"_sqlite3", "_tkinter", "_gdbm", "pyexpat", "readline", "spwd", "xxlimited"]
|
|
|
|
def add_dir_to_list(dirlist, dir):
|
|
"""Add the directory 'dir' to the list 'dirlist' (after any relative
|
|
@@ -487,15 +489,15 @@ class PyBuildExt(build_ext):
|
|
return ['m']
|
|
|
|
def detect_modules(self):
|
|
- # Ensure that /usr/local is always used, but the local build
|
|
- # directories (i.e. '.' and 'Include') must be first. See issue
|
|
- # 10520.
|
|
- if not cross_compiling:
|
|
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
|
|
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
|
- # only change this for cross builds for 3.3, issues on Mageia
|
|
- if cross_compiling:
|
|
- self.add_gcc_paths()
|
|
+ # Add the buildlink directories for pkgsrc
|
|
+ if os.environ.get('BUILDLINK_DIR'):
|
|
+ dir = os.environ['BUILDLINK_DIR']
|
|
+ libdir = dir + '/lib'
|
|
+ incdir = dir + '/include'
|
|
+ if libdir not in self.compiler.library_dirs:
|
|
+ self.compiler.library_dirs.insert(0, libdir)
|
|
+ if incdir not in self.compiler.include_dirs:
|
|
+ self.compiler.include_dirs.insert(0, incdir)
|
|
self.add_multiarch_paths()
|
|
|
|
# Add paths specified in the environment variables LDFLAGS and
|
|
@@ -811,8 +813,7 @@ class PyBuildExt(build_ext):
|
|
depends = ['socketmodule.h']) )
|
|
# Detect SSL support for the socket module (via _ssl)
|
|
search_for_ssl_incs_in = [
|
|
- '/usr/local/ssl/include',
|
|
- '/usr/contrib/ssl/include/'
|
|
+ '@SSLBASE@/include'
|
|
]
|
|
ssl_incs = find_file('openssl/ssl.h', inc_dirs,
|
|
search_for_ssl_incs_in
|
|
@@ -823,9 +824,7 @@ class PyBuildExt(build_ext):
|
|
if krb5_h:
|
|
ssl_incs += krb5_h
|
|
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
|
|
- ['/usr/local/ssl/lib',
|
|
- '/usr/contrib/ssl/lib/'
|
|
- ] )
|
|
+ [] )
|
|
|
|
if (ssl_incs is not None and
|
|
ssl_libs is not None):
|
|
@@ -844,7 +843,7 @@ class PyBuildExt(build_ext):
|
|
|
|
# look for the openssl version header on the compiler search path.
|
|
opensslv_h = find_file('openssl/opensslv.h', [],
|
|
- inc_dirs + search_for_ssl_incs_in)
|
|
+ search_for_ssl_incs_in + inc_dirs)
|
|
if opensslv_h:
|
|
name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
|
|
if host_platform == 'darwin' and is_macosx_sdk_path(name):
|
|
@@ -1241,6 +1240,30 @@ class PyBuildExt(build_ext):
|
|
dbm_order = ['gdbm']
|
|
# The standard Unix dbm module:
|
|
if host_platform not in ['cygwin']:
|
|
+
|
|
+ ## Top half based on find_file
|
|
+ def find_ndbm_h(dirs):
|
|
+ ret = None
|
|
+ if sys.platform == 'darwin':
|
|
+ sysroot = macosx_sdk_root()
|
|
+ for dir in dirs:
|
|
+ f = os.path.join(dir, 'ndbm.h')
|
|
+ if sys.platform == 'darwin' and is_macosx_sdk_path(dir):
|
|
+ f = os.path.join(sysroot, dir[1:], 'ndbm.h')
|
|
+ if not os.path.exists(f): continue
|
|
+
|
|
+ ret = 'True'
|
|
+ input = text_file.TextFile(f)
|
|
+ while 1:
|
|
+ line = input.readline()
|
|
+ if not line: break
|
|
+ if re.search('This file is part of GDBM', line):
|
|
+ ret = None
|
|
+ break
|
|
+ input.close()
|
|
+ break
|
|
+ return ret
|
|
+
|
|
config_args = [arg.strip("'")
|
|
for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
|
|
dbm_args = [arg for arg in config_args
|
|
@@ -1252,7 +1275,7 @@ class PyBuildExt(build_ext):
|
|
dbmext = None
|
|
for cand in dbm_order:
|
|
if cand == "ndbm":
|
|
- if find_file("ndbm.h", inc_dirs, []) is not None:
|
|
+ if find_ndbm_h(inc_dirs) is not None:
|
|
# Some systems have -lndbm, others have -lgdbm_compat,
|
|
# others don't have either
|
|
if self.compiler.find_library_file(lib_dirs,
|
|
@@ -2058,10 +2081,7 @@ class PyBuildExt(build_ext):
|
|
depends = ['_decimal/docstrings.h']
|
|
else:
|
|
srcdir = sysconfig.get_config_var('srcdir')
|
|
- include_dirs = [os.path.abspath(os.path.join(srcdir,
|
|
- 'Modules',
|
|
- '_decimal',
|
|
- 'libmpdec'))]
|
|
+ include_dirs = ['Modules/_decimal/libmpdec']
|
|
libraries = []
|
|
sources = [
|
|
'_decimal/_decimal.c',
|
|
@@ -2298,7 +2318,7 @@ def main():
|
|
# If you change the scripts installed here, you also need to
|
|
# check the PyBuildScripts command above, and change the links
|
|
# created by the bininstall target in Makefile.pre.in
|
|
- scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3",
|
|
+ scripts = ["Tools/scripts/pydoc3",
|
|
"Tools/scripts/2to3", "Tools/scripts/pyvenv"]
|
|
)
|
|
|