Control: tags 1067969 + patch
Attached is a likely correct patch to replace appdirs with
platformdirs. But because of other FTBFS bugs, I cannot test it.
Please consider applying it when fixing the other FTBFS reasons.
diff -Nru intake-0.6.6/debian/changelog intake-0.6.6/debian/changelog
--- intake-0.6.6/debian/changelog 2024-01-04 18:29:31.000000000 +0100
+++ intake-0.6.6/debian/changelog 2024-12-16 00:39:40.000000000 +0100
@@ -1,3 +1,10 @@
+intake (0.6.6-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Replace appdirs with platformdirs. (Closes: #1067969)
+
+ -- Chris Hofstaedtler <z...@debian.org> Mon, 16 Dec 2024 00:39:40 +0100
+
intake (0.6.6-3) unstable; urgency=medium
* Replace distutils which is removed in Python3.12
diff -Nru intake-0.6.6/debian/control intake-0.6.6/debian/control
--- intake-0.6.6/debian/control 2024-01-04 18:29:31.000000000 +0100
+++ intake-0.6.6/debian/control 2024-12-16 00:39:34.000000000 +0100
@@ -8,7 +8,7 @@
python3-all,
python3-setuptools,
dh-python,
- python3-appdirs,
+ python3-platformdirs,
python3-entrypoints,
python3-dask,
python3-jinja2,
@@ -45,7 +45,7 @@
Section: python
Depends: ${python3:Depends},
${misc:Depends},
- python3-appdirs,
+ python3-platformdirs,
python3-entrypoints,
python3-dask,
python3-jinja2,
diff -Nru intake-0.6.6/debian/patches/platformdirs.patch intake-0.6.6/debian/patches/platformdirs.patch
--- intake-0.6.6/debian/patches/platformdirs.patch 1970-01-01 01:00:00.000000000 +0100
+++ intake-0.6.6/debian/patches/platformdirs.patch 2024-12-16 00:39:36.000000000 +0100
@@ -0,0 +1,68 @@
+Index: intake-0.6.6/intake/catalog/default.py
+===================================================================
+--- intake-0.6.6.orig/intake/catalog/default.py
++++ intake-0.6.6/intake/catalog/default.py
+@@ -5,7 +5,7 @@
+ # The full license is in the LICENSE file, distributed with this software.
+ #-----------------------------------------------------------------------------
+
+-import appdirs
++import platformdirs
+ import json
+ import os
+ import shutil
+@@ -28,7 +28,7 @@ def load_user_catalog():
+
+ def user_data_dir():
+ """Return the user Intake catalog directory"""
+- return appdirs.user_data_dir(appname='intake', appauthor='intake')
++ return platformdirs.user_data_dir(appname='intake', appauthor='intake')
+
+
+ def load_global_catalog():
+@@ -72,7 +72,7 @@ def global_data_dir():
+ # conda and virtualenv use Linux-style directory pattern
+ return make_path_posix(os.path.join(prefix, 'share', 'intake'))
+ else:
+- return appdirs.site_data_dir(appname='intake', appauthor='intake')
++ return platformdirs.site_data_dir(appname='intake', appauthor='intake')
+
+
+ def load_combo_catalog():
+Index: intake-0.6.6/intake/tests/test_top_level.py
+===================================================================
+--- intake-0.6.6.orig/intake/tests/test_top_level.py
++++ intake-0.6.6/intake/tests/test_top_level.py
+@@ -11,7 +11,7 @@ import sys
+ import tempfile
+ import time
+
+-import appdirs
++import platformdirs
+ import intake
+ import intake.catalog.local
+ import pytest
+@@ -22,8 +22,8 @@ from .test_utils import copy_test_file
+ @pytest.fixture
+ def user_catalog():
+ target_catalog = copy_test_file('catalog1.yml',
+- appdirs.user_data_dir(appname='intake',
+- appauthor='intake'))
++ platformdirs.user_data_dir(appname='intake',
++ appauthor='intake'))
+ yield target_catalog
+ # Remove the file, but not the directory (because there might be other
+ # files already there)
+Index: intake-0.6.6/requirements.txt
+===================================================================
+--- intake-0.6.6.orig/requirements.txt
++++ intake-0.6.6/requirements.txt
+@@ -1,7 +1,7 @@
+-appdirs
+ dask
+ entrypoints
+ pyyaml
+ fsspec >=2021.7.0
+ jinja2
+ msgpack
++platformdirs
diff -Nru intake-0.6.6/debian/patches/series intake-0.6.6/debian/patches/series
--- intake-0.6.6/debian/patches/series 2024-01-04 18:29:31.000000000 +0100
+++ intake-0.6.6/debian/patches/series 2024-12-16 00:38:35.000000000 +0100
@@ -5,3 +5,4 @@
typo-in-manual-page.patch
84e22555aa415eb6a92c60b11d5f1e09d4737c54.patch
python3.12.patch
+platformdirs.patch
