Skip to content

Commit

Permalink
Merge pull request #1346 from dandi/clean-config
Browse files Browse the repository at this point in the history
Remove unused configuration settings
  • Loading branch information
yarikoptic authored Nov 17, 2023
2 parents 88cce6b + 3b5edb7 commit 39c70ea
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 26 deletions.
11 changes: 0 additions & 11 deletions Makefile

This file was deleted.

5 changes: 3 additions & 2 deletions dandi/dandiarchive.py
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ def get_asset_download_path(self, asset: BaseRemoteAsset) -> str:
return asset.path.lstrip("/")

def is_under_download_path(self, path: str) -> bool:
# cf. <https://github.com/dandi/dandi-archive/blob/185a583b505bcb0ca990758b26210cd09228e81b/dandiapi/api/views/asset.py#L403-L409>
# cf. <https://github.com/dandi/dandi-archive/blob/185a583b505bcb0ca990758b26210cd09228e81b/dandiapi/api/views/asset.py#L403-L409> # noqa: E501
return bool(
re.fullmatch(re.escape(self.path).replace(r"\*", ".*"), path, flags=re.I)
)
Expand Down Expand Up @@ -587,7 +587,8 @@ class _dandi_url_parser:
flags=re.I,
),
{"handle_redirect": "pass"},
"https://identifiers.org/DANDI:<dandiset id>[/<version id>] (<version id> cannot be 'draft')",
"https://identifiers.org/DANDI:<dandiset id>[/<version id>]"
" (<version id> cannot be 'draft')",
),
(
re.compile(
Expand Down
10 changes: 1 addition & 9 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -105,18 +105,10 @@ console_scripts =

[flake8]
max-line-length = 100
#ignore = D100,D101,D102,D103,D104,D105,D200,D201,D202,D204,D205,D208,D209,D210,D300,D301,D400,D401,D403,E24,E121,E123,E126,E226,E266,E402,E704,E731,F821,I100,I101,I201,N802,N803,N804,N806,W503,W504,W605
ignore = E203,W503
exclude =
*sphinx*
dandi/externals/*
.tox/
extend-exclude =
_version.py
versioneer.py
per-file-ignores =
# The parse_dandi_url() docstring contains some long lines we can't do
# anything about.
dandi/dandiarchive.py:E501

[versioneer]
VCS = git
Expand Down
4 changes: 0 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@ filterwarnings =
[coverage:run]
parallel = True
source = dandi
omit =
# omit bundled libs from bids-specification
*/support/bids/schema.py
*/support/bids/utils.py

[coverage:report]
precision = 2
Expand Down

0 comments on commit 39c70ea

Please sign in to comment.