[med-svn] [Git][med-team/intake][master] 4 commits: Replace appdirs with platformdirs. (Closes: #1067969)
Andreas Tille (@tille)
gitlab at salsa.debian.org
Tue Jan 7 08:38:48 GMT 2025
Andreas Tille pushed to branch master at Debian Med / intake
Commits:
679d55c2 by Andreas Tille at 2025-01-07T09:34:14+01:00
Replace appdirs with platformdirs. (Closes: #1067969)
- - - - -
234290ef by Andreas Tille at 2025-01-07T09:34:39+01:00
Standards-Version: 4.7.0 (routine-update)
- - - - -
f41c24de by Andreas Tille at 2025-01-07T09:34:42+01:00
Build-Depends: s/dh-python/dh-sequence-python3/ (routine-update)
- - - - -
5e2ec521 by Andreas Tille at 2025-01-07T09:38:26+01:00
Fix changelog
- - - - -
5 changed files:
- debian/changelog
- debian/control
- + debian/patches/platformdirs.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+intake (0.6.6-4) UNRELEASED; urgency=medium
+
+ * Team upload.
+
+ [ Chris Hofstaedtler ].
+ * Replace appdirs with platformdirs. (Closes: #1067969)
+
+ [ Andreas Tille ]
+ * Standards-Version: 4.7.0 (routine-update)
+ * Build-Depends: s/dh-python/dh-sequence-python3/ (routine-update)
+
+ -- Andreas Tille <tille at debian.org> Tue, 07 Jan 2025 09:34:52 +0100
+
intake (0.6.6-3) unstable; urgency=medium
* Replace distutils which is removed in Python3.12
=====================================
debian/control
=====================================
@@ -7,8 +7,8 @@ Priority: optional
Build-Depends: debhelper-compat (= 13),
python3-all,
python3-setuptools,
- dh-python,
- python3-appdirs,
+ dh-sequence-python3,
+ python3-platformdirs,
python3-entrypoints,
python3-dask,
python3-jinja2,
@@ -34,7 +34,7 @@ Build-Depends: debhelper-compat (= 13),
libjs-jquery,
node-html5shiv,
python3-packaging
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
Vcs-Browser: https://salsa.debian.org/med-team/intake
Vcs-Git: https://salsa.debian.org/med-team/intake.git
Homepage: https://github.com/intake/intake
@@ -45,7 +45,7 @@ Architecture: any
Section: python
Depends: ${python3:Depends},
${misc:Depends},
- python3-appdirs,
+ python3-platformdirs,
python3-entrypoints,
python3-dask,
python3-jinja2,
=====================================
debian/patches/platformdirs.patch
=====================================
@@ -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
=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@ architectures-support.patch
typo-in-manual-page.patch
84e22555aa415eb6a92c60b11d5f1e09d4737c54.patch
python3.12.patch
+platformdirs.patch
=====================================
debian/rules
=====================================
@@ -11,7 +11,7 @@ export PYBUILD_NAME=intake
# export DEB_BUILD_MAINT_OPTIONS=hardening=+all
%:
- dh $@ --with python3,sphinxdoc --buildsystem=pybuild
+ dh $@ --with sphinxdoc --buildsystem=pybuild
override_dh_auto_build: export http_proxy=127.0.0.1:9
override_dh_auto_build: export https_proxy=127.0.0.1:9
View it on GitLab: https://salsa.debian.org/med-team/intake/-/compare/2e61638b0723cf02c44ae8fd74190c3aa764c77a...5e2ec52120d6fc97d8fde33d57a5c2c25f689e09
--
View it on GitLab: https://salsa.debian.org/med-team/intake/-/compare/2e61638b0723cf02c44ae8fd74190c3aa764c77a...5e2ec52120d6fc97d8fde33d57a5c2c25f689e09
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/debian-med-commit/attachments/20250107/8ed73b72/attachment-0001.htm>
More information about the debian-med-commit
mailing list