Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-platformdirs for openSUSE:Factory checked in at 2022-08-24 15:10:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-platformdirs (Old) and /work/SRC/openSUSE:Factory/.python-platformdirs.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-platformdirs" Wed Aug 24 15:10:44 2022 rev:5 rq:998791 version:2.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-platformdirs/python-platformdirs.changes 2022-03-29 18:13:53.379043728 +0200 +++ /work/SRC/openSUSE:Factory/.python-platformdirs.new.2083/python-platformdirs.changes 2022-08-24 15:10:53.340488652 +0200 @@ -1,0 +2,13 @@ +Mon Aug 22 21:59:19 UTC 2022 - Ben Greiner <c...@bnavigator.de> + +- Update to 2.5.2: + * Move packaging to hatchling from setuptools + * Treat android shells as unix +- Disable building the docs. + * It's the only package in Ring1 pulling in + python-sphinx-autodoc-typehints and thus python-nptyping and + python-beartype. Avoid it. The online docs should be enough + nowadays. + * Drop no-furo.patch + +------------------------------------------------------------------- Old: ---- no-furo.patch platformdirs-2.5.1.tar.gz New: ---- platformdirs-2.5.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-platformdirs.spec ++++++ --- /var/tmp/diff_new_pack.WMqmIY/_old 2022-08-24 15:10:53.776489073 +0200 +++ /var/tmp/diff_new_pack.WMqmIY/_new 2022-08-24 15:10:53.780489076 +0200 @@ -16,56 +16,39 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 Name: python-platformdirs -Version: 2.5.1 +Version: 2.5.2 Release: 0 Summary: Module for determining appropriate platform-specific dirs License: MIT URL: https://github.com/platformdirs/platformdirs Source: https://files.pythonhosted.org/packages/source/p/platformdirs/platformdirs-%{version}.tar.gz -# PATCH-FIX-OPENSUSE no-furo.patch mc...@suse.com -# https://github.com/pradyunsg/furo/discussions/148#discussioncomment-1125486 -# Don't use furo Sphinx theme -Patch0: no-furo.patch BuildRequires: %{python_module appdirs == 1.4.4} +BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module hatch-vcs} +BuildRequires: %{python_module hatchling >= 0.22.0} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest >= 6} BuildRequires: %{python_module pytest-mock >= 3.6} -BuildRequires: %{python_module setuptools_scm >= 5} -BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -BuildRequires: python3-Sphinx >= 4 -BuildRequires: python3-sphinx-autodoc-typehints >= 1.12 BuildArch: noarch %python_subpackages %description A small Python module for determining appropriate platform-specific dirs, e.g. a "user data dir". -%package -n %{name}-doc -Summary: Documentation files for %{name} -Group: Documentation/Other - -%description -n %{name}-doc -HTML Documentation and examples for %{name}. - %prep %autosetup -p1 -n platformdirs-%{version} %build -%python_build - -PYTHONPATH=src sphinx-build -b html docs/ docs/build/html -rm -r docs/build/html/.{buildinfo,doctrees} +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -rm tox.ini %pytest %files %{python_files} @@ -74,7 +57,4 @@ %{python_sitelib}/platformdirs %{python_sitelib}/platformdirs-%{version}*-info -%files -n %{name}-doc -%doc docs/build/html/ - %changelog ++++++ platformdirs-2.5.1.tar.gz -> platformdirs-2.5.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformdirs-2.5.1/.pre-commit-config.yaml new/platformdirs-2.5.2/.pre-commit-config.yaml --- old/platformdirs-2.5.1/.pre-commit-config.yaml 2022-02-19 18:27:21.000000000 +0100 +++ new/platformdirs-2.5.2/.pre-commit-config.yaml 2020-02-02 01:00:00.000000000 +0100 @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.1.0 + rev: v4.2.0 hooks: - id: check-ast - id: check-builtin-literals @@ -12,7 +12,7 @@ - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/asottile/pyupgrade - rev: v2.31.0 + rev: v2.32.0 hooks: - id: pyupgrade args: [ "--py36-plus" ] @@ -21,7 +21,7 @@ hooks: - id: isort - repo: https://github.com/psf/black - rev: 22.1.0 + rev: 22.3.0 hooks: - id: black args: [ --safe ] @@ -29,7 +29,7 @@ rev: v1.12.1 hooks: - id: blacken-docs - additional_dependencies: [ black==22.1.0 ] + additional_dependencies: [ black==22.3.0 ] - repo: https://github.com/pre-commit/pygrep-hooks rev: v1.9.0 hooks: @@ -39,11 +39,6 @@ hooks: - id: tox-ini-fmt args: [ "-p", "fix" ] - - repo: https://github.com/asottile/setup-cfg-fmt - rev: v1.20.0 - hooks: - - id: setup-cfg-fmt - args: [ --min-py3-version, "3.7", "--max-py-version", "3.10" ] - repo: https://github.com/PyCQA/flake8 rev: 4.0.1 hooks: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformdirs-2.5.1/CHANGES.rst new/platformdirs-2.5.2/CHANGES.rst --- old/platformdirs-2.5.1/CHANGES.rst 2022-02-19 18:27:21.000000000 +0100 +++ new/platformdirs-2.5.2/CHANGES.rst 2020-02-02 01:00:00.000000000 +0100 @@ -1,32 +1,37 @@ platformdirs Changelog ====================== -platformdirs 2.5.1 ------------------- +platformdirs 2.5.2 (2022-04-18) +------------------------------- +- Move packaging to hatcling from setuptools +- Treat android shells as unix + +platformdirs 2.5.1 (2022-02-19) +------------------------------- - Add native support for nuitka -platformdirs 2.5.0 ------------------- +platformdirs 2.5.0 (2022-02-09) +------------------------------- - Add support for Termux subsystems -platformdirs 2.4.1 ------------------- +platformdirs 2.4.1 (2021-12-26) +------------------------------- - Drop python 3.6 support -platformdirs 2.4.0 ------------------- +platformdirs 2.4.0 (2021-09-25) +------------------------------- - Add ``user_documents_dir`` -platformdirs 2.3.0 ------------------- +platformdirs 2.3.0 (2021-08-31) +------------------------------- - Add ``user_runtime_dir`` and its path-returning equivalent (#37) -platformdirs 2.2.0 ------------------- +platformdirs 2.2.0 (2021-07-29) +------------------------------- - Unix: Fallback to default if XDG environment variable is empty -platformdirs 2.1.0 ------------------- +platformdirs 2.1.0 (2021-07-25) +------------------------------- - Add ``readthedocs.org`` documentation via Sphinx - Modernize project layout - Drop Python 2.7 and 3.5 support @@ -40,54 +45,54 @@ (``user_data_path``, ``user_config_path``, ``user_cache_path``, ``user_state_path``, ``user_log_path``, ``site_data_path``, ``site_config_path``) - by `@papr <https://github.com/papr/>`_ -platformdirs 2.0.2 ------------------- +platformdirs 2.0.2 (2021-07-13) +------------------------------- - Fix ``__version__`` and ``__version_info__`` -platformdirs 2.0.1 ------------------- +platformdirs 2.0.1 (never released) +----------------------------------- - Documentation fixes -platformdirs 2.0.0 ------------------- +platformdirs 2.0.0 (2021-07-12) +------------------------------- - **BREAKING** Name change as part of the friendly fork - **BREAKING** Remove support for end-of-life Pythons 2.6, 3.2, and 3.3 - **BREAKING** Correct the config directory on OSX/macOS - Add Python 3.7, 3.8, and 3.9 support -appdirs 1.4.4 -------------- +appdirs 1.4.4 (2020-05-11) +-------------------------- - [PR #92] Don't import appdirs from setup.py which resolves issue #91 Project officially classified as Stable which is important for inclusion in other distros such as ActivePython. -appdirs 1.4.3 -------------- +appdirs 1.4.3 (2017-03-07) +-------------------------- - [PR #76] Python 3.6 invalid escape sequence deprecation fixes - Fix for Python 3.6 support -appdirs 1.4.2 -------------- +appdirs 1.4.2 (2017-02-24) +-------------------------- - [PR #84] Allow installing without setuptools - [PR #86] Fix string delimiters in setup.py description - Add Python 3.6 support -appdirs 1.4.1 -------------- +appdirs 1.4.1 (2017-02-23) +-------------------------- - [issue #38] Fix _winreg import on Windows Py3 - [issue #55] Make appname optional -appdirs 1.4.0 -------------- +appdirs 1.4.0 (2017-08-17) +-------------------------- - [PR #42] AppAuthor is now optional on Windows - [issue 41] Support Jython on Windows, Mac, and Unix-like platforms. Windows support requires `JNA <https://github.com/twall/jna>`_. - [PR #44] Fix incorrect behaviour of the site_config_dir method -appdirs 1.3.0 -------------- +appdirs 1.3.0 (2014-04-22) +-------------------------- - [Unix, issue 16] Conform to XDG standard, instead of breaking it for everybody - [Unix] Removes gratuitous case mangling of the case, since \*nix-es are @@ -98,15 +103,15 @@ - [Issue 6] Add ``*_config_dir`` which are distinct on nix-es, according to XDG specs; on Windows and Mac return the corresponding ``*_data_dir`` -appdirs 1.2.0 -------------- +appdirs 1.2.0 (2011-01-26) +-------------------------- - [Unix] Put ``user_log_dir`` under the *cache* dir on Unix. Seems to be more typical. - [issue 9] Make ``unicode`` work on py3k. -appdirs 1.1.0 -------------- +appdirs 1.1.0 (2010-09-02) +-------------------------- - [issue 4] Add ``AppDirs.user_log_dir``. - [Unix, issue 2, issue 7] appdirs now conforms to `XDG base directory spec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformdirs-2.5.1/PKG-INFO new/platformdirs-2.5.2/PKG-INFO --- old/platformdirs-2.5.1/PKG-INFO 2022-02-19 18:27:28.783340000 +0100 +++ new/platformdirs-2.5.2/PKG-INFO 2020-02-02 01:00:00.000000000 +0100 @@ -1,16 +1,13 @@ Metadata-Version: 2.1 Name: platformdirs -Version: 2.5.1 +Version: 2.5.2 Summary: A small Python module for determining appropriate platform-specific dirs, e.g. a "user data dir". -Home-page: https://github.com/platformdirs/platformdirs -Maintainer: Bern??t G??bor, Julian Berman, Ofek Lev, Ronny Pfannschmidt -Maintainer-email: gaborjber...@gmail.com, jul...@grayvines.com, o...@ofek.dev, opensou...@ronnypfannschmidt.de -License: MIT +Project-URL: Documentation, https://platformdirs.readthedocs.io +Project-URL: Homepage, https://github.com/platformdirs/platformdirs Project-URL: Source, https://github.com/platformdirs/platformdirs Project-URL: Tracker, https://github.com/platformdirs/platformdirs/issues -Project-URL: Documentation, https://platformdirs.readthedocs.io/ -Keywords: application directory log cache user -Platform: UNKNOWN +Maintainer-email: Bern??t G??bor <gaborjber...@gmail.com>, Julian Berman <jul...@grayvines.com>, Ofek Lev <o...@ofek.dev>, Ronny Pfannschmidt <opensou...@ronnypfannschmidt.de> +Keywords: application,cache,directory,log,user Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: MIT License @@ -18,18 +15,25 @@ Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3 :: Only +Classifier: Programming Language :: Python :: 3.10 Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3.9 -Classifier: Programming Language :: Python :: 3.10 Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy Classifier: Topic :: Software Development :: Libraries :: Python Modules Requires-Python: >=3.7 -Description-Content-Type: text/x-rst Provides-Extra: docs +Requires-Dist: furo>=2021.7.5b38; extra == 'docs' +Requires-Dist: proselint>=0.10.2; extra == 'docs' +Requires-Dist: sphinx-autodoc-typehints>=1.12; extra == 'docs' +Requires-Dist: sphinx>=4; extra == 'docs' Provides-Extra: test -License-File: LICENSE.txt +Requires-Dist: appdirs==1.4.4; extra == 'test' +Requires-Dist: pytest-cov>=2.7; extra == 'test' +Requires-Dist: pytest-mock>=3.6; extra == 'test' +Requires-Dist: pytest>=6; extra == 'test' +Description-Content-Type: text/x-rst The problem =========== @@ -160,17 +164,24 @@ >>> appname = "SuperApp" >>> appauthor = "Acme" >>> user_data_dir(appname, appauthor) - '/data/data/com.termux/files/SuperApp' + '/data/data/com.myApp/files/SuperApp' >>> user_cache_dir(appname, appauthor) - '/data/data/com.termux/cache/SuperApp' + '/data/data/com.myApp/cache/SuperApp' >>> user_log_dir(appname, appauthor) - '/data/data/com.termux/cache/SuperApp/log' + '/data/data/com.myApp/cache/SuperApp/log' >>> user_config_dir(appname) - '/data/data/com.termux/shared_prefs/SuperApp' + '/data/data/com.myApp/shared_prefs/SuperApp' >>> user_documents_dir() '/storage/emulated/0/Documents' >>> user_runtime_dir(appname, appauthor) - '/data/data/com.termux/cache/SuperApp/tmp' + '/data/data/com.myApp/cache/SuperApp/tmp' + +Note: Some android apps like Termux and Pydroid are used as shells. These +apps are used by the end user to emulate Linux environment. Presence of +``SHELL`` environment variable is used by Platformdirs to differentiate +between general android apps and android apps used as shells. Shell android +apps also support ``XDG_*`` environment variables. + ``PlatformDirs`` for convenience ================================ @@ -237,5 +248,3 @@ created. Contributions are most welcome. - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformdirs-2.5.1/README.rst new/platformdirs-2.5.2/README.rst --- old/platformdirs-2.5.1/README.rst 2022-02-19 18:27:21.000000000 +0100 +++ new/platformdirs-2.5.2/README.rst 2020-02-02 01:00:00.000000000 +0100 @@ -127,17 +127,24 @@ >>> appname = "SuperApp" >>> appauthor = "Acme" >>> user_data_dir(appname, appauthor) - '/data/data/com.termux/files/SuperApp' + '/data/data/com.myApp/files/SuperApp' >>> user_cache_dir(appname, appauthor) - '/data/data/com.termux/cache/SuperApp' + '/data/data/com.myApp/cache/SuperApp' >>> user_log_dir(appname, appauthor) - '/data/data/com.termux/cache/SuperApp/log' + '/data/data/com.myApp/cache/SuperApp/log' >>> user_config_dir(appname) - '/data/data/com.termux/shared_prefs/SuperApp' + '/data/data/com.myApp/shared_prefs/SuperApp' >>> user_documents_dir() '/storage/emulated/0/Documents' >>> user_runtime_dir(appname, appauthor) - '/data/data/com.termux/cache/SuperApp/tmp' + '/data/data/com.myApp/cache/SuperApp/tmp' + +Note: Some android apps like Termux and Pydroid are used as shells. These +apps are used by the end user to emulate Linux environment. Presence of +``SHELL`` environment variable is used by Platformdirs to differentiate +between general android apps and android apps used as shells. Shell android +apps also support ``XDG_*`` environment variables. + ``PlatformDirs`` for convenience ================================ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformdirs-2.5.1/pyproject.toml new/platformdirs-2.5.2/pyproject.toml --- old/platformdirs-2.5.1/pyproject.toml 2022-02-19 18:27:21.000000000 +0100 +++ new/platformdirs-2.5.2/pyproject.toml 2020-02-02 01:00:00.000000000 +0100 @@ -1,6 +1,63 @@ [build-system] -requires = ["setuptools >= 44", "wheel >= 0.30", "setuptools_scm[toml]>=5"] -build-backend = "setuptools.build_meta" +build-backend = "hatchling.build" +requires = ["hatchling>=0.22.0", "hatch-vcs"] + +[project] +name = "platformdirs" +description = 'A small Python module for determining appropriate platform-specific dirs, e.g. a "user data dir".' +readme = "README.rst" +license = "MIT" +maintainers = [ + { name = "Bern??t G??bor", email = "gaborjber...@gmail.com" }, + { name = "Julian Berman", email = "jul...@grayvines.com" }, + { name = "Ofek Lev", email = "o...@ofek.dev" }, + { name = "Ronny Pfannschmidt", email = "opensou...@ronnypfannschmidt.de" }, +] +urls.Documentation = "https://platformdirs.readthedocs.io" +urls.Homepage = "https://github.com/platformdirs/platformdirs" +urls.Source = "https://github.com/platformdirs/platformdirs" +urls.Tracker = "https://github.com/platformdirs/platformdirs/issues" +requires-python = ">=3.7" +optional-dependencies.test = [ + "appdirs==1.4.4", + "pytest>=6", + "pytest-cov>=2.7", + "pytest-mock>=3.6", +] +optional-dependencies.docs = [ + "furo>=2021.7.5b38", + "proselint>=0.10.2", + "sphinx>=4", + "sphinx-autodoc-typehints>=1.12", +] +keywords = ["application", "cache", "directory", "log", "user"] +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: Implementation :: CPython", + "Programming Language :: Python :: Implementation :: PyPy", + "Topic :: Software Development :: Libraries :: Python Modules", +] +dynamic = ["version"] + +[tool.hatch] +build.hooks.vcs.template = ''' +"""Version information""" + +__version__ = "{version}" +__version_info__ = {version_tuple} +''' +build.hooks.vcs.version-file = "src/platformdirs/version.py" +version.source = "vcs" [tool.black] line-length = 120 @@ -8,12 +65,3 @@ [tool.isort] profile = "black" known_first_party = ["platformdirs"] - -[tool.setuptools_scm] -write_to = "src/platformdirs/version.py" -write_to_template = """ -\"\"\" Version information \"\"\" - -__version__ = "{version}" -__version_info__ = {version_tuple} -""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformdirs-2.5.1/setup.cfg new/platformdirs-2.5.2/setup.cfg --- old/platformdirs-2.5.1/setup.cfg 2022-02-19 18:27:28.783340000 +0100 +++ new/platformdirs-2.5.2/setup.cfg 2020-02-02 01:00:00.000000000 +0100 @@ -1,91 +1,35 @@ -[metadata] -name = platformdirs -description = A small Python module for determining appropriate platform-specific dirs, e.g. a "user data dir". -long_description = file: README.rst -long_description_content_type = text/x-rst -url = https://github.com/platformdirs/platformdirs -maintainer = Bern??t G??bor, Julian Berman, Ofek Lev, Ronny Pfannschmidt -maintainer_email = gaborjber...@gmail.com, jul...@grayvines.com, o...@ofek.dev, opensou...@ronnypfannschmidt.de -license = MIT -license_file = LICENSE.txt -classifiers = - Development Status :: 5 - Production/Stable - Intended Audience :: Developers - License :: OSI Approved :: MIT License - Operating System :: OS Independent - Programming Language :: Python - Programming Language :: Python :: 3 - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: Implementation :: CPython - Programming Language :: Python :: Implementation :: PyPy - Topic :: Software Development :: Libraries :: Python Modules -keywords = application directory log cache user -project_urls = - Source=https://github.com/platformdirs/platformdirs - Tracker=https://github.com/platformdirs/platformdirs/issues - Documentation=https://platformdirs.readthedocs.io/ - -[options] -packages = find: -python_requires = >=3.7 -package_dir = - =src -zip_safe = True - -[options.packages.find] -where = src - -[options.extras_require] -docs = - Sphinx>=4 - furo>=2021.7.5b38 - proselint>=0.10.2 - sphinx-autodoc-typehints>=1.12 -test = - appdirs==1.4.4 - pytest>=6 - pytest-cov>=2.7 - pytest-mock>=3.6 - -[options.package_data] -platformdirs = py.typed - [flake8] max-line-length = 120 dictionaries = en_US,python,technical [coverage:report] show_missing = True -exclude_lines = - \#\s*pragma: no cover - ^\s*raise AssertionError\b - ^\s*raise NotImplementedError\b - ^\s*raise$ - ^if __name__ == ['"]__main__['"]:$ +exclude_lines = + \#\s*pragma: no cover + ^\s*raise AssertionError\b + ^\s*raise NotImplementedError\b + ^\s*raise$ + ^if __name__ == ['"]__main__['"]:$ [coverage:paths] -source = - src - .tox/*/lib/python*/site-packages - .tox/pypy*/site-packages - .tox\*\Lib\site-packages\ - */src - *\src -other = - . - */platformdirs - *\platformdirs +source = + src + .tox/*/lib/python*/site-packages + .tox/pypy*/site-packages + .tox\*\Lib\site-packages\ + */src + *\src +other = + . + */platformdirs + *\platformdirs [coverage:run] branch = true parallel = true dynamic_context = test_function -source = - ${_COVERAGE_SRC} +source = + ${_COVERAGE_SRC} [coverage:html] show_contexts = true @@ -101,8 +45,3 @@ [mypy-jnius.*] ignore_missing_imports = True - -[egg_info] -tag_build = -tag_date = 0 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformdirs-2.5.1/setup.py new/platformdirs-2.5.2/setup.py --- old/platformdirs-2.5.1/setup.py 2022-02-19 18:27:21.000000000 +0100 +++ new/platformdirs-2.5.2/setup.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -from __future__ import annotations - -from setuptools import setup - -setup() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformdirs-2.5.1/src/platformdirs/__init__.py new/platformdirs-2.5.2/src/platformdirs/__init__.py --- old/platformdirs-2.5.1/src/platformdirs/__init__.py 2022-02-19 18:27:21.000000000 +0100 +++ new/platformdirs-2.5.2/src/platformdirs/__init__.py 2020-02-02 01:00:00.000000000 +0100 @@ -25,6 +25,10 @@ from platformdirs.unix import Unix as Result if os.getenv("ANDROID_DATA") == "/data" and os.getenv("ANDROID_ROOT") == "/system": + + if os.getenv("SHELL") is not None: + return Result + from platformdirs.android import _android_folder if _android_folder() is not None: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformdirs-2.5.1/src/platformdirs/version.py new/platformdirs-2.5.2/src/platformdirs/version.py --- old/platformdirs-2.5.1/src/platformdirs/version.py 2022-02-19 18:27:28.000000000 +0100 +++ new/platformdirs-2.5.2/src/platformdirs/version.py 2020-02-02 01:00:00.000000000 +0100 @@ -1,4 +1,4 @@ -""" Version information """ +"""Version information""" -__version__ = "2.5.1" -__version_info__ = (2, 5, 1) +__version__ = "2.5.2" +__version_info__ = (2, 5, 2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformdirs-2.5.1/src/platformdirs.egg-info/PKG-INFO new/platformdirs-2.5.2/src/platformdirs.egg-info/PKG-INFO --- old/platformdirs-2.5.1/src/platformdirs.egg-info/PKG-INFO 2022-02-19 18:27:28.000000000 +0100 +++ new/platformdirs-2.5.2/src/platformdirs.egg-info/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 @@ -1,241 +0,0 @@ -Metadata-Version: 2.1 -Name: platformdirs -Version: 2.5.1 -Summary: A small Python module for determining appropriate platform-specific dirs, e.g. a "user data dir". -Home-page: https://github.com/platformdirs/platformdirs -Maintainer: Bern??t G??bor, Julian Berman, Ofek Lev, Ronny Pfannschmidt -Maintainer-email: gaborjber...@gmail.com, jul...@grayvines.com, o...@ofek.dev, opensou...@ronnypfannschmidt.de -License: MIT -Project-URL: Source, https://github.com/platformdirs/platformdirs -Project-URL: Tracker, https://github.com/platformdirs/platformdirs/issues -Project-URL: Documentation, https://platformdirs.readthedocs.io/ -Keywords: application directory log cache user -Platform: UNKNOWN -Classifier: Development Status :: 5 - Production/Stable -Classifier: Intended Audience :: Developers -Classifier: License :: OSI Approved :: MIT License -Classifier: Operating System :: OS Independent -Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3 :: Only -Classifier: Programming Language :: Python :: 3.7 -Classifier: Programming Language :: Python :: 3.8 -Classifier: Programming Language :: Python :: 3.9 -Classifier: Programming Language :: Python :: 3.10 -Classifier: Programming Language :: Python :: Implementation :: CPython -Classifier: Programming Language :: Python :: Implementation :: PyPy -Classifier: Topic :: Software Development :: Libraries :: Python Modules -Requires-Python: >=3.7 -Description-Content-Type: text/x-rst -Provides-Extra: docs -Provides-Extra: test -License-File: LICENSE.txt - -The problem -=========== - -.. image:: https://github.com/platformdirs/platformdirs/workflows/Test/badge.svg - :target: https://github.com/platformdirs/platformdirs/actions?query=workflow%3ATest - -When writing desktop application, finding the right location to store user data -and configuration varies per platform. Even for single-platform apps, there -may by plenty of nuances in figuring out the right location. - -For example, if running on macOS, you should use:: - - ~/Library/Application Support/<AppName> - -If on Windows (at least English Win XP) that should be:: - - C:\Documents and Settings\<User>\Application Data\Local Settings\<AppAuthor>\<AppName> - -or possibly:: - - C:\Documents and Settings\<User>\Application Data\<AppAuthor>\<AppName> - -for `roaming profiles <https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-vista/cc766489(v=ws.10)>`_ but that is another story. - -On Linux (and other Unices), according to the `XDG Basedir Spec`_, it should be:: - - ~/.local/share/<AppName> - -.. _XDG Basedir Spec: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html - -``platformdirs`` to the rescue -============================== - -This kind of thing is what the ``platformdirs`` module is for. -``platformdirs`` will help you choose an appropriate: - -- user data dir (``user_data_dir``) -- user config dir (``user_config_dir``) -- user cache dir (``user_cache_dir``) -- site data dir (``site_data_dir``) -- site config dir (``site_config_dir``) -- user log dir (``user_log_dir``) -- user documents dir (``user_documents_dir``) -- user runtime dir (``user_runtime_dir``) - -And also: - -- Is a single module so other Python packages can vendor their own private copy. -- Is slightly opinionated on the directory names used. Look for "OPINION" in - documentation and code for when an opinion is being applied. - -Example output -============== - -On macOS: - -.. code-block:: pycon - - >>> from platformdirs import * - >>> appname = "SuperApp" - >>> appauthor = "Acme" - >>> user_data_dir(appname, appauthor) - '/Users/trentm/Library/Application Support/SuperApp' - >>> site_data_dir(appname, appauthor) - '/Library/Application Support/SuperApp' - >>> user_cache_dir(appname, appauthor) - '/Users/trentm/Library/Caches/SuperApp' - >>> user_log_dir(appname, appauthor) - '/Users/trentm/Library/Logs/SuperApp' - >>> user_documents_dir() - '/Users/trentm/Documents' - >>> user_runtime_dir(appname, appauthor) - '/Users/trentm/Library/Caches/TemporaryItems/SuperApp' - -On Windows 7: - -.. code-block:: pycon - - >>> from platformdirs import * - >>> appname = "SuperApp" - >>> appauthor = "Acme" - >>> user_data_dir(appname, appauthor) - 'C:\\Users\\trentm\\AppData\\Local\\Acme\\SuperApp' - >>> user_data_dir(appname, appauthor, roaming=True) - 'C:\\Users\\trentm\\AppData\\Roaming\\Acme\\SuperApp' - >>> user_cache_dir(appname, appauthor) - 'C:\\Users\\trentm\\AppData\\Local\\Acme\\SuperApp\\Cache' - >>> user_log_dir(appname, appauthor) - 'C:\\Users\\trentm\\AppData\\Local\\Acme\\SuperApp\\Logs' - >>> user_documents_dir() - 'C:\\Users\\trentm\\Documents' - >>> user_runtime_dir(appname, appauthor) - 'C:\\Users\\trentm\\AppData\\Local\\Temp\\Acme\\SuperApp' - -On Linux: - -.. code-block:: pycon - - >>> from platformdirs import * - >>> appname = "SuperApp" - >>> appauthor = "Acme" - >>> user_data_dir(appname, appauthor) - '/home/trentm/.local/share/SuperApp' - >>> site_data_dir(appname, appauthor) - '/usr/local/share/SuperApp' - >>> site_data_dir(appname, appauthor, multipath=True) - '/usr/local/share/SuperApp:/usr/share/SuperApp' - >>> user_cache_dir(appname, appauthor) - '/home/trentm/.cache/SuperApp' - >>> user_log_dir(appname, appauthor) - '/home/trentm/.cache/SuperApp/log' - >>> user_config_dir(appname) - '/home/trentm/.config/SuperApp' - >>> user_documents_dir() - '/home/trentm/Documents' - >>> user_runtime_dir(appname, appauthor) - '/run/user/{os.getuid()}/SuperApp' - >>> site_config_dir(appname) - '/etc/xdg/SuperApp' - >>> os.environ["XDG_CONFIG_DIRS"] = "/etc:/usr/local/etc" - >>> site_config_dir(appname, multipath=True) - '/etc/SuperApp:/usr/local/etc/SuperApp' - -On Android:: - - >>> from platformdirs import * - >>> appname = "SuperApp" - >>> appauthor = "Acme" - >>> user_data_dir(appname, appauthor) - '/data/data/com.termux/files/SuperApp' - >>> user_cache_dir(appname, appauthor) - '/data/data/com.termux/cache/SuperApp' - >>> user_log_dir(appname, appauthor) - '/data/data/com.termux/cache/SuperApp/log' - >>> user_config_dir(appname) - '/data/data/com.termux/shared_prefs/SuperApp' - >>> user_documents_dir() - '/storage/emulated/0/Documents' - >>> user_runtime_dir(appname, appauthor) - '/data/data/com.termux/cache/SuperApp/tmp' - -``PlatformDirs`` for convenience -================================ - -.. code-block:: pycon - - >>> from platformdirs import PlatformDirs - >>> dirs = PlatformDirs("SuperApp", "Acme") - >>> dirs.user_data_dir - '/Users/trentm/Library/Application Support/SuperApp' - >>> dirs.site_data_dir - '/Library/Application Support/SuperApp' - >>> dirs.user_cache_dir - '/Users/trentm/Library/Caches/SuperApp' - >>> dirs.user_log_dir - '/Users/trentm/Library/Logs/SuperApp' - >>> dirs.user_documents_dir - '/Users/trentm/Documents' - >>> dirs.user_runtime_dir - '/Users/trentm/Library/Caches/TemporaryItems/SuperApp' - -Per-version isolation -===================== - -If you have multiple versions of your app in use that you want to be -able to run side-by-side, then you may want version-isolation for these -dirs:: - - >>> from platformdirs import PlatformDirs - >>> dirs = PlatformDirs("SuperApp", "Acme", version="1.0") - >>> dirs.user_data_dir - '/Users/trentm/Library/Application Support/SuperApp/1.0' - >>> dirs.site_data_dir - '/Library/Application Support/SuperApp/1.0' - >>> dirs.user_cache_dir - '/Users/trentm/Library/Caches/SuperApp/1.0' - >>> dirs.user_log_dir - '/Users/trentm/Library/Logs/SuperApp/1.0' - >>> dirs.user_documents_dir - '/Users/trentm/Documents' - >>> dirs.user_runtime_dir - '/Users/trentm/Library/Caches/TemporaryItems/SuperApp/1.0' - -Be wary of using this for configuration files though; you'll need to handle -migrating configuration files manually. - -Why this Fork? -============== - -This repository is a friendly fork of the wonderful work started by -`ActiveState <https://github.com/ActiveState/appdirs>`_ who created -``appdirs``, this package's ancestor. - -Maintaining an open source project is no easy task, particularly -from within an organization, and the Python community is indebted -to ``appdirs`` (and to Trent Mick and Jeff Rouse in particular) for -creating an incredibly useful simple module, as evidenced by the wide -number of users it has attracted over the years. - -Nonetheless, given the number of long-standing open issues -and pull requests, and no clear path towards `ensuring -that maintenance of the package would continue or grow -<https://github.com/ActiveState/appdirs/issues/79>`_, this fork was -created. - -Contributions are most welcome. - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformdirs-2.5.1/src/platformdirs.egg-info/SOURCES.txt new/platformdirs-2.5.2/src/platformdirs.egg-info/SOURCES.txt --- old/platformdirs-2.5.1/src/platformdirs.egg-info/SOURCES.txt 2022-02-19 18:27:28.000000000 +0100 +++ new/platformdirs-2.5.2/src/platformdirs.egg-info/SOURCES.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -.gitignore -.pre-commit-config.yaml -.readthedocs.yml -CHANGES.rst -LICENSE.txt -README.rst -codecov.yml -pyproject.toml -setup.cfg -setup.py -tox.ini -whitelist.txt -.github/CODEOWNERS -.github/workflows/check.yml -docs/api.rst -docs/changelog.rst -docs/conf.py -docs/index.rst -src/platformdirs/__init__.py -src/platformdirs/__main__.py -src/platformdirs/android.py -src/platformdirs/api.py -src/platformdirs/macos.py -src/platformdirs/py.typed -src/platformdirs/unix.py -src/platformdirs/version.py -src/platformdirs/windows.py -src/platformdirs.egg-info/PKG-INFO -src/platformdirs.egg-info/SOURCES.txt -src/platformdirs.egg-info/dependency_links.txt -src/platformdirs.egg-info/requires.txt -src/platformdirs.egg-info/top_level.txt -src/platformdirs.egg-info/zip-safe -tests/conftest.py -tests/test_android.py -tests/test_api.py -tests/test_comp_with_appdirs.py -tests/test_main.py -tests/test_unix.py \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformdirs-2.5.1/src/platformdirs.egg-info/dependency_links.txt new/platformdirs-2.5.2/src/platformdirs.egg-info/dependency_links.txt --- old/platformdirs-2.5.1/src/platformdirs.egg-info/dependency_links.txt 2022-02-19 18:27:28.000000000 +0100 +++ new/platformdirs-2.5.2/src/platformdirs.egg-info/dependency_links.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformdirs-2.5.1/src/platformdirs.egg-info/requires.txt new/platformdirs-2.5.2/src/platformdirs.egg-info/requires.txt --- old/platformdirs-2.5.1/src/platformdirs.egg-info/requires.txt 2022-02-19 18:27:28.000000000 +0100 +++ new/platformdirs-2.5.2/src/platformdirs.egg-info/requires.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ - -[docs] -Sphinx>=4 -furo>=2021.7.5b38 -proselint>=0.10.2 -sphinx-autodoc-typehints>=1.12 - -[test] -appdirs==1.4.4 -pytest>=6 -pytest-cov>=2.7 -pytest-mock>=3.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformdirs-2.5.1/src/platformdirs.egg-info/top_level.txt new/platformdirs-2.5.2/src/platformdirs.egg-info/top_level.txt --- old/platformdirs-2.5.1/src/platformdirs.egg-info/top_level.txt 2022-02-19 18:27:28.000000000 +0100 +++ new/platformdirs-2.5.2/src/platformdirs.egg-info/top_level.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -platformdirs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformdirs-2.5.1/src/platformdirs.egg-info/zip-safe new/platformdirs-2.5.2/src/platformdirs.egg-info/zip-safe --- old/platformdirs-2.5.1/src/platformdirs.egg-info/zip-safe 2022-02-19 18:27:27.000000000 +0100 +++ new/platformdirs-2.5.2/src/platformdirs.egg-info/zip-safe 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformdirs-2.5.1/tests/test_api.py new/platformdirs-2.5.2/tests/test_api.py --- old/platformdirs-2.5.1/tests/test_api.py 2022-02-19 18:27:21.000000000 +0100 +++ new/platformdirs-2.5.2/tests/test_api.py 2020-02-02 01:00:00.000000000 +0100 @@ -53,8 +53,11 @@ @pytest.mark.parametrize("root", ["A", "/system", None]) @pytest.mark.parametrize("data", ["D", "/data", None]) @pytest.mark.parametrize("path", ["/data/data/a/files", "/C"]) -def test_android_active(monkeypatch: MonkeyPatch, root: str | None, data: str | None, path: str) -> None: - for env_var, value in {"ANDROID_DATA": data, "ANDROID_ROOT": root}.items(): +@pytest.mark.parametrize("shell", ["/data/data/com.app/files/usr/bin/sh", "/usr/bin/sh", None]) +def test_android_active( + monkeypatch: MonkeyPatch, root: str | None, data: str | None, path: str, shell: str | None +) -> None: + for env_var, value in {"ANDROID_DATA": data, "ANDROID_ROOT": root, "SHELL": shell}.items(): if value is None: monkeypatch.delenv(env_var, raising=False) else: @@ -65,7 +68,7 @@ _android_folder.cache_clear() monkeypatch.setattr(sys, "path", ["/A", "/B", path]) - expected = root == "/system" and data == "/data" and _android_folder() is not None + expected = root == "/system" and data == "/data" and shell is None and _android_folder() is not None if expected: assert platformdirs._set_platform_dir_class() is Android else: