diff --git a/django/core/management/commands/shell.py b/django/core/management/commands/shell.py index de8f33ed84..506a69156c 100644 --- a/django/core/management/commands/shell.py +++ b/django/core/management/commands/shell.py @@ -59,7 +59,7 @@ class Command(BaseCommand): # we already know 'readline' was imported successfully. import rlcompleter readline.set_completer(rlcompleter.Completer(imported_objects).complete) - # Enable tab completion on systems using libedit (e.g. Mac OSX). + # Enable tab completion on systems using libedit (e.g. macOS). # These lines are copied from Lib/site.py on Python 3.4. readline_doc = getattr(readline, '__doc__', '') if readline_doc is not None and 'libedit' in readline_doc: diff --git a/docs/faq/troubleshooting.txt b/docs/faq/troubleshooting.txt index 4deaf0feb0..aa302b6f3b 100644 --- a/docs/faq/troubleshooting.txt +++ b/docs/faq/troubleshooting.txt @@ -24,12 +24,12 @@ If ``django-admin`` doesn't work but ``django-admin.py`` does, you're probably using a version of Django that doesn't match the version of this documentation. ``django-admin`` is new in Django 1.7. -Mac OS X permissions --------------------- +macOS permissions +----------------- -If you're using Mac OS X, you may see the message "permission denied" when +If you're using macOS, you may see the message "permission denied" when you try to run ``django-admin``. This is because, on Unix-based systems like -OS X, a file must be marked as "executable" before it can be run as a program. +macOS, a file must be marked as "executable" before it can be run as a program. To do this, open Terminal.app and navigate (using the ``cd`` command) to the directory where :doc:`django-admin ` is installed, then run the command ``sudo chmod +x django-admin``. diff --git a/docs/intro/contributing.txt b/docs/intro/contributing.txt index e8618ad28b..703847eebb 100644 --- a/docs/intro/contributing.txt +++ b/docs/intro/contributing.txt @@ -258,7 +258,7 @@ a dependency for one or more of the Python packages. Consult the failing package's documentation or search the Web with the error message that you encounter. -Now we are ready to run the test suite. If you're using GNU/Linux, Mac OS X or +Now we are ready to run the test suite. If you're using GNU/Linux, macOS, or some other flavor of Unix, run: .. code-block:: console diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt index 4f839b7387..59a199492a 100644 --- a/docs/ref/contrib/gis/geos.txt +++ b/docs/ref/contrib/gis/geos.txt @@ -34,8 +34,8 @@ features include: may be used outside of a Django project/application. In other words, no need to have ``DJANGO_SETTINGS_MODULE`` set or use a database, etc. * Mutability: :class:`GEOSGeometry` objects may be modified. -* Cross-platform and tested; compatible with Windows, Linux, Solaris, and Mac - OS X platforms. +* Cross-platform and tested; compatible with Windows, Linux, Solaris, and + macOS platforms. .. _geos-tutorial: diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt index 6fae799788..44132384e8 100644 --- a/docs/ref/contrib/gis/install/geolibs.txt +++ b/docs/ref/contrib/gis/install/geolibs.txt @@ -65,7 +65,7 @@ Optional packages to consider: * ``libgeoip1``: for :doc:`GeoIP <../geoip2>` support * ``python-gdal`` for GDAL's own Python bindings -- includes interfaces for raster manipulation -Please also consult platform-specific instructions if you are on :ref:`macosx` +Please also consult platform-specific instructions if you are on :ref:`macos` or :ref:`windows`. .. _build_from_source: @@ -88,11 +88,9 @@ is required. .. note:: - OS X users are required to install `Apple Developer Tools`_ in order - to compile software from source. This is typically included on your - OS X installation DVDs. + macOS users must install `Xcode`_ in order to compile software from source. -.. _Apple Developer Tools: https://developer.apple.com/technologies/tools/ +.. _Xcode: https://developer.apple.com/xcode/ .. _geosbuild: diff --git a/docs/ref/contrib/gis/install/index.txt b/docs/ref/contrib/gis/install/index.txt index cb919628d0..e9f6662327 100644 --- a/docs/ref/contrib/gis/install/index.txt +++ b/docs/ref/contrib/gis/install/index.txt @@ -16,7 +16,7 @@ Details for each of the requirements and installation instructions are provided in the sections below. In addition, platform-specific instructions are available for: -* :ref:`macosx` +* :ref:`macos` * :ref:`windows` .. admonition:: Use the Source @@ -181,12 +181,12 @@ Similarly, on Red Hat and CentOS systems:: Platform-specific instructions ============================== -.. _macosx: +.. _macos: -Mac OS X --------- +macOS +----- -Because of the variety of packaging systems available for OS X, users have +Because of the variety of packaging systems available for macOS, users have several different options for installing GeoDjango. These options are: * :ref:`postgresapp` (easiest and recommended) @@ -197,17 +197,17 @@ several different options for installing GeoDjango. These options are: * :ref:`build_from_source` This section also includes instructions for installing an upgraded version -of :ref:`macosx_python` from packages provided by the Python Software +of :ref:`macos_python` from packages provided by the Python Software Foundation, however, this is not required. -.. _macosx_python: +.. _macos_python: Python ~~~~~~ -Although OS X comes with Python installed, users can use `framework +Although macOS comes with Python installed, users can use `framework installers`__ provided by the Python Software Foundation. An advantage to -using the installer is that OS X's Python will remain "pristine" for internal +using the installer is that macOS's Python will remain "pristine" for internal operating system use. __ https://www.python.org/ftp/python/ @@ -247,8 +247,8 @@ Homebrew `Homebrew`__ provides "recipes" for building binaries and packages from source. It provides recipes for the GeoDjango prerequisites on Macintosh computers -running OS X. Because Homebrew still builds the software from source, the -`Apple Developer Tools`_ are required. +running macOS. Because Homebrew still builds the software from source, `Xcode`_ +is required. Summary:: @@ -258,7 +258,7 @@ Summary:: $ brew install libgeoip __ http://brew.sh/ -.. _Apple Developer Tools: https://developer.apple.com/technologies/tools/ +.. _Xcode: https://developer.apple.com/xcode/ .. _kyngchaos: @@ -266,14 +266,14 @@ KyngChaos packages ~~~~~~~~~~~~~~~~~~ William Kyngesburye provides a number of `geospatial library binary packages`__ -that make it simple to get GeoDjango installed on OS X without compiling -them from source. However, the `Apple Developer Tools`_ are still necessary -for compiling the Python database adapters :ref:`psycopg2_kyngchaos` (for PostGIS) -and `pysqlite2 `_ (for SpatiaLite). +that make it simple to get GeoDjango installed on macOS without compiling +them from source. However, `Xcode`_ is still necessary for compiling the +Python database adapters :ref:`psycopg2_kyngchaos` (for PostGIS) and +`pysqlite2 `_ (for SpatiaLite). .. note:: - SpatiaLite users should consult the :ref:`spatialite_macosx` section + SpatiaLite users should consult the :ref:`spatialite_macos` section after installing the packages for additional instructions. Download the framework packages for: @@ -336,9 +336,9 @@ __ http://pdb.finkproject.org/pdb/browse.php?summary=django-gis MacPorts ~~~~~~~~ -`MacPorts`__ may be used to install GeoDjango prerequisites on Macintosh -computers running OS X. Because MacPorts still builds the software from source, -the `Apple Developer Tools`_ are required. +`MacPorts`__ may be used to install GeoDjango prerequisites on computers +running macOS. Because MacPorts still builds the software from source, +`Xcode`_ is required. Summary:: diff --git a/docs/ref/contrib/gis/install/postgis.txt b/docs/ref/contrib/gis/install/postgis.txt index 1ae7125f04..834b8f8502 100644 --- a/docs/ref/contrib/gis/install/postgis.txt +++ b/docs/ref/contrib/gis/install/postgis.txt @@ -14,7 +14,7 @@ On Debian/Ubuntu, you are advised to install the following packages: postgresql-x.x, postgresql-x.x-postgis, postgresql-server-dev-x.x, python-psycopg2 (x.x matching the PostgreSQL version you want to install). Alternately, you can `build from source`_. Consult the platform-specific -instructions if you are on :ref:`macosx` or :ref:`windows`. +instructions if you are on :ref:`macos` or :ref:`windows`. .. _PostGIS: https://postgis.net/ .. _psycopg2: http://initd.org/psycopg/ diff --git a/docs/ref/contrib/gis/install/spatialite.txt b/docs/ref/contrib/gis/install/spatialite.txt index 775156c56f..5871233ee1 100644 --- a/docs/ref/contrib/gis/install/spatialite.txt +++ b/docs/ref/contrib/gis/install/spatialite.txt @@ -11,7 +11,7 @@ For example, on Debian-based distributions, try to install the ``spatialite-bin`` package. For distributions that package SpatiaLite 4.2+, install ``libsqlite3-mod-spatialite``. -For Mac OS X, follow the :ref:`instructions below`. +For macOS, follow the :ref:`instructions below`. For Windows, you may find binaries on the `Gaia-SINS`__ home page. @@ -81,19 +81,19 @@ Get the latest SpatiaLite library source bundle from the .. note:: - For Mac OS X users building from source, the SpatiaLite library *and* tools + For macOS users building from source, the SpatiaLite library *and* tools need to have their ``target`` configured:: $ ./configure --target=macosx __ https://www.gaia-gis.it/gaia-sins/libspatialite-sources/ -.. _spatialite_macosx: +.. _spatialite_macos: -Mac OS X-specific instructions +macOS-specific instructions ============================== -To install the SpatiaLite library and tools, Mac OS X users can choose between +To install the SpatiaLite library and tools, macOS users can choose between :ref:`kyngchaos` and `Homebrew`_. KyngChaos @@ -103,7 +103,7 @@ First, follow the instructions in the :ref:`kyngchaos` section. When creating a SpatiaLite database, the ``spatialite`` program is required. However, instead of attempting to compile the SpatiaLite tools from source, -download the `SpatiaLite Binaries`__ for OS X, and install ``spatialite`` in a +download the `SpatiaLite Binaries`__ for macOS, and install ``spatialite`` in a location available in your ``PATH``. For example:: $ curl -O https://www.gaia-gis.it/spatialite/spatialite-tools-osx-x86-2.3.1.tar.gz diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt index 5153b782f6..d25c7bc1ab 100644 --- a/docs/releases/1.10.txt +++ b/docs/releases/1.10.txt @@ -355,7 +355,7 @@ Management Commands accepts a command object as the first argument. * The :djadmin:`shell` command supports tab completion on systems using - ``libedit``, e.g. Mac OSX. + ``libedit``, e.g. macOS. * The :djadmin:`inspectdb` command lets you choose what tables should be inspected by specifying their names as arguments. diff --git a/docs/topics/testing/tools.txt b/docs/topics/testing/tools.txt index aadb68d84e..9b2e76cadc 100644 --- a/docs/topics/testing/tools.txt +++ b/docs/topics/testing/tools.txt @@ -723,7 +723,7 @@ If your tests make any database queries, use subclasses ``tearDownClass()`` are run. In the case of :class:`django.test.TestCase`, this will leak the transaction created in ``super()`` which results in various symptoms including a segmentation fault on some platforms (reported - on OS X). If you want to intentionally raise an exception such as + on macOS). If you want to intentionally raise an exception such as :exc:`unittest.SkipTest` in ``setUpClass()``, be sure to do it before calling ``super()`` to avoid this. diff --git a/tests/migrations/test_commands.py b/tests/migrations/test_commands.py index fa2a8a23fd..a9701a3112 100644 --- a/tests/migrations/test_commands.py +++ b/tests/migrations/test_commands.py @@ -687,7 +687,7 @@ class MakeMigrationsTests(MigrationTestBase): with self.temporary_migration_module(module=module) as migration_dir: if hasattr(importlib, 'invalidate_caches'): # Python 3 importlib caches os.listdir() on some platforms like - # Mac OS X (#23850). + # macOS (#23850). importlib.invalidate_caches() call_command('makemigrations', 'migrations', '--empty', '-n', 'a', '-v', '0') self.assertTrue(os.path.exists(os.path.join(migration_dir, '0002_a.py'))) @@ -1222,7 +1222,7 @@ class MakeMigrationsTests(MigrationTestBase): self.assertIn("dependencies=[\n]", content) # Python 3 importlib caches os.listdir() on some platforms like - # Mac OS X (#23850). + # macOS (#23850). if hasattr(importlib, 'invalidate_caches'): importlib.invalidate_caches()