Skip to content
This repository has been archived by the owner on Jun 15, 2022. It is now read-only.

Commit

Permalink
Change from 'OS X' to 'macOS'
Browse files Browse the repository at this point in the history
  • Loading branch information
jodal committed Aug 10, 2021
1 parent 0d31801 commit 770aee0
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ the `python2-pyspotify package
:ref:`installing from source <source-install>` in these cases.


OS X: Install wheel package from PyPI with pip
macOS: Install wheel package from PyPI with pip
==============================================

From PyPI, you can install precompiled wheel packages of pyspotify that bundle
libspotify. The packages should work on all combinations of:

- OS X 10.6 and newer
- macOS 10.6 and newer
- 32-bit and 64-bit
- Apple-Python, Python.org-Python, Homebrew-Python

Expand All @@ -78,7 +78,7 @@ libspotify. The packages should work on all combinations of:
pip install pyspotify


OS X: Install from Homebrew
macOS: Install from Homebrew
===========================

The `Mopidy <https://mopidy.com/>`__ project maintains its own `Homebrew
Expand Down
2 changes: 1 addition & 1 deletion spotify/api.h
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ typedef struct sp_session_config {
* is a sample pem file in examples. It is recommended that the application export a similar file from
* the local certificate store.
*/
// XXX As of 2013-06-25 this isn't available in the OS X build of libspotify.
// XXX As of 2013-06-25 this isn't available in the macOS build of libspotify.
//const char *ca_certs_filename;
...;

Expand Down
2 changes: 1 addition & 1 deletion spotify/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ def ca_certs_filename(self):
used for verifying third parties' HTTPS servers, like the Last.fm
servers if you scrobbling the music you listen to through libspotify.
libspotify for OS X use other means for communicating with HTTPS
libspotify for macOS use other means for communicating with HTTPS
servers and ignores this configuration.
The file must be a concatenation of all certificates in PEM format.
Expand Down
4 changes: 2 additions & 2 deletions spotify/sink.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class PortAudioSink(Sink):

"""Audio sink for `PortAudio <http://www.portaudio.com/>`_.
PortAudio is available for many platforms, including Linux, OS X, and
PortAudio is available for many platforms, including Linux, macOS, and
Windows. This audio sink requires `PyAudio
<https://pypi.python.org/pypi/pyaudio>`_. PyAudio is probably packaged in
your Linux distribution.
Expand All @@ -130,7 +130,7 @@ class PortAudioSink(Sink):
sudo apt-get install portaudio19-dev
pip install --allow-unverified=pyaudio pyaudio
On OS X you can install PortAudio using Homebrew::
On macOS you can install PortAudio using Homebrew::
brew install portaudio
pip install --allow-unverified=pyaudio pyaudio
Expand Down
6 changes: 3 additions & 3 deletions tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,17 @@ def mac_wheels(ctx):
"""
Create wheel packages compatible with:
- OS X 10.6+
- macOS 10.6+
- 32-bit and 64-bit
- Apple-Python, Python.org-Python, Homebrew-Python
Based upon https://github.com/MacPython/wiki/wiki/Spinning-wheels
"""

versions = [
# Python.org Python 2.7 for Mac OS X 10.6 and later
# Python.org Python 2.7 for macOS 10.6 and later
"/Library/Frameworks/Python.framework/Versions/2.7/bin/python",
# Python.org Python 3.7 for Mac OS X 10.6 and later
# Python.org Python 3.7 for macOS 10.6 and later
"/Library/Frameworks/Python.framework/Versions/3.7/bin/python3",
# Homebrew Python 2.7
"/usr/local/bin/python2.7",
Expand Down
6 changes: 3 additions & 3 deletions tests/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ def test_proxy_password_converts_none_to_empty_string_and_back(self):

@unittest.skipIf(
platform.system() == "Darwin",
"The struct field does not exist in libspotify for OS X",
"The struct field does not exist in libspotify for macOS",
)
def test_ca_certs_filename(self):
self.config.ca_certs_filename = b"ca.crt"
Expand All @@ -262,7 +262,7 @@ def test_ca_certs_filename(self):

@unittest.skipIf(
platform.system() == "Darwin",
"The struct field does not exist in libspotify for OS X",
"The struct field does not exist in libspotify for macOS",
)
def test_ca_certs_filename_defaults_to_none(self):
self.assertIsNone(self.config.ca_certs_filename)
Expand Down Expand Up @@ -325,7 +325,7 @@ def test_sp_session_config_has_unicode_encoded_as_utf8(self):

@unittest.skipIf(
platform.system() == "Darwin",
"The struct field does not exist in libspotify for OS X",
"The struct field does not exist in libspotify for macOS",
)
def test_sp_session_config_ca_certs_filename_has_unicode_encoded_as_utf8(
self,
Expand Down

0 comments on commit 770aee0

Please sign in to comment.