From e3effa06b156cee1eac777555040def03f85aabe Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 8 Nov 2023 10:02:48 -0500 Subject: [PATCH 1/5] Remove commented-out flake8 config line --- setup.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index f25d4a2c8..1d62b8c17 100644 --- a/setup.cfg +++ b/setup.cfg @@ -105,7 +105,6 @@ 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* From 814b0b22415caa32e7b13678db6efe89d5c6a842 Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 8 Nov 2023 10:06:11 -0500 Subject: [PATCH 2/5] Remove unused flake8 exclusions --- setup.cfg | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index 1d62b8c17..a17801615 100644 --- a/setup.cfg +++ b/setup.cfg @@ -106,10 +106,7 @@ console_scripts = [flake8] max-line-length = 100 ignore = E203,W503 -exclude = - *sphinx* - dandi/externals/* - .tox/ +extend-exclude = _version.py versioneer.py per-file-ignores = From 5026a2b4f69b466c4d094d6fba982b24ab58b8b4 Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 8 Nov 2023 10:07:43 -0500 Subject: [PATCH 3/5] Remove the need for a flake8 per-file-ignore --- dandi/dandiarchive.py | 5 +++-- setup.cfg | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dandi/dandiarchive.py b/dandi/dandiarchive.py index ebbd6d96b..4589b4ea9 100644 --- a/dandi/dandiarchive.py +++ b/dandi/dandiarchive.py @@ -476,7 +476,7 @@ def get_asset_download_path(self, asset: BaseRemoteAsset) -> str: return asset.path.lstrip("/") def is_under_download_path(self, path: str) -> bool: - # cf. + # cf. # noqa: E501 return bool( re.fullmatch(re.escape(self.path).replace(r"\*", ".*"), path, flags=re.I) ) @@ -573,7 +573,8 @@ class _dandi_url_parser: flags=re.I, ), {"handle_redirect": "pass"}, - "https://identifiers.org/DANDI:[/] ( cannot be 'draft')", + "https://identifiers.org/DANDI:[/]" + " ( cannot be 'draft')", ), ( re.compile( diff --git a/setup.cfg b/setup.cfg index a17801615..1a6356ab7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -109,10 +109,6 @@ ignore = E203,W503 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 From 2e3819b3a2516005a96b5561a7dc42b2361c7690 Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 8 Nov 2023 10:08:10 -0500 Subject: [PATCH 4/5] The bids code is gone, so we don't need to omit it from coverage --- tox.ini | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tox.ini b/tox.ini index 248f5fdd1..6b316ce2f 100644 --- a/tox.ini +++ b/tox.ini @@ -71,10 +71,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 From 3b5edb7f202718e060efbc9d825432ec2bf9030c Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 8 Nov 2023 10:10:26 -0500 Subject: [PATCH 5/5] Remove unused Makefile --- Makefile | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 5de6cfc0f..000000000 --- a/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -PYTHON ?= python3 - -all: - echo "Nothing by default" - -release-pypi: - # better safe than sorry - test ! -e dist - $(PYTHON) setup.py sdist - $(PYTHON) setup.py bdist_wheel - twine upload dist/*