diff --git a/pixi.lock b/pixi.lock index a125efe..2b05de2 100644 --- a/pixi.lock +++ b/pixi.lock @@ -5,8 +5,6 @@ environments: - url: https://conda.anaconda.org/conda-forge/ indexes: - https://pypi.org/simple - options: - pypi-prerelease-mode: if-necessary-or-explicit packages: linux-64: - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-20_gnu.conda @@ -544,8 +542,6 @@ environments: - url: https://conda.anaconda.org/conda-forge/ indexes: - https://pypi.org/simple - options: - pypi-prerelease-mode: if-necessary-or-explicit packages: linux-64: - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-20_gnu.conda @@ -2275,6 +2271,7 @@ packages: - sphinx-gallery ; extra == 'docs' - toml ; extra == 'docs' requires_python: '>=3.11,<3.14' + editable: true - pypi: https://files.pythonhosted.org/packages/64/f2/9d779717fd4ff4136d009a8023704f7eb37f2231fbfbe49eb9b430315bcc/easyscience-2.2.0-py3-none-any.whl name: easyscience version: 2.2.0 diff --git a/small_scitiff.tiff b/small_scitiff.tiff deleted file mode 100644 index 5ec25b7..0000000 Binary files a/small_scitiff.tiff and /dev/null differ diff --git a/small_tiff.tiff b/small_tiff.tiff deleted file mode 100644 index b99b895..0000000 Binary files a/small_tiff.tiff and /dev/null differ diff --git a/src/easyimaging/__version__.py b/src/easyimaging/__version__.py index c57bfd5..b8023d8 100644 --- a/src/easyimaging/__version__.py +++ b/src/easyimaging/__version__.py @@ -1 +1 @@ -__version__ = '0.0.0' +__version__ = '0.0.1' diff --git a/tests/small_scitiff.tiff b/tests/small_scitiff.tiff index 13b7abd..5ec25b7 100644 Binary files a/tests/small_scitiff.tiff and b/tests/small_scitiff.tiff differ diff --git a/tests/small_tiff.tiff b/tests/small_tiff.tiff index c9b27f3..b99b895 100644 Binary files a/tests/small_tiff.tiff and b/tests/small_tiff.tiff differ diff --git a/tests/unit_tests/measurement/test_measurement.py b/tests/unit_tests/measurement/test_measurement.py index 3b53ab2..e031bae 100644 --- a/tests/unit_tests/measurement/test_measurement.py +++ b/tests/unit_tests/measurement/test_measurement.py @@ -246,7 +246,9 @@ def test_init_missing_single_physical_coordinate(self, valid_data_array, coordin with pytest.raises(ValueError, match="data array must have both 'x' and 'y' coordinates or neither."): Measurement(data_array=invalid_data_array) - @pytest.mark.parametrize('path', ['small_scitiff.tiff', Path('small_scitiff.tiff')], ids=['str_path', 'Path_object']) + @pytest.mark.parametrize( + 'path', ['tests/small_scitiff.tiff', Path('tests/small_scitiff.tiff')], ids=['str_path', 'Path_object'] + ) def test_from_scitiff_valid(self, path): # When Then measurement = Measurement.from_scitiff(filename=path, unique_name='test_measurement', display_name='Test Measurement') @@ -275,14 +277,14 @@ def test_from_scitiff_non_existent_file(self): def test_from_scitiff_not_a_scitiff(self): # When - path = 'small_tiff.tiff' # This is a regular TIFF, not a SciTIFF + path = 'tests/small_tiff.tiff' # This is a regular TIFF, not a SciTIFF # Then Expect with pytest.raises(RuntimeError, match=f"Tiff file '{path}' not a proper SciTIFF file:"): Measurement.from_scitiff( filename=path, ) - @pytest.mark.parametrize('path', ['small_tiff.tiff', Path('small_tiff.tiff')], ids=['str_path', 'Path_object']) + @pytest.mark.parametrize('path', ['tests/small_tiff.tiff', Path('tests/small_tiff.tiff')], ids=['str_path', 'Path_object']) def test_from_tiff_stack_valid_paths(self, path): # When Then measurement = Measurement.from_tiff_stack( @@ -309,7 +311,7 @@ def test_from_tiff_stack_valid_paths(self, path): def test_from_tiff_stack_valid_time_of_flights(self, coord, expected): # When Then measurement = Measurement.from_tiff_stack( - filename='small_tiff.tiff', + filename='tests/small_tiff.tiff', time_of_flights=coord, ) # Expect @@ -329,7 +331,7 @@ def test_from_tiff_stack_valid_time_of_flights(self, coord, expected): def test_from_tiff_stack_valid_x_positions(self, coord, expected): # When Then measurement = Measurement.from_tiff_stack( - filename='small_tiff.tiff', + filename='tests/small_tiff.tiff', time_of_flights=sc.arange('t', 0, 240, 1, unit='s'), x_positions=coord, y_positions=sc.arange('y', 0, 1020, 20, unit='cm'), @@ -352,7 +354,7 @@ def test_from_tiff_stack_valid_x_positions(self, coord, expected): def test_from_tiff_stack_valid_y_positions(self, coord, expected): # When Then measurement = Measurement.from_tiff_stack( - filename='small_tiff.tiff', + filename='tests/small_tiff.tiff', time_of_flights=sc.arange('t', 0, 240, 1, unit='s'), y_positions=coord, x_positions=sc.arange('x', 0, 510, 10, unit='cm'), @@ -397,7 +399,7 @@ def test_from_tiff_stack_invalid_time_of_flights(self, coord, error, expected_me # When Then Expect with pytest.raises(error, match=expected_message): Measurement.from_tiff_stack( - filename='small_tiff.tiff', + filename='tests/small_tiff.tiff', time_of_flights=coord, ) @@ -422,7 +424,7 @@ def test_from_tiff_stack_invalid_x_positions(self, coord, error, expected_messag # When Then Expect with pytest.raises(error, match=expected_message): Measurement.from_tiff_stack( - filename='small_tiff.tiff', + filename='tests/small_tiff.tiff', time_of_flights=sc.arange('t', 0, 240, 1, unit='s'), x_positions=coord, ) @@ -448,7 +450,7 @@ def test_from_tiff_stack_invalid_y_positions(self, coord, error, expected_messag # When Then Expect with pytest.raises(error, match=expected_message): Measurement.from_tiff_stack( - filename='small_tiff.tiff', + filename='tests/small_tiff.tiff', time_of_flights=sc.arange('t', 0, 240, 1, unit='s'), y_positions=coord, )