Skip to content

Commit 2eaf916

Browse files
committed
update version to 0.7.3
2 parents 9952a72 + c161065 commit 2eaf916

File tree

15 files changed

+863
-813
lines changed

15 files changed

+863
-813
lines changed

.github/workflows/autotests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ env:
77
TEST_API_USERNAME2: test_plugin2
88
TEST_API_PASSWORD2: ${{ secrets.MERGINTEST_API_PASSWORD2 }}
99

10+
concurrency:
11+
group: ci-${{github.ref}}-autotests
12+
cancel-in-progress: true
13+
1014
jobs:
1115
tests:
1216
runs-on: ubuntu-latest

.github/workflows/code_style.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Code Style
22

3-
on: [push, pull_request]
3+
on: [push]
44

55
jobs:
66
code_style_python:

mergin/cli.py

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@
3131
download_project_finalize,
3232
download_project_is_running,
3333
)
34-
from mergin.client_pull import pull_project_async, pull_project_is_running, pull_project_finalize, \
35-
pull_project_cancel
36-
from mergin.client_push import push_project_async, push_project_is_running, push_project_finalize, \
37-
push_project_cancel
34+
from mergin.client_pull import pull_project_async, pull_project_is_running, pull_project_finalize, pull_project_cancel
35+
from mergin.client_push import push_project_async, push_project_is_running, push_project_finalize, push_project_cancel
3836

3937

4038
from pygeodiff import GeoDiff
@@ -143,7 +141,9 @@ def _print_unhandled_exception():
143141
click.echo(line)
144142

145143

146-
@click.group(epilog=f"Copyright (C) 2019-2021 Lutra Consulting\n\n(mergin-py-client v{__version__} / pygeodiff v{GeoDiff().version()})")
144+
@click.group(
145+
epilog=f"Copyright (C) 2019-2021 Lutra Consulting\n\n(mergin-py-client v{__version__} / pygeodiff v{GeoDiff().version()})"
146+
)
147147
@click.option(
148148
"--url",
149149
envvar="MERGIN_URL",
@@ -183,9 +183,12 @@ def login(ctx):
183183
@cli.command()
184184
@click.argument("project")
185185
@click.option("--public", is_flag=True, default=False, help="Public project, visible to everyone")
186-
@click.option("--from-dir", default=None,
187-
help="Content of the directory will be uploaded to the newly created project. "
188-
"The directory will get assigned to the project.")
186+
@click.option(
187+
"--from-dir",
188+
default=None,
189+
help="Content of the directory will be uploaded to the newly created project. "
190+
"The directory will get assigned to the project.",
191+
)
189192
@click.pass_context
190193
def create(ctx, project, public, from_dir):
191194
"""Create a new project on Mergin Maps server. `project` needs to be a combination of namespace/project."""
@@ -234,29 +237,24 @@ def create(ctx, project, public, from_dir):
234237
@click.option(
235238
"--order_params",
236239
help="optional attributes for sorting the list. "
237-
"It should be a comma separated attribute names "
238-
"with _asc or _desc appended for sorting direction. "
239-
"For example: \"namespace_asc,disk_usage_desc\". "
240-
"Available attrs: namespace, name, created, updated, disk_usage, creator",
240+
"It should be a comma separated attribute names "
241+
"with _asc or _desc appended for sorting direction. "
242+
'For example: "namespace_asc,disk_usage_desc". '
243+
"Available attrs: namespace, name, created, updated, disk_usage, creator",
241244
)
242245
@click.pass_context
243246
def list_projects(ctx, flag, name, namespace, order_params):
244247
"""List projects on the server."""
245248
filter_str = "(filter flag={})".format(flag) if flag is not None else "(all public)"
246-
249+
247250
click.echo("List of projects {}:".format(filter_str))
248251

249252
mc = ctx.obj["client"]
250253
if mc is None:
251254
return
252255

253-
projects_list = mc.projects_list(
254-
flag=flag,
255-
name=name,
256-
namespace=namespace,
257-
order_params=order_params
258-
)
259-
256+
projects_list = mc.projects_list(flag=flag, name=name, namespace=namespace, order_params=order_params)
257+
260258
click.echo("Fetched {} projects .".format(len(projects_list)))
261259
for project in projects_list:
262260
full_name = "{} / {}".format(project["namespace"], project["name"])
@@ -401,9 +399,12 @@ def status(ctx):
401399
return
402400

403401
if mc.has_unfinished_pull(os.getcwd()):
404-
click.secho("The previous pull has not finished completely: status "
405-
"of some files may be reported incorrectly. Use "
406-
"resolve_unfinished_pull command to try to fix that.", fg="yellow")
402+
click.secho(
403+
"The previous pull has not finished completely: status "
404+
"of some files may be reported incorrectly. Use "
405+
"resolve_unfinished_pull command to try to fix that.",
406+
fg="yellow",
407+
)
407408

408409
click.secho("### Server changes:", fg="magenta")
409410
pretty_diff(pull_changes)
@@ -526,7 +527,7 @@ def show_file_history(ctx, path):
526527
@click.argument("version")
527528
@click.pass_context
528529
def show_file_changeset(ctx, path, version):
529-
""" Displays information about project changes."""
530+
"""Displays information about project changes."""
530531
mc = ctx.obj["client"]
531532
if mc is None:
532533
return

0 commit comments

Comments
 (0)