1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
--- a/datalad/cli/helpers.py
+++ b/datalad/cli/helpers.py
@@ -25,7 +25,7 @@ from datalad.support.exceptions import C
from datalad.ui.utils import get_console_width
from datalad.utils import is_interactive
-from platformdirs import AppDirs
+from appdirs import AppDirs
dirs = AppDirs("datalad", "datalad.org")
--- a/datalad/downloaders/tests/test_providers.py
+++ b/datalad/downloaders/tests/test_providers.py
@@ -122,7 +122,7 @@ url_re = https?://crcns\\.org/.*
authentication_type = none
"""}},
'.git': { "HEAD" : ""}})
-@patch.multiple("platformdirs.AppDirs", site_config_dir=None, user_config_dir=None)
+@patch.multiple("appdirs.AppDirs", site_config_dir=None, user_config_dir=None)
def test_Providers_from_config__files(sysdir=None, userdir=None, dsdir=None):
"""Test configuration file precedence
@@ -146,14 +146,14 @@ def test_Providers_from_config__files(sy
# Test that the system defaults take precedence over the dataset
# defaults (we're still within the dsdir)
- with patch.multiple("platformdirs.AppDirs", site_config_dir=sysdir, user_config_dir=None):
+ with patch.multiple("appdirs.AppDirs", site_config_dir=sysdir, user_config_dir=None):
providers = Providers.from_config_files(reload=True)
provider = providers.get_provider('https://crcns.org/data....')
assert_equal(provider.name, 'syscrcns')
# Test that the user defaults take precedence over the system
# defaults
- with patch.multiple("platformdirs.AppDirs", site_config_dir=sysdir, user_config_dir=userdir):
+ with patch.multiple("appdirs.AppDirs", site_config_dir=sysdir, user_config_dir=userdir):
providers = Providers.from_config_files(reload=True)
provider = providers.get_provider('https://crcns.org/data....')
assert_equal(provider.name, 'usercrcns')
@@ -161,7 +161,7 @@ def test_Providers_from_config__files(sy
@with_tempfile(mkdir=True)
def test_providers_enter_new(path=None):
- with patch.multiple("platformdirs.AppDirs", site_config_dir=None,
+ with patch.multiple("appdirs.AppDirs", site_config_dir=None,
user_config_dir=path):
providers_dir = op.join(path, "providers")
providers = Providers.from_config_files(reload=True)
--- a/datalad/interface/common_cfg.py
+++ b/datalad/interface/common_cfg.py
@@ -19,7 +19,7 @@ from os.path import expanduser
from os.path import join as opj
import time
-from platformdirs import AppDirs
+from appdirs import AppDirs
from datalad.support.constraints import (
EnsureBool,
--- a/datalad/local/run_procedure.py
+++ b/datalad/local/run_procedure.py
@@ -220,10 +220,10 @@ class RunProcedure(Interface):
Directories identified by the configuration settings
- 'datalad.locations.user-procedures' (determined by
- platformdirs.user_config_dir; defaults to '$HOME/.config/datalad/procedures'
+ appdirs.user_config_dir; defaults to '$HOME/.config/datalad/procedures'
on GNU/Linux systems)
- 'datalad.locations.system-procedures' (determined by
- platformdirs.site_config_dir; defaults to '/etc/xdg/datalad/procedures' on
+ appdirs.site_config_dir; defaults to '/etc/xdg/datalad/procedures' on
GNU/Linux systems)
- 'datalad.locations.dataset-procedures'
--- a/datalad/support/cookies.py
+++ b/datalad/support/cookies.py
@@ -11,7 +11,7 @@
import atexit
import logging
import shelve
-import platformdirs
+import appdirs
import os.path
from .network import get_tld
@@ -46,7 +46,7 @@ class CookiesDB(object):
filename = self._filename
cookies_dir = os.path.dirname(filename)
else:
- cookies_dir = os.path.join(platformdirs.user_config_dir(), 'datalad') # FIXME prolly shouldn't hardcode 'datalad'
+ cookies_dir = os.path.join(appdirs.user_config_dir(), 'datalad') # FIXME prolly shouldn't hardcode 'datalad'
filename = os.path.join(cookies_dir, 'cookies')
# TODO: guarantee restricted permissions
--- a/datalad/support/external_versions.py
+++ b/datalad/support/external_versions.py
@@ -182,7 +182,7 @@ class ExternalVersions(object):
}
_INTERESTING = (
'annexremote',
- 'platformdirs',
+ 'appdirs',
'boto',
'git',
'gitdb',
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,6 @@ from _datalad_build_support.setup import
requires = {
'core': [
- 'platformdirs',
'chardet>=3.0.4, <5.0.0', # rarely used but small/omnipresent
'colorama; platform_system=="Windows"',
'distro; python_version >= "3.8"',
|
