Skip to content

Commit

Permalink
Merge branch 'fix/pagination' into rogues/python3.8
Browse files Browse the repository at this point in the history
  • Loading branch information
TrevorBurgoyne committed Oct 25, 2024
2 parents 99ee2d0 + d71bf7a commit ac57036
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions S3MP/_version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""Semantic versioning for S3MP."""
"""Semantic versioning for s3mp."""

__version__ = "0.5.3"
__version__ = "1.0.0"
4 changes: 2 additions & 2 deletions S3MP/async_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

import aioboto3

from S3MP.global_config import S3MPConfig
from S3MP.mirror_path import MirrorPath
from s3mp.global_config import S3MPConfig
from s3mp.mirror_path import MirrorPath


async def async_upload_from_mirror(mirror_path: MirrorPath):
Expand Down
6 changes: 3 additions & 3 deletions S3MP/callbacks.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

import tqdm

from S3MP.global_config import S3MPConfig
from S3MP.mirror_path import MirrorPath
from S3MP.types import S3Resource, SList
from s3mp.global_config import S3MPConfig
from s3mp.mirror_path import MirrorPath
from s3mp.types import S3Resource, SList


class FileSizeTQDMCallback(tqdm.tqdm):
Expand Down
6 changes: 3 additions & 3 deletions S3MP/global_config.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Set global values for S3MP module."""
"""Set global values for s3mp module."""
import tempfile
from configparser import ConfigParser
from dataclasses import dataclass
Expand All @@ -7,7 +7,7 @@

import boto3

from S3MP.types import S3Bucket, S3Client, S3Resource, S3TransferConfig
from s3mp.types import S3Bucket, S3Client, S3Resource, S3TransferConfig


def get_config_file_path() -> Path:
Expand All @@ -30,7 +30,7 @@ def __call__(cls, *args, **kwargs):

@dataclass
class S3MPConfig(metaclass=Singleton):
"""Singleton class for S3MP globals."""
"""Singleton class for s3mp globals."""

# Boto3 Objects
_s3_client: S3Client = None
Expand Down
2 changes: 1 addition & 1 deletion S3MP/keys.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from enum import Enum
from typing import List, Tuple

from S3MP.prefix_queries import get_files_within_folder, get_folders_within_folder
from s3mp.prefix_queries import get_files_within_folder, get_folders_within_folder


@dataclass
Expand Down
8 changes: 4 additions & 4 deletions S3MP/mirror_path.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
import psutil
from tqdm import tqdm

from S3MP.global_config import S3MPConfig
from S3MP.keys import KeySegment, get_matching_s3_keys
from S3MP.utils.local_file_utils import (
from s3mp.global_config import S3MPConfig
from s3mp.keys import KeySegment, get_matching_s3_keys
from s3mp.utils.local_file_utils import (
DEFAULT_LOAD_LEDGER,
DEFAULT_SAVE_LEDGER,
delete_local_path,
)
from S3MP.utils.s3_utils import (
from s3mp.utils.s3_utils import (
delete_key_on_s3,
download_key,
key_exists_on_s3,
Expand Down
12 changes: 6 additions & 6 deletions S3MP/multipart_uploads.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
"""S3MP multipart uploads."""
"""s3mp multipart uploads."""
import concurrent.futures
import math

import S3MP # noqa: F401
from S3MP.global_config import S3MPConfig
from S3MP.mirror_path import MirrorPath
from S3MP.transfer_configs import MB
from S3MP.types import S3Bucket
import s3mp # noqa: F401
from s3mp.global_config import S3MPConfig
from s3mp.mirror_path import MirrorPath
from s3mp.transfer_configs import MB
from s3mp.types import S3Bucket


# TODO prefix optimization
Expand Down
2 changes: 1 addition & 1 deletion S3MP/prefix_queries.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from typing import List

from S3MP.global_config import S3MPConfig
from s3mp.global_config import S3MPConfig


def get_prefix_paginator(folder_key: str, bucket_key: str = None, delimiter: str = "/"):
Expand Down
4 changes: 2 additions & 2 deletions S3MP/transfer_configs.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"""Transfer configurations and utilities."""
from s3transfer.constants import GB, KB, MB

from S3MP.global_config import S3MPConfig
from S3MP.types import S3TransferConfig
from s3mp.global_config import S3MPConfig
from s3mp.types import S3TransferConfig


def get_transfer_config(
Expand Down
2 changes: 1 addition & 1 deletion S3MP/utils/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"""S3MP Utilities."""
"""s3mp Utilities."""
4 changes: 2 additions & 2 deletions S3MP/utils/s3_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import warnings
from pathlib import Path

from S3MP.global_config import S3MPConfig
from S3MP.types import S3Bucket, S3Client, S3ListObjectV2Output
from s3mp.global_config import S3MPConfig
from s3mp.types import S3Bucket, S3Client, S3ListObjectV2Output


def s3_list_single_key(
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "S3MP"
version = "0.5.3"
name = "s3mp"
version = "1.0.0"
description = "S3 Mirror Path"
authors = [
"Joshua Dean <[email protected]>",
Expand Down

0 comments on commit ac57036

Please sign in to comment.