[Git][debian-gis-team/satpy][master] New 0008-Switch-from-appdirs-to-platformdirs.patch
Antonio Valentino (@antonio.valentino)
gitlab at salsa.debian.org
Sat Mar 30 06:19:58 GMT 2024
Antonio Valentino pushed to branch master at Debian GIS Project / satpy
Commits:
dce54f12 by Antonio Valentino at 2024-03-29T19:05:59+00:00
New 0008-Switch-from-appdirs-to-platformdirs.patch
- - - - -
4 changed files:
- debian/changelog
- debian/control
- + debian/patches/0008-Switch-from-appdirs-to-platformdirs.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+satpy (0.47.0-2) UNRELEASED; urgency=medium
+
+ * debian/patches:
+ - New 0008-Switch-from-appdirs-to-platformdirs.patch (Closes: #1068007).
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it> Fri, 29 Mar 2024 18:31:29 +0000
+
satpy (0.47.0-1) unstable; urgency=medium
* New upstream release.
=====================================
debian/control
=====================================
@@ -13,7 +13,6 @@ Build-Depends: debhelper-compat (= 13),
libjs-mathjax <!nodoc>,
pybuild-plugin-pyproject,
python3-all,
- python3-appdirs,
python3-astropy,
python3-behave <!nocheck>,
python3-bottleneck,
@@ -39,6 +38,7 @@ Build-Depends: debhelper-compat (= 13),
python3-pil,
python3-pint,
python3-pint-xarray,
+ python3-platformdirs,
python3-pooch,
python3-pygac,
python3-pycoast,
@@ -78,8 +78,7 @@ Rules-Requires-Root: no
Package: python3-satpy
Architecture: all
-Depends: python3-appdirs,
- python3-dask,
+Depends: python3-dask,
python3-donfig,
python3-defusedxml,
python3-eccodes,
@@ -87,6 +86,7 @@ Depends: python3-appdirs,
python3-hdf4,
python3-packaging,
python3-pil,
+ python3-platformdirs,
python3-pooch,
python3-pykdtree,
python3-pyproj,
=====================================
debian/patches/0008-Switch-from-appdirs-to-platformdirs.patch
=====================================
@@ -0,0 +1,119 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Fri, 29 Mar 2024 18:30:57 +0000
+Subject: Switch from appdirs to platformdirs
+
+Forwarded: https://github.com/pytroll/satpy/pull/2769
+---
+ continuous_integration/environment.yaml | 2 +-
+ doc/rtd_environment.yml | 2 +-
+ doc/source/config.rst | 6 +++---
+ satpy/_config.py | 4 ++--
+ satpy/readers/ahi_l1b_gridded_bin.py | 2 +-
+ setup.py | 2 +-
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/continuous_integration/environment.yaml b/continuous_integration/environment.yaml
+index f1a8931..9a1bced 100644
+--- a/continuous_integration/environment.yaml
++++ b/continuous_integration/environment.yaml
+@@ -7,7 +7,7 @@ dependencies:
+ - distributed
+ - dask-image
+ - donfig
+- - appdirs
++ - platformdirs
+ - toolz
+ - Cython
+ - numba
+diff --git a/doc/rtd_environment.yml b/doc/rtd_environment.yml
+index 1e40cbb..f24aa09 100644
+--- a/doc/rtd_environment.yml
++++ b/doc/rtd_environment.yml
+@@ -4,7 +4,7 @@ channels:
+ dependencies:
+ - python=3.10
+ - pip
+- - appdirs
++ - platformdirs
+ - dask
+ - dask-image
+ - defusedxml
+diff --git a/doc/source/config.rst b/doc/source/config.rst
+index b1777c9..2279e10 100644
+--- a/doc/source/config.rst
++++ b/doc/source/config.rst
+@@ -35,7 +35,7 @@ locations:
+ 3. ``~/.satpy/satpy.yaml``
+ 4. ``<SATPY_CONFIG_PATH>/satpy.yaml`` (see :ref:`config_path_setting` below)
+
+-The above ``user_config_dir`` is provided by the ``appdirs`` package and
++The above ``user_config_dir`` is provided by the ``platformdirs`` package and
+ differs by operating system. Typical user config directories are:
+
+ * Mac OSX: ``~/Library/Preferences/satpy``
+@@ -90,7 +90,7 @@ Directory where any files cached by Satpy will be stored. This
+ directory is not necessarily cleared out by Satpy, but is rarely used without
+ explicitly being enabled by the user. This
+ defaults to a different path depending on your operating system following
+-the `appdirs <https://github.com/ActiveState/appdirs#some-example-output>`_
++the `platformdirs <https://github.com/platformdirs/platformdirs#example-output>`_
+ "user cache dir".
+
+ .. _config_cache_lonlats_setting:
+@@ -214,7 +214,7 @@ Data Directory
+ Directory where any data Satpy needs to perform certain operations will be
+ stored. This replaces the legacy ``SATPY_ANCPATH`` environment variable. This
+ defaults to a different path depending on your operating system following the
+-`appdirs <https://github.com/ActiveState/appdirs#some-example-output>`_
++`platformdirs <https://github.com/platformdirs/platformdirs#example-output>`_
+ "user data dir".
+
+ .. _download_aux_setting:
+diff --git a/satpy/_config.py b/satpy/_config.py
+index 6a14f99..4bb7532 100644
+--- a/satpy/_config.py
++++ b/satpy/_config.py
+@@ -29,7 +29,7 @@ from importlib.metadata import EntryPoint, entry_points
+ from importlib.resources import files as impr_files
+ from typing import Iterable
+
+-import appdirs
++from platformdirs import AppDirs
+ from donfig import Config
+
+ from satpy._compat import cache
+@@ -40,7 +40,7 @@ BASE_PATH = os.path.dirname(os.path.realpath(__file__))
+ # FIXME: Use package_resources?
+ PACKAGE_CONFIG_PATH = os.path.join(BASE_PATH, "etc")
+
+-_satpy_dirs = appdirs.AppDirs(appname="satpy", appauthor="pytroll")
++_satpy_dirs = AppDirs(appname="satpy", appauthor="pytroll")
+ _CONFIG_DEFAULTS = {
+ "tmp_dir": tempfile.gettempdir(),
+ "cache_dir": _satpy_dirs.user_cache_dir,
+diff --git a/satpy/readers/ahi_l1b_gridded_bin.py b/satpy/readers/ahi_l1b_gridded_bin.py
+index 33289ae..9c06e3c 100644
+--- a/satpy/readers/ahi_l1b_gridded_bin.py
++++ b/satpy/readers/ahi_l1b_gridded_bin.py
+@@ -37,7 +37,7 @@ import os
+ import dask.array as da
+ import numpy as np
+ import xarray as xr
+-from appdirs import AppDirs
++from platformdirs import AppDirs
+ from pyresample import geometry
+
+ from satpy.readers.file_handlers import BaseFileHandler
+diff --git a/setup.py b/setup.py
+index c4bb869..9a553fc 100644
+--- a/setup.py
++++ b/setup.py
+@@ -24,7 +24,7 @@ from setuptools import find_packages, setup
+
+ requires = ["numpy >=1.21", "pillow", "pyresample >=1.24.0", "trollsift",
+ "trollimage >=1.23", "pykdtree", "pyyaml >=5.1", "xarray >=0.14.1",
+- "dask[array] >=0.17.1", "pyproj>=2.2", "zarr", "donfig", "appdirs",
++ "dask[array] >=0.17.1", "pyproj>=2.2", "zarr", "donfig", "platformdirs",
+ "packaging", "pooch", "pyorbital"]
+
+ test_requires = ["behave", "h5py", "netCDF4", "pyhdf", "imageio",
=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@
0005-Fix-privacy-breach.patch
0006-Fix-compatibility-with-old-dask-versions.patch
0007-Do-not-document-pvivate-members.patch
+0008-Switch-from-appdirs-to-platformdirs.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/commit/dce54f1239e1ed7281c46aed8f12ee98499259c1
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/commit/dce54f1239e1ed7281c46aed8f12ee98499259c1
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240330/b679cd13/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list