diff --git a/metrics/coverage_high_water_mark b/metrics/coverage_high_water_mark index 37345c19f..d73d22ee6 100644 --- a/metrics/coverage_high_water_mark +++ b/metrics/coverage_high_water_mark @@ -1 +1 @@ -93.5700 \ No newline at end of file +93.5600 \ No newline at end of file diff --git a/metrics/mypy_high_water_mark b/metrics/mypy_high_water_mark index a83cfd41b..d08d255b7 100644 --- a/metrics/mypy_high_water_mark +++ b/metrics/mypy_high_water_mark @@ -1 +1 @@ -92.3400 \ No newline at end of file +92.3300 \ No newline at end of file diff --git a/records_mover/records/targets/data_url.py b/records_mover/records/targets/data_url.py index 1a85d452f..93cca4e25 100644 --- a/records_mover/records/targets/data_url.py +++ b/records_mover/records/targets/data_url.py @@ -1,8 +1,6 @@ from ..results import MoveResult from ..records_directory import RecordsDirectory from .base import (SupportsMoveFromDataframes, - SupportsMoveFromTempLocAfterFillingIt, - SupportsMoveToRecordsDirectory, SupportsMoveFromRecordsDirectory) from ..processing_instructions import ProcessingInstructions from ...url.base import BaseFileUrl @@ -16,7 +14,6 @@ class DataUrlTarget(SupportsMoveFromDataframes, - SupportsMoveFromTempLocAfterFillingIt, SupportsMoveFromRecordsDirectory): def __init__(self, output_loc: BaseFileUrl, @@ -63,25 +60,6 @@ def move_from_records_directory(self, records_format.generate_filename('data'): self.output_loc.url }) - def move_from_temp_loc_after_filling_it(self, - records_source: - SupportsMoveToRecordsDirectory, - processing_instructions: - ProcessingInstructions) -> MoveResult: - pis = processing_instructions - records_format = records_source.compatible_format(self) - if records_format is None: - raise NotImplementedError("No compatible records format between " - f"{records_source} and {self}") - with self.output_loc.temporary_directory() as temp_loc: - directory = RecordsDirectory(records_loc=temp_loc) - records_source.\ - move_to_records_directory(directory, - records_format=records_format, - processing_instructions=pis) - return self.move_from_records_directory(directory, - processing_instructions) - def can_move_from_this_format(self, source_records_format: BaseRecordsFormat) -> bool: if self.records_format is None: diff --git a/tests/unit/records/targets/test_data_url.py b/tests/unit/records/targets/test_data_url.py index 471257a84..ca6471a4f 100644 --- a/tests/unit/records/targets/test_data_url.py +++ b/tests/unit/records/targets/test_data_url.py @@ -113,38 +113,3 @@ def test_move_from_records_directory(self, mock_MoveResult): }) mock_records_format.generate_filename.assert_called_with('data') self.assertEqual(out, mock_MoveResult.return_value) - - @patch('records_mover.records.targets.data_url.isinstance') - @patch('records_mover.records.targets.data_url.RecordsDirectory') - @patch('records_mover.records.targets.data_url.DelimitedRecordsFormat') - def test_move_from_temp_loc_after_filling_it(self, - mock_DelimitedRecordsFormat, - mock_RecordsDirectory, - mock_isinstance): - mock_output_url = 'whatever://foo/foo.csv' - mock_output_loc = MagicMock(name='output_loc', spec=BaseFileUrl) - mock_output_loc.url = mock_output_url - mock_default_records_format = mock_DelimitedRecordsFormat.return_value - mock_records_format = mock_default_records_format.alter_hints.return_value - data_url_target = DataUrlTarget(output_loc=mock_output_loc, - records_format=None) - - mock_records_source = Mock(name='records_source') - mock_records_format = mock_records_source.compatible_format.return_value - mock_processing_instructions = Mock(name='processing_instructions') - mock_pis = mock_processing_instructions - mock_temp_loc = mock_output_loc.temporary_directory.return_value.__enter__.return_value - mock_directory = mock_RecordsDirectory.return_value - mock_directory.load_format.return_value = mock_records_format - - out = data_url_target.move_from_temp_loc_after_filling_it(mock_records_source, - mock_processing_instructions) - mock_RecordsDirectory.assert_called_with(records_loc=mock_temp_loc) - mock_records_source.move_to_records_directory.\ - assert_called_with(mock_directory, - records_format=mock_records_format, - processing_instructions=mock_pis) - - mock_filename = mock_records_format.generate_filename.return_value - self.assertEqual(out.move_count, None) - self.assertEqual(out.output_urls, {mock_filename: mock_output_loc.url})