From c79a0d8d2ed30553c235e5695dd9683f8267c14b Mon Sep 17 00:00:00 2001 From: Valentin Buira Date: Thu, 12 Sep 2024 11:31:53 +0200 Subject: [PATCH] Cleanup references to previous repository name of python-api-client No functional changes --- mergin/cli.py | 2 +- mergin/client_pull.py | 2 +- mergin/client_push.py | 2 +- mergin/merginproject.py | 4 ++-- mergin/test/test_client.py | 2 +- setup.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mergin/cli.py b/mergin/cli.py index e252228..d30f3b5 100755 --- a/mergin/cli.py +++ b/mergin/cli.py @@ -143,7 +143,7 @@ def _print_unhandled_exception(): @click.group( - epilog=f"Copyright (C) 2019-{date.today().year} Lutra Consulting\n\n(mergin-py-client v{__version__} / pygeodiff v{GeoDiff().version()})" + epilog=f"Copyright (C) 2019-{date.today().year} Lutra Consulting\n\n(python-api-client v{__version__} / pygeodiff v{GeoDiff().version()})" ) @click.option( "--url", diff --git a/mergin/client_pull.py b/mergin/client_pull.py index d11b2ab..795cf2e 100644 --- a/mergin/client_pull.py +++ b/mergin/client_pull.py @@ -786,7 +786,7 @@ def download_files_async( mp.log.info(f"Got project info. version {project_info['version']}") # set temporary directory for download - temp_dir = tempfile.mkdtemp(prefix="mergin-py-client-") + temp_dir = tempfile.mkdtemp(prefix="python-api-client-") if output_paths is None: output_paths = [] diff --git a/mergin/client_push.py b/mergin/client_push.py index 58b17fb..885db9a 100644 --- a/mergin/client_push.py +++ b/mergin/client_push.py @@ -124,7 +124,7 @@ def push_project_async(mc, directory): changes = filter_changes(mc, project_info, changes) mp.log.debug("push changes:\n" + pprint.pformat(changes)) - tmp_dir = tempfile.TemporaryDirectory(prefix="mergin-py-client-") + tmp_dir = tempfile.TemporaryDirectory(prefix="python-api-client-") # If there are any versioned files (aka .gpkg) that are not updated through a diff, # we need to make a temporary copy somewhere to be sure that we are uploading full content. diff --git a/mergin/merginproject.py b/mergin/merginproject.py index 0c44e66..83d8510 100644 --- a/mergin/merginproject.py +++ b/mergin/merginproject.py @@ -162,7 +162,7 @@ def project_id(self) -> str: Raises ClientError if project id is not present in the project metadata. This should only happen with projects downloaded with old client, before February 2023, - see https://github.com/MerginMaps/mergin-py-client/pull/154 + see https://github.com/MerginMaps/python-api-client/pull/154 """ self._read_metadata() @@ -810,7 +810,7 @@ def resolve_unfinished_pull(self, user_name): self.log.info("resolving unfinished pull") - temp_dir = tempfile.mkdtemp(prefix="mergin-py-client-") + temp_dir = tempfile.mkdtemp(prefix="python-api-client-") for root, dirs, files in os.walk(self.unfinished_pull_dir): for file_name in files: diff --git a/mergin/test/test_client.py b/mergin/test/test_client.py index 881595c..b5d238f 100644 --- a/mergin/test/test_client.py +++ b/mergin/test/test_client.py @@ -803,7 +803,7 @@ def test_available_storage_validation(mcStorage): def test_available_storage_validation2(mc, mc2): """ Testing of storage limit - should not be applied for user pushing changes into project with different namespace. - This should cover the exception of mergin-py-client that a user can push changes to someone else's project regardless + This should cover the exception of python-api-client that a user can push changes to someone else's project regardless the user's own storage limitation. Of course, other limitations are still applied (write access, owner of a modified project has to have enough free storage). diff --git a/setup.py b/setup.py index 6e53ebe..2ae904f 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name='mergin-client', version='0.9.2', - url='https://github.com/MerginMaps/mergin-py-client', + url='https://github.com/MerginMaps/python-api-client', license='MIT', author='Lutra Consulting Ltd.', author_email='info@merginmaps.com',