dbdicom 0.2.4__tar.gz → 0.2.6__tar.gz

{dbdicom-0.2.4/src/dbdicom.egg-info → dbdicom-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dbdicom
-Version: 0.2.4
+Version: 0.2.6
 Summary: A pythonic interface for reading and writing DICOM databases
 Author-email: Steven Sourbron <s.sourbron@sheffield.ac.uk>, Ebony Gunwhy <e.gunwhy@sheffield.ac.uk>
 Project-URL: Homepage, https://qib-sheffield.github.io/dbdicom/
@@ -19,7 +19,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: matplotlib
 Requires-Dist: nibabel
-Requires-Dist: numpy<=1.26.4
+Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: pydicom
 Requires-Dist: python-gdcm
@@ -28,29 +28,12 @@ Requires-Dist: importlib-resources
 Requires-Dist: scipy
 Requires-Dist: imageio
 Requires-Dist: vreg
-Provides-Extra: docs
-Requires-Dist: sphinx; extra == "docs"
-Requires-Dist: pydata-sphinx-theme; extra == "docs"
-Requires-Dist: myst-parser; extra == "docs"
-Requires-Dist: sphinx-copybutton; extra == "docs"
-Requires-Dist: sphinx-design; extra == "docs"
-Requires-Dist: sphinx-remove-toctrees; extra == "docs"
-Requires-Dist: autodocsumm; extra == "docs"
-Requires-Dist: docutils; extra == "docs"
-Requires-Dist: sphinxcontrib-applehelp; extra == "docs"
-Requires-Dist: sphinxcontrib-devhelp; extra == "docs"
-Requires-Dist: sphinxcontrib-htmlhelp; extra == "docs"
-Requires-Dist: sphinxcontrib-jsmath; extra == "docs"
-Requires-Dist: sphinxcontrib-qthelp; extra == "docs"
-Requires-Dist: sphinxcontrib-serializinghtml; extra == "docs"
-Requires-Dist: sphinx-gallery; extra == "docs"
 Provides-Extra: extensions
-Requires-Dist: scipy; extra == "extensions"
-Requires-Dist: scikit-image<=0.19.0; extra == "extensions"
-Requires-Dist: SimpleITK-SimpleElastix; extra == "extensions"
+Requires-Dist: scikit-image; extra == "extensions"
 Requires-Dist: itk-elastix; extra == "extensions"
 Requires-Dist: dipy; extra == "extensions"
 Requires-Dist: scikit-learn; extra == "extensions"
+Dynamic: license-file
 
 `dbdicom` is a Pythonic interface for reading and writing DICOM databases.
 

{dbdicom-0.2.4 → dbdicom-0.2.6}/pyproject.toml

@@ -7,11 +7,11 @@ requires = ['setuptools>=61.2']
 
 [project]
 name = "dbdicom"
-version = "0.2.4"
+version = "0.2.6"
 dependencies = [ 
     "matplotlib",
     "nibabel",
-    "numpy<=1.26.4",
+    "numpy",
     "pandas",
     "pydicom", 
     "python-gdcm",
@@ -60,25 +60,25 @@ requires-python = ">=3.6"
 where = ["src"]
 
 [project.optional-dependencies]
-docs = [
-    "sphinx",
-    "pydata-sphinx-theme",
-    "myst-parser", 
-    "sphinx-copybutton",
-    "sphinx-design",
-    "sphinx-remove-toctrees",
-    "autodocsumm",
-    "docutils",
-    "sphinxcontrib-applehelp",
-    "sphinxcontrib-devhelp",
-    "sphinxcontrib-htmlhelp",
-    "sphinxcontrib-jsmath",
-    "sphinxcontrib-qthelp",
-    "sphinxcontrib-serializinghtml",
-    "sphinx-gallery",
-]
+# docs = [
+#     "sphinx",
+#     "pydata-sphinx-theme",
+#     "myst-parser", 
+#     "sphinx-copybutton",
+#     "sphinx-design",
+#     "sphinx-remove-toctrees",
+#     "autodocsumm",
+#     "docutils",
+#     "sphinxcontrib-applehelp",
+#     "sphinxcontrib-devhelp",
+#     "sphinxcontrib-htmlhelp",
+#     "sphinxcontrib-jsmath",
+#     "sphinxcontrib-qthelp",
+#     "sphinxcontrib-serializinghtml",
+#     "sphinx-gallery",
+# ]
 extensions = [
-    "scipy",
+    # "scipy",
     # restricting to the latest stable release for now due to a bug
     # introduced in 0.20.0 that causes executables to crash. The bug is known
     # and a fix will presumably be included in upcoming releases
@@ -88,9 +88,7 @@ extensions = [
     # Note on pyton 3.11 scikit image must be installed as
     # pip install --pre scikit-image<=0.19.0 
     # until a new version is released (0.21.0)
-    "scikit-image<=0.19.0", 
-    #"SimpleITK", "itk-elastix",
-    "SimpleITK-SimpleElastix",
+    "scikit-image", 
     "itk-elastix",
     "dipy",
     "scikit-learn",

{dbdicom-0.2.4 → dbdicom-0.2.6}/src/dbdicom/extensions/skimage.py

@@ -97,7 +97,7 @@ def _volume_features(arr, spacing=[1,1,1], affine=None, show_progress=print):
         slice_spacing = np.linalg.norm(affine[:3, 2])
         spacing = (column_spacing, row_spacing, slice_spacing) 
     voxel_volume = spacing[0]*spacing[1]*spacing[2]
-    nr_of_voxels = np.count_nonzero(array)
+    nr_of_voxels = np.count_nonzero(array > 0.5)
     volume = nr_of_voxels * voxel_volume
     # Surface properties - for now only extracting surface area
     # Note: this is smoothing the surface first - not tested in depth whether this is necessary or helpful.

{dbdicom-0.2.4 → dbdicom-0.2.6/src/dbdicom.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dbdicom
-Version: 0.2.4
+Version: 0.2.6
 Summary: A pythonic interface for reading and writing DICOM databases
 Author-email: Steven Sourbron <s.sourbron@sheffield.ac.uk>, Ebony Gunwhy <e.gunwhy@sheffield.ac.uk>
 Project-URL: Homepage, https://qib-sheffield.github.io/dbdicom/
@@ -19,7 +19,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: matplotlib
 Requires-Dist: nibabel
-Requires-Dist: numpy<=1.26.4
+Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: pydicom
 Requires-Dist: python-gdcm
@@ -28,29 +28,12 @@ Requires-Dist: importlib-resources
 Requires-Dist: scipy
 Requires-Dist: imageio
 Requires-Dist: vreg
-Provides-Extra: docs
-Requires-Dist: sphinx; extra == "docs"
-Requires-Dist: pydata-sphinx-theme; extra == "docs"
-Requires-Dist: myst-parser; extra == "docs"
-Requires-Dist: sphinx-copybutton; extra == "docs"
-Requires-Dist: sphinx-design; extra == "docs"
-Requires-Dist: sphinx-remove-toctrees; extra == "docs"
-Requires-Dist: autodocsumm; extra == "docs"
-Requires-Dist: docutils; extra == "docs"
-Requires-Dist: sphinxcontrib-applehelp; extra == "docs"
-Requires-Dist: sphinxcontrib-devhelp; extra == "docs"
-Requires-Dist: sphinxcontrib-htmlhelp; extra == "docs"
-Requires-Dist: sphinxcontrib-jsmath; extra == "docs"
-Requires-Dist: sphinxcontrib-qthelp; extra == "docs"
-Requires-Dist: sphinxcontrib-serializinghtml; extra == "docs"
-Requires-Dist: sphinx-gallery; extra == "docs"
 Provides-Extra: extensions
-Requires-Dist: scipy; extra == "extensions"
-Requires-Dist: scikit-image<=0.19.0; extra == "extensions"
-Requires-Dist: SimpleITK-SimpleElastix; extra == "extensions"
+Requires-Dist: scikit-image; extra == "extensions"
 Requires-Dist: itk-elastix; extra == "extensions"
 Requires-Dist: dipy; extra == "extensions"
 Requires-Dist: scikit-learn; extra == "extensions"
+Dynamic: license-file
 
 `dbdicom` is a Pythonic interface for reading and writing DICOM databases.
 

dbdicom-0.2.6/src/dbdicom.egg-info/requires.txt

@@ -0,0 +1,17 @@
+matplotlib
+nibabel
+numpy
+pandas
+pydicom
+python-gdcm
+pylibjpeg-libjpeg
+importlib-resources
+scipy
+imageio
+vreg
+
+[extensions]
+scikit-image
+itk-elastix
+dipy
+scikit-learn

dbdicom-0.2.4/src/dbdicom.egg-info/requires.txt

@@ -1,36 +0,0 @@
-matplotlib
-nibabel
-numpy<=1.26.4
-pandas
-pydicom
-python-gdcm
-pylibjpeg-libjpeg
-importlib-resources
-scipy
-imageio
-vreg
-
-[docs]
-sphinx
-pydata-sphinx-theme
-myst-parser
-sphinx-copybutton
-sphinx-design
-sphinx-remove-toctrees
-autodocsumm
-docutils
-sphinxcontrib-applehelp
-sphinxcontrib-devhelp
-sphinxcontrib-htmlhelp
-sphinxcontrib-jsmath
-sphinxcontrib-qthelp
-sphinxcontrib-serializinghtml
-sphinx-gallery
-
-[extensions]
-scipy
-scikit-image<=0.19.0
-SimpleITK-SimpleElastix
-itk-elastix
-dipy
-scikit-learn