From 929227dc0dd4f8e752b568d4fb43b593038d3f5e Mon Sep 17 00:00:00 2001 From: Zvi Baratz Date: Sun, 1 Jan 2023 07:57:12 +0200 Subject: [PATCH 1/3] STY: Apply TOML formatting. --- pyproject.toml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d7a9092e98..8909ff9663 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,22 +49,22 @@ dicom = ["pydicom >=1.0.0"] dicomfs = ["nibabel[dicom]", "pillow"] dev = ["gitpython", "twine"] doc = [ - "matplotlib >= 1.5.3", - "numpydoc", - "sphinx ~= 5.3", - "texext", - "tomli; python_version < \"3.11\"", + "matplotlib >= 1.5.3", + "numpydoc", + "sphinx ~= 5.3", + "texext", + "tomli; python_version < \"3.11\"", ] minc2 = ["h5py"] spm = ["scipy"] style = ["flake8"] test = [ - "coverage", - "pytest !=5.3.4", - "pytest-cov", - "pytest-doctestplus", - "pytest-httpserver", - "pytest-xdist", + "coverage", + "pytest !=5.3.4", + "pytest-cov", + "pytest-doctestplus", + "pytest-httpserver", + "pytest-xdist", ] zstd = ["pyzstd >= 0.14.3"] doctest = ["nibabel[doc,test]"] From 34b096d9973e0a0a2e995a96632e39ea78798054 Mon Sep 17 00:00:00 2001 From: Zvi Baratz Date: Sun, 1 Jan 2023 08:03:37 +0200 Subject: [PATCH 2/3] STY: Added style dependencies to dev dependencies and organized installation modifiers. --- pyproject.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 8909ff9663..95c19a9dd0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,9 +45,10 @@ nib-roi = "nibabel.cmdline.roi:main" parrec2nii = "nibabel.cmdline.parrec2nii:main" [project.optional-dependencies] +all = ["nibabel[dicomfs,dev,doc,minc2,spm,style,test,zstd]"] +dev = ["gitpython", "twine", "nibabel[style]"] dicom = ["pydicom >=1.0.0"] dicomfs = ["nibabel[dicom]", "pillow"] -dev = ["gitpython", "twine"] doc = [ "matplotlib >= 1.5.3", "numpydoc", @@ -55,9 +56,10 @@ doc = [ "texext", "tomli; python_version < \"3.11\"", ] +doctest = ["nibabel[doc,test]"] minc2 = ["h5py"] spm = ["scipy"] -style = ["flake8"] +style = ["flake8", "blue", "isort"] test = [ "coverage", "pytest !=5.3.4", @@ -67,8 +69,6 @@ test = [ "pytest-xdist", ] zstd = ["pyzstd >= 0.14.3"] -doctest = ["nibabel[doc,test]"] -all = ["nibabel[dicomfs,dev,doc,minc2,spm,style,test,zstd]"] [tool.setuptools] platforms = ["OS Independent"] From e9c0b2886cd9a4826f1997b13cc0356580ea9c4e Mon Sep 17 00:00:00 2001 From: Zvi Baratz Date: Sun, 1 Jan 2023 08:06:38 +0200 Subject: [PATCH 3/3] STY: Switched single to double quotes to conform with the rest of the file. --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 95c19a9dd0..3e1ba04449 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -83,13 +83,13 @@ nibabel = ["tests/data/*", "*/tests/data/*", "benchmarks/pytest.benchmark.ini"] [tool.blue] line_length = 99 -target-version = ['py37'] -extend-exclude = ''' +target-version = ["py37"] +extend-exclude = """ ( _version.py | nibabel/externals/ ) -''' +""" [tool.isort] profile = "black"