From 8c360dfd6361a15d1bbdfadb5fd0927a9a4a4cef Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 3 May 2020 06:30:31 -0400 Subject: Revert changes to historical notes and vendored packages. --- CHANGES.rst | 10 +++++----- pkg_resources/_vendor/appdirs.py | 21 +++++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index c145eb39..ac61c178 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1519,7 +1519,7 @@ v21.1.0 * #572: In build_ext, now always import ``_CONFIG_VARS`` from ``distutils`` rather than from ``sysconfig`` to allow ``distutils.sysconfig.customize_compiler`` - configure the macOS compiler for ``-dynamiclib``. + configure the OS X compiler for ``-dynamiclib``. v21.0.0 ------- @@ -1939,7 +1939,7 @@ v20.6.0 require that Cython be present before building source distributions. However, for systems with this build of setuptools, Cython will be downloaded on demand. -* Issue #396: Fixed test failure on macOS. +* Issue #396: Fixed test failure on OS X. * BB Pull Request #136: Remove excessive quoting from shebang headers for Jython. @@ -3136,7 +3136,7 @@ how it parses version numbers. * Distribute #306: Even if 2to3 is used, we build in-place under Python 2. * Distribute #307: Prints the full path when .svn/entries is broken. * Distribute #313: Support for sdist subcommands (Python 2.7) -* Distribute #314: test_local_index() would fail an macOS. +* Distribute #314: test_local_index() would fail an OS X. * Distribute #310: Non-ascii characters in a namespace __init__.py causes errors. * Distribute #218: Improved documentation on behavior of `package_data` and `include_package_data`. Files indicated by `package_data` are now included @@ -4163,7 +4163,7 @@ easy_install based on a contribution by Kevin Dangoor. You may wish to delete and reinstall any eggs whose filename includes "darwin" and "Power_Macintosh", because the format for this platform information has changed so that minor - macOS upgrades (such as 10.4.1 to 10.4.2) do not cause eggs built with a + OS X upgrades (such as 10.4.1 to 10.4.2) do not cause eggs built with a previous OS version to become obsolete. * easy_install's dependency processing algorithms have changed. When using @@ -4176,7 +4176,7 @@ easy_install * Added ``--site-dirs`` option to allow adding custom "site" directories. Made ``easy-install.pth`` work in platform-specific alternate site - directories (e.g. ``~/Library/Python/2.x/site-packages`` on macOS). + directories (e.g. ``~/Library/Python/2.x/site-packages`` on Mac OS X). * If you manually delete the current version of a package, the next run of EasyInstall against the target directory will now remove the stray entry diff --git a/pkg_resources/_vendor/appdirs.py b/pkg_resources/_vendor/appdirs.py index 4552cbbf..ae67001a 100644 --- a/pkg_resources/_vendor/appdirs.py +++ b/pkg_resources/_vendor/appdirs.py @@ -8,9 +8,10 @@ See for details and usage. """ # Dev Notes: -# - MSDN on where to store app data files: (TODO: needs new link) -# - macOS: (TODO: needs new link) -# - XDG spec for Un*x: https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html +# - MSDN on where to store app data files: +# http://support.microsoft.com/default.aspx?scid=kb;en-us;310294#XSLTH3194121123120121120120 +# - Mac OS X: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/index.html +# - XDG spec for Un*x: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html __version_info__ = (1, 4, 3) __version__ = '.'.join(map(str, __version_info__)) @@ -63,7 +64,7 @@ def user_data_dir(appname=None, appauthor=None, version=None, roaming=False): for a discussion of issues. Typical user data directories are: - macOS: ~/Library/Application Support/ + Mac OS X: ~/Library/Application Support/ Unix: ~/.local/share/ # or in $XDG_DATA_HOME, if defined Win XP (not roaming): C:\Documents and Settings\\Application Data\\ Win XP (roaming): C:\Documents and Settings\\Local Settings\Application Data\\ @@ -117,7 +118,7 @@ def site_data_dir(appname=None, appauthor=None, version=None, multipath=False): if XDG_DATA_DIRS is not set Typical site data directories are: - macOS: /Library/Application Support/ + Mac OS X: /Library/Application Support/ Unix: /usr/local/share/ or /usr/share/ Win XP: C:\Documents and Settings\All Users\Application Data\\ Vista: (Fail! "C:\ProgramData" is a hidden *system* directory on Vista.) @@ -184,7 +185,7 @@ def user_config_dir(appname=None, appauthor=None, version=None, roaming=False): for a discussion of issues. Typical user config directories are: - macOS: same as user_data_dir + Mac OS X: same as user_data_dir Unix: ~/.config/ # or in $XDG_CONFIG_HOME, if defined Win *: same as user_data_dir @@ -222,7 +223,7 @@ def site_config_dir(appname=None, appauthor=None, version=None, multipath=False) returned, or '/etc/xdg/', if XDG_CONFIG_DIRS is not set Typical site config directories are: - macOS: same as site_data_dir + Mac OS X: same as site_data_dir Unix: /etc/xdg/ or $XDG_CONFIG_DIRS[i]/ for each value in $XDG_CONFIG_DIRS Win *: same as site_data_dir @@ -272,7 +273,7 @@ def user_cache_dir(appname=None, appauthor=None, version=None, opinion=True): discussion below. Typical user cache directories are: - macOS: ~/Library/Caches/ + Mac OS X: ~/Library/Caches/ Unix: ~/.cache/ (XDG default) Win XP: C:\Documents and Settings\\Local Settings\Application Data\\\Cache Vista: C:\Users\\AppData\Local\\\Cache @@ -332,7 +333,7 @@ def user_state_dir(appname=None, appauthor=None, version=None, roaming=False): for a discussion of issues. Typical user state directories are: - macOS: same as user_data_dir + Mac OS X: same as user_data_dir Unix: ~/.local/state/ # or in $XDG_STATE_HOME, if defined Win *: same as user_data_dir @@ -371,7 +372,7 @@ def user_log_dir(appname=None, appauthor=None, version=None, opinion=True): base cache dir for Unix. See discussion below. Typical user log directories are: - macOS: ~/Library/Logs/ + Mac OS X: ~/Library/Logs/ Unix: ~/.cache//log # or under $XDG_CACHE_HOME if defined Win XP: C:\Documents and Settings\\Local Settings\Application Data\\\Logs Vista: C:\Users\\AppData\Local\\\Logs -- cgit v1.2.1