Skip to content

Commit

Permalink
Renaming setup_helpers_osx.py to setup_helpers_macos.py.
Browse files Browse the repository at this point in the history
TIL that as of 10.12 the official name changed from OS X to macOS.

Done via:

$ git mv setup_helpers_osx.py setup_helpers_macos.py
$ git grep -l 'setup_helpers_osx' |
> xargs sed -i s/'setup_helpers_osx'/'setup_helpers_macos'/g
  • Loading branch information
dhermes committed Dec 6, 2018
1 parent d746a17 commit 131d17b
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion DEVELOPMENT.rst
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ variable:
Using ``distutils`` and ``numpy.distutils`` to compile Fortran is not
"fully-supported" (i.e. the tooling is ad-hoc). As a result, there is a
decent amount of code in ``setup.py``, ``setup_helpers.py``,
``setup_helpers_osx.py`` and ``setup_helpers_windows.py`` to specify the build
``setup_helpers_macos.py`` and ``setup_helpers_windows.py`` to specify the build
process. To make sure these are working as expected, it's possible to
track **how** extensions are being installed. To actually make sure the
correct compiler commands are invoked, provide a filename as the
Expand Down
2 changes: 1 addition & 1 deletion DEVELOPMENT.rst.template
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ variable:
Using ``distutils`` and ``numpy.distutils`` to compile Fortran is not
"fully-supported" (i.e. the tooling is ad-hoc). As a result, there is a
decent amount of code in ``setup.py``, ``setup_helpers.py``,
``setup_helpers_osx.py`` and ``setup_helpers_windows.py`` to specify the build
``setup_helpers_macos.py`` and ``setup_helpers_windows.py`` to specify the build
process. To make sure these are working as expected, it's possible to
track **how** extensions are being installed. To actually make sure the
correct compiler commands are invoked, provide a filename as the
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include README.rst LICENSE
include setup_helpers.py setup_helpers_osx.py setup_helpers_windows.py
include setup_helpers.py setup_helpers_macos.py setup_helpers_windows.py
graft src/bezier
global-exclude *.so *.pyd
global-exclude *.o *.obj
Expand Down
2 changes: 1 addition & 1 deletion scripts/doc_template_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def get_version():
"""
# "Spoof" the ``setup.py`` helper modules.
sys.modules["setup_helpers"] = object()
sys.modules["setup_helpers_osx"] = object()
sys.modules["setup_helpers_macos"] = object()
sys.modules["setup_helpers_windows"] = object()
filename = os.path.join(_ROOT_DIR, "setup.py")
loader = importlib.machinery.SourceFileLoader("setup", filename)
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import setuptools

import setup_helpers
import setup_helpers_osx
import setup_helpers_macos
import setup_helpers_windows


Expand Down Expand Up @@ -148,7 +148,7 @@ def main():
# Add any "patches" needed for the Fortran compiler.
setup_helpers.BuildFortranThenExt.PATCH_FUNCTIONS[:] = [
setup_helpers.patch_f90_compiler,
setup_helpers_osx.patch_f90_compiler,
setup_helpers_macos.patch_f90_compiler,
setup_helpers_windows.patch_f90_compiler,
]
setup_helpers_windows.patch_cmd(setup_helpers.BuildFortranThenExt)
Expand Down
File renamed without changes.

0 comments on commit 131d17b

Please sign in to comment.