vectorose 0.2.2__tar.gz → 0.2.4__tar.gz

{vectorose-0.2.2 → vectorose-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: vectorose
-Version: 0.2.2
+Version: 0.2.4
 Summary: Plot polar and spherical histograms from orientation data.
 License: MIT
 Author: Benjamin Z. Rudski
@@ -17,7 +17,7 @@ Requires-Dist: imageio[ffmpeg,pyav] (>=2.27.0)
 Requires-Dist: importlib-metadata (>=7.0.1)
 Requires-Dist: ipywidgets (>=8.1.5,<9)
 Requires-Dist: matplotlib (>=3.3.4)
-Requires-Dist: numpy (>=1.19.5,<2)
+Requires-Dist: numpy (>=1.19.5)
 Requires-Dist: openpyxl (>=3.1.2,<4)
 Requires-Dist: pandas (>=1.1.3)
 Requires-Dist: pyvista[all,jupyter] (>=0.44.1,<1)
@@ -37,6 +37,12 @@ Description-Content-Type: text/markdown
 Spherical and polar histogram plotting for non-unit vectorial and axial
 data.
 
+[![PyPI - Version](https://img.shields.io/pypi/v/vectorose)](https://pypi.org/project/vectorose/)
+[![codecov](https://codecov.io/github/bzrudski/vectorose/graph/badge.svg)](https://codecov.io/github/bzrudski/vectorose)
+[![docs](https://app.readthedocs.org/projects/vectorose/badge/)](https://vectorose.readthedocs.io/en/latest/)
+[![CI/CD](https://github.com/bzrudski/vectorose/actions/workflows/ci-cd.yml/badge.svg)](https://github.com/bzrudski/vectorose/actions/workflows/ci-cd.yml)
+[![CI - Windows](https://github.com/bzrudski/vectorose/actions/workflows/ci-win.yml/badge.svg)](https://github.com/bzrudski/vectorose/actions/workflows/ci-win.yml)
+
 ## Overview
 
 Many fields of science rely on oriented data. In these contexts, scalar

{vectorose-0.2.2 → vectorose-0.2.4}/README.md

@@ -5,6 +5,12 @@
 Spherical and polar histogram plotting for non-unit vectorial and axial
 data.
 
+[![PyPI - Version](https://img.shields.io/pypi/v/vectorose)](https://pypi.org/project/vectorose/)
+[![codecov](https://codecov.io/github/bzrudski/vectorose/graph/badge.svg)](https://codecov.io/github/bzrudski/vectorose)
+[![docs](https://app.readthedocs.org/projects/vectorose/badge/)](https://vectorose.readthedocs.io/en/latest/)
+[![CI/CD](https://github.com/bzrudski/vectorose/actions/workflows/ci-cd.yml/badge.svg)](https://github.com/bzrudski/vectorose/actions/workflows/ci-cd.yml)
+[![CI - Windows](https://github.com/bzrudski/vectorose/actions/workflows/ci-win.yml/badge.svg)](https://github.com/bzrudski/vectorose/actions/workflows/ci-win.yml)
+
 ## Overview
 
 Many fields of science rely on oriented data. In these contexts, scalar

{vectorose-0.2.2 → vectorose-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "vectorose"
-version = "0.2.2"
+version = "0.2.4"
 description = "Plot polar and spherical histograms from orientation data."
 authors = [
     {name = "Benjamin Z. Rudski", email = "benjamin.rudski@mail.mcgill.ca"},
@@ -10,7 +10,7 @@ license = "MIT"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "numpy (>=1.19.5, <2)",
+    "numpy>=1.19.5",
     "matplotlib>=3.3.4",
     "pandas>=1.1.3",
     "openpyxl (>=3.1.2, <4)",

{vectorose-0.2.2 → vectorose-0.2.4}/src/vectorose/io.py

@@ -311,8 +311,8 @@ def import_vector_field(
                 -1, d
             )
 
-            # Remove any rows containing NaN
-            vector_field = vector_field[~np.any(np.isnan(vector_field), axis=1)]
+        # Remove any rows containing NaN
+        vector_field = vector_field[~np.any(np.isnan(vector_field), axis=1)]
 
     # Use Pandas in the other cases
     else:

{vectorose-0.2.2 → vectorose-0.2.4}/src/vectorose/polar_data.py

@@ -253,7 +253,9 @@ class PolarDiscretiser:
             bins = self._theta_bins
 
         # Count the vectors in each bin
-        counts = labelled_vectors.groupby(bin_assignment_column).apply(len)
+        counts = labelled_vectors.groupby(bin_assignment_column).apply(
+            len, include_groups=False
+        )
         counts.name = "count"
 
         # Normalise to get the frequencies
@@ -261,7 +263,6 @@ class PolarDiscretiser:
         frequencies = counts / number_of_vectors
         frequencies.name = "frequency"
 
-
         # Combine everything to get a nice histogram
         counts = counts.reindex(index=bins.index, fill_value=0)
         frequencies = frequencies.reindex(index=bins.index, fill_value=0)
@@ -312,4 +313,3 @@ class PolarDiscretiser:
         angle_name = util.AngleName.THETA
 
         return self._construct_histogram(labelled_vectors, angle_name)
-

{vectorose-0.2.2 → vectorose-0.2.4}/src/vectorose/sphere_base.py

@@ -150,7 +150,9 @@ class SphereBase(abc.ABC):
 
         return processed_vector_data
 
-    def _initial_vector_component_preparation(self, vectors: pd.DataFrame) -> pd.DataFrame:
+    def _initial_vector_component_preparation(
+        self, vectors: pd.DataFrame
+    ) -> pd.DataFrame:
         """Prepare the vector components for histogram construction.
 
         Override this method to include specific operations that should be
@@ -331,7 +333,9 @@ class SphereBase(abc.ABC):
         grouping_columns = self.hist_group_cols
 
         # Use groupby to perform the grouping
-        original_histogram = binned_data.groupby(grouping_columns).apply(len)
+        original_histogram = binned_data.groupby(grouping_columns).apply(
+            len, include_groups=False
+        )
 
         # Modify the index to account for any missing bins.
         multi_index = self._construct_histogram_index()
@@ -379,7 +383,9 @@ class SphereBase(abc.ABC):
         """
 
         # Group based only on the magnitude bin
-        counts_by_shell = binned_data.groupby(self.magnitude_shell_cols).apply(len)
+        counts_by_shell = binned_data.groupby(self.magnitude_shell_cols).apply(
+            len, include_groups=False
+        )
 
         # Construct the index (in case some bins are zero).
         magnitude_index = self._construct_magnitude_index()
@@ -428,7 +434,9 @@ class SphereBase(abc.ABC):
         """
 
         # Group based on only the orientation data
-        counts_by_orientation = binned_data.groupby(self.orientation_cols).apply(len)
+        counts_by_orientation = binned_data.groupby(self.orientation_cols).apply(
+            len, include_groups=False
+        )
 
         # Construct the index (in case some orientations are zero).
         orientation_index = self._construct_orientation_index()
@@ -507,8 +515,8 @@ class SphereBase(abc.ABC):
         pandas.Series
             The proportion of vectors in each magnitude shell relative to
             all vectors having that orientation. The index used is the
-            reverse of that obtained in the bivariate case, having the
-            orientation parameters first and the magnitude second.
+            same as that obtained in the bivariate case, having the
+            magnitude first, followed by the orientation parameters.
 
         Warnings
         --------
@@ -651,8 +659,10 @@ class SphereBase(abc.ABC):
 
     @abc.abstractmethod
     def convert_vectors_to_cartesian_array(
-        self, labelled_vectors: pd.DataFrame, create_unit_vectors: bool = False,
-        include_spatial_locations: bool = False
+        self,
+        labelled_vectors: pd.DataFrame,
+        create_unit_vectors: bool = False,
+        include_spatial_locations: bool = False,
     ) -> np.ndarray:
         """Convert a set of labelled vectors into Cartesian coordinates.
 

{vectorose-0.2.2 → vectorose-0.2.4}/src/vectorose/stats.py

@@ -143,7 +143,7 @@ def compute_orientation_matrix(
 
 def compute_orientation_matrix_eigs(
     vector_field: np.ndarray,
-) -> np.linalg.linalg.EigResult:
+) -> NamedTuple:
     """Compute the eigenvectors and eigenvalues of the orientation matrix.
 
     Compute the eigen-decomposition of the orientation matrix. This
@@ -159,8 +159,10 @@ def compute_orientation_matrix_eigs(
 
     Returns
     -------
-    numpy.linalg.linalg.EigResult
-        Eigenvectors and eigenvalues of the orientation matrix.
+    eigenvectors : numpy.ndarray
+        Eigenvectors of the orientation matrix.
+    eigenvalues : numpy.ndarray
+         Eigenvalues of the orientation matrix.
 
     Notes
     -----

{vectorose-0.2.2 → vectorose-0.2.4}/src/vectorose/tregenza_sphere.py

@@ -334,7 +334,9 @@ class TregenzaSphere(SphereBase):
         ring_weights = self._rings.loc[:, "weight"]
         original_index = histogram.index
         weighted_face_data = (
-            histogram.groupby("ring", group_keys=False).apply(lambda x: x)
+            histogram.groupby("ring", group_keys=False).apply(
+                lambda x: x, include_groups=False
+            )
             * ring_weights
         )
         weighted_face_data = weighted_face_data.reindex(original_index)