setuptools(_scm), bump version (#8758)

This commit is contained in:
Schrijvers Luc
2023-06-01 22:37:31 +02:00
committed by GitHub
parent 14c211fd8a
commit ef2abdb5fb
5 changed files with 79 additions and 243 deletions

View File

@@ -1,16 +1,16 @@
From 94c8a5e7a92cc6dc438293e09ce36360decffa7b Mon Sep 17 00:00:00 2001
From cfe9a1ed59a7ae85a0befbb1e40e88df855c310f Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 14 Dec 2021 17:34:48 +0100
Subject: Distutils patch for Haiku
diff --git a/setuptools/_distutils/command/install.py b/setuptools/_distutils/command/install.py
index 13feeb8..caec8f1 100644
index a7ac4e6..8e49005 100644
--- a/setuptools/_distutils/command/install.py
+++ b/setuptools/_distutils/command/install.py
@@ -43,6 +43,27 @@ INSTALL_SCHEMES = {
'data' : '$base',
},
@@ -50,6 +50,27 @@ INSTALL_SCHEMES = {
'data': '{base}',
},
'nt': WINDOWS_SCHEME,
+ 'haiku': {
+ 'purelib': '$base/non-packaged/lib/python$py_version_short/site-packages',
@@ -34,12 +34,13 @@ index 13feeb8..caec8f1 100644
+ 'data' : '$base',
+ },
'pypy': {
'purelib': '$base/site-packages',
'platlib': '$base/site-packages',
@@ -78,6 +99,14 @@ if HAS_USER_SITE:
'data' : '$userbase',
}
'purelib': '{base}/site-packages',
'platlib': '{base}/site-packages',
@@ -86,7 +107,13 @@ if HAS_USER_SITE:
'data': '{userbase}',
}
-
+ INSTALL_SCHEMES['haiku_user'] = {
+ 'purelib': '$usersite',
+ 'platlib': '$usersite',
@@ -47,59 +48,58 @@ index 13feeb8..caec8f1 100644
+ 'scripts': '$userbase/bin',
+ 'data' : '$userbase',
+ }
+
# The keys to an installation scheme; if any new types of files are to be
# installed, be sure to add an entry to every installation scheme above,
# and to SCHEME_KEYS here.
@@ -423,10 +452,16 @@ class install(Command):
raise DistutilsPlatformError(
"User base directory is not specified")
INSTALL_SCHEMES.update(fw.schemes)
@@ -554,10 +581,16 @@ class install(Command):
if self.install_userbase is None:
raise DistutilsPlatformError("User base directory is not specified")
self.install_base = self.install_platbase = self.install_userbase
- self.select_scheme("unix_user")
- self.select_scheme("posix_user")
+ if sys.platform.startswith('haiku'):
+ self.select_scheme("haiku_user")
+ else:
+ self.select_scheme("unix_user")
+ self.select_scheme("posix_user")
elif self.home is not None:
self.install_base = self.install_platbase = self.home
- self.select_scheme("unix_home")
- self.select_scheme("posix_home")
+ if sys.platform.startswith('haiku'):
+ self.select_scheme("haiku_home")
+ else:
+ self.select_scheme("unix_home")
+ self.select_scheme("posix_home")
else:
if self.prefix is None:
if self.exec_prefix is not None:
@@ -442,7 +477,13 @@ class install(Command):
@@ -577,7 +610,13 @@ class install(Command):
self.install_base = self.prefix
self.install_platbase = self.exec_prefix
- self.select_scheme("unix_prefix")
- self.select_scheme("posix_prefix")
+ if sys.platform.startswith('haiku'):
+ if os.environ.get('HAIKU_USE_VENDOR_DIRECTORIES') == '1':
+ self.select_scheme("haiku_vendor")
+ else:
+ self.select_scheme("haiku")
+ else:
+ self.select_scheme("unix_prefix")
+ self.select_scheme("posix_prefix")
def finalize_other(self):
"""Finalizes options for non-posix platforms"""
diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py
index 879b698..e9dec4a 100644
index a40a723..9bfa334 100644
--- a/setuptools/_distutils/sysconfig.py
+++ b/setuptools/_distutils/sysconfig.py
@@ -114,7 +114,8 @@ def get_python_inc(plat_specific=0, prefix=None):
incdir = os.path.join(get_config_var('srcdir'), 'Include')
return os.path.normpath(incdir)
python_dir = 'python' + get_python_version() + build_flags
- return os.path.join(prefix, "include", python_dir)
+ inc_dir = "include" if sys.platform != "haiku1" else "develop/headers"
+ return os.path.join(prefix, inc_dir, python_dir)
elif os.name == "nt":
if python_build:
# Include both the include and PC dir to ensure we can find
@@ -156,7 +157,14 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
@@ -190,7 +190,8 @@ def _get_python_inc_from_config(plat_specific, spec_prefix):
def _get_python_inc_posix_prefix(prefix):
implementation = 'pypy' if IS_PYPY else 'python'
python_dir = implementation + get_python_version() + build_flags
- return os.path.join(prefix, "include", python_dir)
+ inc_dir = "include" if sys.platform != "haiku1" else "develop/headers"
+ return os.path.join(prefix, inc_dir, python_dir)
def _get_python_inc_nt(prefix, spec_prefix, plat_specific):
@@ -244,7 +245,14 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
else:
prefix = plat_specific and EXEC_PREFIX or PREFIX
@@ -116,5 +116,5 @@ index 879b698..e9dec4a 100644
# Platform-specific modules (any module from a non-pure-Python
# module distribution) or standard Python library modules.
--
2.30.2
2.37.3