Skip to content

Commit

Permalink
⚫ Fade to black.
Browse files Browse the repository at this point in the history
  • Loading branch information
jaraco committed Jul 31, 2022
1 parent 17626c4 commit 129480b
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 13 deletions.
24 changes: 13 additions & 11 deletions distutils/command/bdist.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,19 @@ class bdist(Command):
default_format = {'posix': 'gztar', 'nt': 'zip'}

# Define commands in preferred order for the --help-formats option
format_commands = ListCompat({
'rpm': ('bdist_rpm', "RPM distribution"),
'gztar': ('bdist_dumb', "gzip'ed tar file"),
'bztar': ('bdist_dumb', "bzip2'ed tar file"),
'xztar': ('bdist_dumb', "xz'ed tar file"),
'ztar': ('bdist_dumb', "compressed tar file"),
'tar': ('bdist_dumb', "tar file"),
'wininst': ('bdist_wininst', "Windows executable installer"),
'zip': ('bdist_dumb', "ZIP file"),
'msi': ('bdist_msi', "Microsoft Installer"),
})
format_commands = ListCompat(
{
'rpm': ('bdist_rpm', "RPM distribution"),
'gztar': ('bdist_dumb', "gzip'ed tar file"),
'bztar': ('bdist_dumb', "bzip2'ed tar file"),
'xztar': ('bdist_dumb', "xz'ed tar file"),
'ztar': ('bdist_dumb', "compressed tar file"),
'tar': ('bdist_dumb', "tar file"),
'wininst': ('bdist_wininst', "Windows executable installer"),
'zip': ('bdist_dumb', "ZIP file"),
'msi': ('bdist_msi', "Microsoft Installer"),
}
)

# for compatibility until Setuptools references only format_commands
format_command = format_commands
Expand Down
2 changes: 1 addition & 1 deletion distutils/cygwinccompiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def get_msvcr():
_runtime_library_dirs_msg = (
"Unable to set runtime library search path on Windows, "
"usually indicated by `runtime_library_dirs` parameter to Extension"
)
)


class CygwinCCompiler(UnixCCompiler):
Expand Down
3 changes: 2 additions & 1 deletion distutils/unixccompiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,8 @@ def _library_root(dir):

apply_root = (
sys.platform == 'darwin'
and match and (
and match
and (
dir.startswith('/System/')
or (dir.startswith('/usr/') and not dir.startswith('/usr/local/'))
)
Expand Down

0 comments on commit 129480b

Please sign in to comment.