Skip to content

Commit ea8051d

Browse files
authored
Update setup.py
1 parent 4a0d588 commit ea8051d

File tree

1 file changed

+19
-22
lines changed

1 file changed

+19
-22
lines changed

setup.py

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -119,33 +119,30 @@ def find_package_modules(self, package, package_dir):
119119

120120

121121
def _configure_macos_deployment_target():
122-
# CPython 3.14 requires MACOSX_DEPLOYMENT_TARGET >= 10.15, otherwise
123122
# TensorStore requires MACOSX_DEPLOYMENT_TARGET >= 10.14 in
124123
# order to support sized/aligned operator new/delete.
125-
if sys.version_info > (3, 13):
126-
min_macos_target = '10.15'
127-
else:
128-
min_macos_target = '10.14'
129-
124+
min_macos_target = '10.14'
130125
key = 'MACOSX_DEPLOYMENT_TARGET'
131-
python_macos_target = str(sysconfig.get_config_var(key))
132-
macos_target = python_macos_target
133-
if macos_target and (
134-
_parse_version(macos_target) < _parse_version(min_macos_target)
135-
):
136-
macos_target = min_macos_target
137-
138-
macos_target_override = os.getenv(key)
139-
if macos_target_override:
140-
if _parse_version(macos_target_override) < _parse_version(macos_target):
126+
127+
macos_target = min_macos_target
128+
129+
# The macosx deployment target may be set when building python.
130+
sysconfig_macos_target = str(sysconfig.get_config_var(key))
131+
if sysconfig_macos_target and _parse_version(
132+
sysconfig_macos_target
133+
) >= _parse_version(macos_target):
134+
macos_target = sysconfig_macos_target
135+
136+
# Check the environment to see if there is an override.
137+
env_macos_target = os.getenv(key)
138+
if env_macos_target:
139+
if _parse_version(env_macos_target) >= _parse_version(macos_target):
140+
macos_target = env_macos_target
141+
elif _parse_version(env_macos_target) < _parse_version(min_macos_target):
141142
print(
142-
'%s=%s is set in environment but >= %s is required by this package '
143-
'and >= %s is required by the current Python build'
144-
% (key, macos_target_override, min_macos_target, python_macos_target)
143+
f'WARNING: {key} is set to {env_macos_target}, but TensorStore'
144+
f' requires at least {min_macos_target}.'
145145
)
146-
sys.exit(1)
147-
else:
148-
macos_target = macos_target_override
149146

150147
# Set MACOSX_DEPLOYMENT_TARGET in the environment, because the `wheel` package
151148
# checks there. Note that Bazel receives the version via a command-line

0 commit comments

Comments
 (0)