PyOptik 1.8.7.post0__tar.gz → 1.8.8.post0__tar.gz

{pyoptik-1.8.7.post0 → pyoptik-1.8.8.post0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyOptik
-Version: 1.8.7.post0
+Version: 1.8.8.post0
 Summary: A package for refractive index values.
 Author-email: Martin Poinsinet de Sivry-Houle <martin.poinsinet.de.sivry@gmail.com>
 License: MIT License
@@ -48,7 +48,6 @@ Provides-Extra: testing
 Requires-Dist: pytest<9.0,>=7.4; extra == "testing"
 Requires-Dist: pytest-cov<6,>=2; extra == "testing"
 Requires-Dist: pytest-json-report~=1.5; extra == "testing"
-Requires-Dist: flake8==7.1.1; extra == "testing"
 Requires-Dist: coverage~=7.6; extra == "testing"
 Provides-Extra: documentation
 Requires-Dist: numpydoc==1.6.0; extra == "documentation"
@@ -56,6 +55,8 @@ Requires-Dist: sphinx>=5.1.1; extra == "documentation"
 Requires-Dist: sphinx-gallery==0.15.0; extra == "documentation"
 Requires-Dist: sphinx-rtd-theme==2.0.0; extra == "documentation"
 Requires-Dist: pydata-sphinx-theme==0.14.1; extra == "documentation"
+Provides-Extra: dev
+Requires-Dist: flake8==7.1.1; extra == "dev"
 
 PyOptik
 =======

{pyoptik-1.8.7.post0 → pyoptik-1.8.8.post0}/PyOptik/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.8.7.post0'
-__version_tuple__ = version_tuple = (1, 8, 7)
+__version__ = version = '1.8.8.post0'
+__version_tuple__ = version_tuple = (1, 8, 8)

{pyoptik-1.8.7.post0 → pyoptik-1.8.8.post0}/PyOptik/material/sellmeier_class.py

@@ -104,7 +104,8 @@ class SellmeierMaterial(BaseMaterial):
         ValueError
             If the wavelength is outside the specified range or if an unsupported formula type is encountered.
         """
-        is_scalar = numpy.isscalar(wavelength)
+        return_as_scalar = numpy.isscalar(wavelength.magnitude)
+
         wavelength = numpy.atleast_1d(wavelength)
         self._check_wavelength(wavelength)
 
@@ -137,7 +138,7 @@ class SellmeierMaterial(BaseMaterial):
             case _:
                 raise ValueError(f"Unsupported formula type: {self.formula_type}")
 
-        return n[0] if is_scalar else n
+        return n[0] if return_as_scalar else n
 
     @BaseMaterial.ensure_units
     def plot(self, wavelength: Optional[Quantity] = None) -> None:

{pyoptik-1.8.7.post0 → pyoptik-1.8.8.post0}/PyOptik/material/tabulated_class.py

@@ -97,12 +97,18 @@ class TabulatedMaterial(BaseMaterial):
         ValueError
             If the wavelength is outside the tabulated range.
         """
+        return_as_scalar = numpy.isscalar(wavelength.magnitude)
+
+        wavelength = numpy.atleast_1d(wavelength)
+
         self._check_wavelength(wavelength)
 
         n_interp = numpy.interp(wavelength.to(meter).magnitude, self.wavelength.to(meter).magnitude, self.n_values)
         k_interp = numpy.interp(wavelength.to(meter).magnitude, self.wavelength.to(meter).magnitude, self.k_values)
 
-        return n_interp + 1j * k_interp
+        index = n_interp + 1j * k_interp
+
+        return index[0] if return_as_scalar else index
 
     @BaseMaterial.ensure_units
     def plot(self, wavelength: Optional[Quantity] = None) -> None:

{pyoptik-1.8.7.post0 → pyoptik-1.8.8.post0}/PyOptik.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyOptik
-Version: 1.8.7.post0
+Version: 1.8.8.post0
 Summary: A package for refractive index values.
 Author-email: Martin Poinsinet de Sivry-Houle <martin.poinsinet.de.sivry@gmail.com>
 License: MIT License
@@ -48,7 +48,6 @@ Provides-Extra: testing
 Requires-Dist: pytest<9.0,>=7.4; extra == "testing"
 Requires-Dist: pytest-cov<6,>=2; extra == "testing"
 Requires-Dist: pytest-json-report~=1.5; extra == "testing"
-Requires-Dist: flake8==7.1.1; extra == "testing"
 Requires-Dist: coverage~=7.6; extra == "testing"
 Provides-Extra: documentation
 Requires-Dist: numpydoc==1.6.0; extra == "documentation"
@@ -56,6 +55,8 @@ Requires-Dist: sphinx>=5.1.1; extra == "documentation"
 Requires-Dist: sphinx-gallery==0.15.0; extra == "documentation"
 Requires-Dist: sphinx-rtd-theme==2.0.0; extra == "documentation"
 Requires-Dist: pydata-sphinx-theme==0.14.1; extra == "documentation"
+Provides-Extra: dev
+Requires-Dist: flake8==7.1.1; extra == "dev"
 
 PyOptik
 =======

{pyoptik-1.8.7.post0 → pyoptik-1.8.8.post0}/PyOptik.egg-info/requires.txt

@@ -7,6 +7,9 @@ pyyaml~=6.0
 MPSPlots~=1.5.1
 tabulate~=0.9
 
+[dev]
+flake8==7.1.1
+
 [documentation]
 numpydoc==1.6.0
 sphinx>=5.1.1
@@ -18,5 +21,4 @@ pydata-sphinx-theme==0.14.1
 pytest<9.0,>=7.4
 pytest-cov<6,>=2
 pytest-json-report~=1.5
-flake8==7.1.1
 coverage~=7.6

{pyoptik-1.8.7.post0 → pyoptik-1.8.8.post0}/meta.yaml

@@ -50,13 +50,9 @@ test:
   imports:
     - PyOptik
   requires:
-    - pint ~= 0.24
     - pytest>=0.6
     - pytest-cov>=2.0
     - pytest-json-report==1.5.0
-    - mypy>=0.910
-    - flake8>=3.9
-    - tox>=3.24
     - coverage==7.6.1
   commands:
     - python -m pytest

{pyoptik-1.8.7.post0 → pyoptik-1.8.8.post0}/pyproject.toml

@@ -48,7 +48,6 @@ testing = [
     "pytest >=7.4,<9.0",
     "pytest-cov >=2,<6",
     "pytest-json-report ~=1.5",
-    "flake8 ==7.1.1",
     "coverage ~=7.6"
 ]
 
@@ -61,6 +60,11 @@ documentation = [
     "pydata-sphinx-theme ==0.14.1",
 ]
 
+dev = [
+    "flake8 ==7.1.1",
+]
+
+
 [tool.pytest.ini_options]
 python_functions = "test*"
 minversion = "6.0"

{pyoptik-1.8.7.post0 → pyoptik-1.8.8.post0}/tests/test_sellmeier.py

@@ -99,7 +99,7 @@ def test_compute_refractive_index():
     material = Material('water')
 
     # Test single wavelength input
-    wavelength = 500e-9 * meter
+    wavelength = [800e-9, 500e-9] * meter
     refractive_index = material.compute_refractive_index(wavelength)
     assert isinstance(refractive_index, np.ndarray)
 
@@ -112,6 +112,22 @@ def test_compute_refractive_index():
     assert refractive_indices.shape == wavelength.shape
 
 
+def test_compute_refractive_index_inputs():
+    """Test computation of refractive index for given wavelengths."""
+    material = Material('water')
+
+    # Test single wavelength input
+    wavelength = 500e-9
+    refractive_index = material.compute_refractive_index(wavelength)
+
+    assert np.isscalar(refractive_index), f"Refractive index [{refractive_index}] should return scalar value when wavelength [{wavelength}] input is scalar"
+
+    wavelength = [500e-9, 800e-9] * meter
+    refractive_index = material.compute_refractive_index(wavelength)
+
+    assert isinstance(refractive_index, np.ndarray), f"Refractive index [{refractive_index}] should return an array when wavelength [{wavelength}] input is an array"
+
+
 def test_invalid_formula_type():
     """Test handling of unsupported material types."""
     with pytest.raises(FileNotFoundError):

{pyoptik-1.8.7.post0 → pyoptik-1.8.8.post0}/tests/test_tabulated.py

@@ -77,6 +77,22 @@ def test_compute_refractive_index():
     assert refractive_indices.shape == wavelengths.shape
 
 
+def test_compute_refractive_index_inputs():
+    """Test computation of refractive index for given wavelengths."""
+    material = TabulatedMaterial('zinc')
+
+    # Test single wavelength input
+    wavelength = 500e-9
+    refractive_index = material.compute_refractive_index(wavelength)
+
+    assert np.isscalar(refractive_index), f"Refractive index [{refractive_index}] should return scalar value when wavelength [{wavelength}] input is scalar"
+
+    wavelength = [500e-9, 800e-9] * meter
+    refractive_index = material.compute_refractive_index(wavelength)
+
+    assert isinstance(refractive_index, np.ndarray), f"Refractive index [{refractive_index}] should return an array when wavelength [{wavelength}] input is an array"
+
+
 @patch("matplotlib.pyplot.show")
 def test_plot(mock_show):
     """Test plotting method of TabulatedMaterial."""