black -l 120

Author: DanChov

mergin/client_push.py

@@ -334,12 +334,14 @@ def _geodiff_changes_count(mp, diff_rel_path):
 
     try:
         from pygeodiff import GeoDiff
+
         return GeoDiff().changes_count(diff_abs)
     except Exception:
         pass
 
     try:
         import geodiff  # optional fallback
+
         if hasattr(geodiff, "changes_count"):
             try:
                 return geodiff.changes_count(diff_abs)
@@ -350,6 +352,7 @@ def _geodiff_changes_count(mp, diff_rel_path):
 
     return None
 
+
 def push_project_cancel(job):
     """
     To be called (from main thread) to cancel a job that has uploads in progress.

mergin/test/test_push_logging.py

@@ -78,12 +78,14 @@ def fpath_meta(rel):
             mc=SimpleNamespace(post=fake_post),
             changes={
                 "added": [],
-                "updated": [{
-                    "path": modified.name,
-                    "size": file_size,
-                    "diff": {"path": diff_path.name, "size": diff_size},
-                    "chunks": [1],
-                }],
+                "updated": [
+                    {
+                        "path": modified.name,
+                        "size": file_size,
+                        "diff": {"path": diff_path.name, "size": diff_size},
+                        "chunks": [1],
+                    }
+                ],
                 "removed": [],
             },
             tmp_dir=SimpleNamespace(cleanup=lambda: None),

scripts/update_version.py

@@ -4,7 +4,7 @@
 
 
 def replace_in_file(filepath, regex, sub):
-    with open(filepath, 'r') as f:
+    with open(filepath, "r") as f:
         content = f.read()
 
     content_new = re.sub(regex, sub, content, flags=re.M)
@@ -15,14 +15,14 @@ def replace_in_file(filepath, regex, sub):
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
 parser = argparse.ArgumentParser()
-parser.add_argument('--version', help='version to replace')
+parser.add_argument("--version", help="version to replace")
 args = parser.parse_args()
 ver = args.version
 print("using version " + ver)
 
 about_file = os.path.join(dir_path, os.pardir, "mergin", "version.py")
 print("patching " + about_file)
-replace_in_file(about_file, "__version__\s=\s\".*", "__version__ = \"" + ver + "\"")
+replace_in_file(about_file, '__version__\s=\s".*', '__version__ = "' + ver + '"')
 
 setup_file = os.path.join(dir_path, os.pardir, "setup.py")
 print("patching " + setup_file)

setup.py

@@ -4,35 +4,31 @@
 from setuptools import setup, find_packages
 
 setup(
-    name='mergin-client',
-    version='0.10.5',
-    url='https://github.com/MerginMaps/python-api-client',
-    license='MIT',
-    author='Lutra Consulting Ltd.',
-    author_email='info@merginmaps.com',
-    description='Mergin Maps utils and client',
-    long_description='Mergin Maps utils and client',
-
+    name="mergin-client",
+    version="0.10.5",
+    url="https://github.com/MerginMaps/python-api-client",
+    license="MIT",
+    author="Lutra Consulting Ltd.",
+    author_email="info@merginmaps.com",
+    description="Mergin Maps utils and client",
+    long_description="Mergin Maps utils and client",
     packages=find_packages(),
-
-    platforms='any',
+    platforms="any",
     install_requires=[
-        'python-dateutil==2.8.2',
-        'pygeodiff==2.0.4',
-        'pytz==2022.1',
-        'click==8.1.3',
+        "python-dateutil==2.8.2",
+        "pygeodiff==2.0.4",
+        "pytz==2022.1",
+        "click==8.1.3",
     ],
-
     entry_points={
-        'console_scripts': ['mergin=mergin.cli:cli'],
+        "console_scripts": ["mergin=mergin.cli:cli"],
     },
-
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python :: 3'
+        "Development Status :: 5 - Production/Stable",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python :: 3",
     ],
-    package_data={'mergin': ['cert.pem']}
+    package_data={"mergin": ["cert.pem"]},
 )