From 331169ebc33511cb34a988d236237521974d88e7 Mon Sep 17 00:00:00 2001 From: dvm-shlee Date: Wed, 5 Jul 2023 17:14:21 -0400 Subject: [PATCH 1/6] pypi 0.3.11 --- README.md | 2 +- brkraw/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 04a3431..19a2793 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/BrkRaw/tutorials/master) ## BrkRaw: A comprehensive tool to access raw Bruker Biospin MRI data -#### Version: 0.3.8 +#### Version: 0.3.11 ### Description diff --git a/brkraw/__init__.py b/brkraw/__init__.py index b5d6a9d..ac274a9 100644 --- a/brkraw/__init__.py +++ b/brkraw/__init__.py @@ -1,6 +1,6 @@ from .lib import * -__version__ = '0.3.10' +__version__ = '0.3.11' __all__ = ['BrukerLoader', '__version__'] From 89f266f6699ac100928e2160f57fa92cf60e4658 Mon Sep 17 00:00:00 2001 From: dvm-shlee Date: Wed, 31 Jan 2024 18:50:06 -0500 Subject: [PATCH 2/6] setuptools, dynamic version update for packaging --- pyproject.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ad6c3d6..87285d2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,7 @@ dependencies = [ ] description = "Bruker PvDataset Loader" license = {text = "GNLv3"} -version = "0.3.10" +dynamic = ["version"] maintainers = [{name = "SungHo Lee", email = 'shlee@unc.edu'}] name = "brkraw" readme = "README.md" @@ -40,6 +40,9 @@ dev = [ "nbmake" ] +[tool.setuptools.dynamic] +version = {attr = "nordic.__version__"} + [project.scripts] brkraw = "brkraw.scripts.brkraw:main" brk-backup = 'brkraw.scripts.brk_backup:main' \ No newline at end of file From a0d3d906008b8d383ff1e1cfe4c3e447dea86f99 Mon Sep 17 00:00:00 2001 From: dvm-shlee Date: Wed, 31 Jan 2024 19:03:51 -0500 Subject: [PATCH 3/6] install SimpleITK on test --- .github/workflows/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2e065ad..8431199 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -72,6 +72,10 @@ jobs: python -m pip install --upgrade pip pip install .[dev] + - name: Install optional dependencies for ITK dataset + run: | + pip install .[SimpleITK] + - name: Install tutorial run: make tests/tutorials From 02e68fa0ae72d9ea274e58163f99128fc8735647 Mon Sep 17 00:00:00 2001 From: SungHo Lee Date: Wed, 31 Jan 2024 19:35:45 -0500 Subject: [PATCH 4/6] Revert "Minor update" --- .github/workflows/test.yml | 4 ---- README.md | 2 +- brkraw/__init__.py | 2 +- pyproject.toml | 5 +---- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8431199..2e065ad 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -72,10 +72,6 @@ jobs: python -m pip install --upgrade pip pip install .[dev] - - name: Install optional dependencies for ITK dataset - run: | - pip install .[SimpleITK] - - name: Install tutorial run: make tests/tutorials diff --git a/README.md b/README.md index 19a2793..04a3431 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/BrkRaw/tutorials/master) ## BrkRaw: A comprehensive tool to access raw Bruker Biospin MRI data -#### Version: 0.3.11 +#### Version: 0.3.8 ### Description diff --git a/brkraw/__init__.py b/brkraw/__init__.py index ac274a9..b5d6a9d 100644 --- a/brkraw/__init__.py +++ b/brkraw/__init__.py @@ -1,6 +1,6 @@ from .lib import * -__version__ = '0.3.11' +__version__ = '0.3.10' __all__ = ['BrukerLoader', '__version__'] diff --git a/pyproject.toml b/pyproject.toml index 87285d2..ad6c3d6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,7 @@ dependencies = [ ] description = "Bruker PvDataset Loader" license = {text = "GNLv3"} -dynamic = ["version"] +version = "0.3.10" maintainers = [{name = "SungHo Lee", email = 'shlee@unc.edu'}] name = "brkraw" readme = "README.md" @@ -40,9 +40,6 @@ dev = [ "nbmake" ] -[tool.setuptools.dynamic] -version = {attr = "nordic.__version__"} - [project.scripts] brkraw = "brkraw.scripts.brkraw:main" brk-backup = 'brkraw.scripts.brk_backup:main' \ No newline at end of file From 6ff8bfcf998f42291cab8e6d4a5aeb919b6bb9cb Mon Sep 17 00:00:00 2001 From: dvm-shlee Date: Wed, 31 Jan 2024 21:01:37 -0500 Subject: [PATCH 5/6] updated version string --- README.md | 2 +- brkraw/__init__.py | 2 +- pyproject.toml | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 04a3431..19a2793 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/BrkRaw/tutorials/master) ## BrkRaw: A comprehensive tool to access raw Bruker Biospin MRI data -#### Version: 0.3.8 +#### Version: 0.3.11 ### Description diff --git a/brkraw/__init__.py b/brkraw/__init__.py index b5d6a9d..ac274a9 100644 --- a/brkraw/__init__.py +++ b/brkraw/__init__.py @@ -1,6 +1,6 @@ from .lib import * -__version__ = '0.3.10' +__version__ = '0.3.11' __all__ = ['BrukerLoader', '__version__'] diff --git a/pyproject.toml b/pyproject.toml index ad6c3d6..1b1ece0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,7 @@ dependencies = [ ] description = "Bruker PvDataset Loader" license = {text = "GNLv3"} -version = "0.3.10" +dynamic = ["version"] maintainers = [{name = "SungHo Lee", email = 'shlee@unc.edu'}] name = "brkraw" readme = "README.md" @@ -40,6 +40,10 @@ dev = [ "nbmake" ] +[tool.hatch.version] +path = "brkraw/__init__.py" +style = "pep440" + [project.scripts] brkraw = "brkraw.scripts.brkraw:main" brk-backup = 'brkraw.scripts.brk_backup:main' \ No newline at end of file From 913193f26dcc9536335ce53f21fc135ebf9e94d8 Mon Sep 17 00:00:00 2001 From: dvm-shlee Date: Wed, 31 Jan 2024 21:02:18 -0500 Subject: [PATCH 6/6] removed a line and add optional dependency for test actions --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2e065ad..fd6b980 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -71,11 +71,11 @@ jobs: run: | python -m pip install --upgrade pip pip install .[dev] + pip install .[SimpleITK] - name: Install tutorial run: make tests/tutorials - name: Test tutorial notebook run: | - python -m pytest --nbmake tests/tutorials/JupyterNotebooks/01_GettingStarted.ipynb - tree tests/tutorials/raw \ No newline at end of file + python -m pytest --nbmake tests/tutorials/JupyterNotebooks/01_GettingStarted.ipynb \ No newline at end of file