Skip to content

Commit 70afc40

Browse files
author
Andrei Neagu
committed
renamed modules
1 parent b835ae0 commit 70afc40

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

packages/aws-library/tests/test_s3_client.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@
6060
)
6161
from pytest_simcore.helpers.typing_env import EnvVarsDict
6262
from servicelib.archiving_utils import unarchive_dir
63-
from servicelib.file_utils import remove_directory
64-
from servicelib.progress_bar import ProgressBarData
65-
from servicelib.utils import limited_as_completed, limited_gather
66-
from servicelib.zip_stream import (
63+
from servicelib.data_streams import (
6764
ArchiveEntries,
6865
DiskStreamReader,
69-
get_zip_archive_file_stream,
66+
get_zip_data_stream,
7067
)
71-
from servicelib.zip_stream._models import DataSize
68+
from servicelib.data_streams._models import DataSize
69+
from servicelib.file_utils import remove_directory
70+
from servicelib.progress_bar import ProgressBarData
71+
from servicelib.utils import limited_as_completed, limited_gather
7272
from settings_library.s3 import S3Settings
7373
from types_aiobotocore_s3 import S3Client
7474
from types_aiobotocore_s3.literals import BucketLocationConstraintType
@@ -1596,7 +1596,7 @@ async def test_workflow_compress_s3_objects_and_local_files_in_a_single_archive_
15961596
await simcore_s3_api.upload_object_from_file_stream(
15971597
with_s3_bucket,
15981598
archive_s3_object_key,
1599-
get_zip_archive_file_stream(
1599+
get_zip_data_stream(
16001600
archive_file_entries,
16011601
progress_bar=progress_bar,
16021602
chunk_size=MULTIPART_COPY_THRESHOLD,

packages/service-library/src/servicelib/zip_stream/__init__.py renamed to packages/service-library/src/servicelib/data_streams/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
from ._input import DiskStreamReader
33
from ._models import ArchiveEntries, ArchiveFileEntry, StreamData
44
from ._output import DiskStreamWriter
5-
from ._zipper import get_zip_archive_file_stream
5+
from ._zipper import get_zip_data_stream
66

77
__all__: tuple[str, ...] = (
88
"ArchiveEntries",
99
"ArchiveFileEntry",
1010
"DEFAULT_READ_CHUNK_SIZE",
1111
"DiskStreamReader",
1212
"DiskStreamWriter",
13-
"get_zip_archive_file_stream",
13+
"get_zip_data_stream",
1414
"StreamData",
1515
)

packages/service-library/src/servicelib/zip_stream/_zipper.py renamed to packages/service-library/src/servicelib/data_streams/_zipper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ async def _member_files_iter(
2222
)
2323

2424

25-
async def get_zip_archive_file_stream(
25+
async def get_zip_data_stream(
2626
archive_files: ArchiveEntries,
2727
*,
2828
progress_bar: ProgressBarData | None = None,

packages/service-library/tests/test_zip_stream.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
get_relative_to,
1616
)
1717
from servicelib.archiving_utils import unarchive_dir
18-
from servicelib.file_utils import remove_directory
19-
from servicelib.progress_bar import ProgressBarData
20-
from servicelib.s3_utils import FileLikeFileStreamReader
21-
from servicelib.zip_stream import (
18+
from servicelib.data_streams import (
2219
ArchiveEntries,
2320
DiskStreamReader,
2421
DiskStreamWriter,
25-
get_zip_archive_file_stream,
22+
get_zip_data_stream,
2623
)
24+
from servicelib.file_utils import remove_directory
25+
from servicelib.progress_bar import ProgressBarData
26+
from servicelib.s3_utils import FileLikeFileStreamReader
2727

2828

2929
def _ensure_dir(path: Path) -> Path:
@@ -116,7 +116,7 @@ async def test_get_zip_archive_file_stream(
116116
progress_report_cb=mocked_progress_bar_cb,
117117
description="root_bar",
118118
) as root:
119-
file_stream = get_zip_archive_file_stream(
119+
file_stream = get_zip_data_stream(
120120
archive_files, progress_bar=root, chunk_size=1024
121121
)
122122

0 commit comments

Comments
 (0)