Skip to content

Commit 59d3ccc

Browse files
committed
Revert "black"
This reverts commit 97dba51.
1 parent 97dba51 commit 59d3ccc

File tree

3 files changed

+29
-25
lines changed

3 files changed

+29
-25
lines changed

mergin/client_push.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ def push_project_finalize(job):
275275
f"Upload details: {len(job.upload_queue_items)} file chunks, total size {job.total_size} bytes."
276276
)
277277
# server returns various error messages with filename or something generic
278-
# it would be better if it returned list of failed files (and reasons) whenever possible
278+
# it would be better if it returned list of failed files (and reasons) whenever possible
279279
job.mp.log.error("--- push finish failed! " + str(err))
280280

281281
# if push finish fails, the transaction is not killed, so we

scripts/update_version.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
def replace_in_file(filepath, regex, sub):
7-
with open(filepath, "r") as f:
7+
with open(filepath, 'r') as f:
88
content = f.read()
99

1010
content_new = re.sub(regex, sub, content, flags=re.M)
@@ -15,14 +15,14 @@ def replace_in_file(filepath, regex, sub):
1515

1616
dir_path = os.path.dirname(os.path.realpath(__file__))
1717
parser = argparse.ArgumentParser()
18-
parser.add_argument("--version", help="version to replace")
18+
parser.add_argument('--version', help='version to replace')
1919
args = parser.parse_args()
2020
ver = args.version
2121
print("using version " + ver)
2222

2323
about_file = os.path.join(dir_path, os.pardir, "mergin", "version.py")
2424
print("patching " + about_file)
25-
replace_in_file(about_file, '__version__\s=\s".*', '__version__ = "' + ver + '"')
25+
replace_in_file(about_file, "__version__\s=\s\".*", "__version__ = \"" + ver + "\"")
2626

2727
setup_file = os.path.join(dir_path, os.pardir, "setup.py")
2828
print("patching " + setup_file)

setup.py

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,36 @@
44
from setuptools import setup, find_packages
55

66
setup(
7-
name="mergin-client",
8-
version="0.10.5",
9-
url="https://github.com/MerginMaps/python-api-client",
10-
license="MIT",
11-
author="Lutra Consulting Ltd.",
12-
author_email="[email protected]",
13-
description="Mergin Maps utils and client",
14-
long_description="Mergin Maps utils and client",
7+
name='mergin-client',
8+
version='0.10.5',
9+
url='https://github.com/MerginMaps/python-api-client',
10+
license='MIT',
11+
author='Lutra Consulting Ltd.',
12+
author_email='[email protected]',
13+
description='Mergin Maps utils and client',
14+
long_description='Mergin Maps utils and client',
15+
1516
packages=find_packages(),
16-
platforms="any",
17+
18+
platforms='any',
1719
install_requires=[
18-
"python-dateutil==2.8.2",
19-
"pygeodiff==2.0.4",
20-
"pytz==2022.1",
21-
"click==8.1.3",
22-
"pathvalidate==3.3.1",
20+
'python-dateutil==2.8.2',
21+
'pygeodiff==2.0.4',
22+
'pytz==2022.1',
23+
'click==8.1.3',
24+
'pathvalidate==3.3.1',
2325
],
26+
2427
entry_points={
25-
"console_scripts": ["mergin=mergin.cli:cli"],
28+
'console_scripts': ['mergin=mergin.cli:cli'],
2629
},
30+
2731
classifiers=[
28-
"Development Status :: 5 - Production/Stable",
29-
"Intended Audience :: Developers",
30-
"License :: OSI Approved :: MIT License",
31-
"Operating System :: OS Independent",
32-
"Programming Language :: Python :: 3",
32+
'Development Status :: 5 - Production/Stable',
33+
'Intended Audience :: Developers',
34+
'License :: OSI Approved :: MIT License',
35+
'Operating System :: OS Independent',
36+
'Programming Language :: Python :: 3'
3337
],
34-
package_data={"mergin": ["cert.pem"]},
38+
package_data={'mergin': ['cert.pem']}
3539
)

0 commit comments

Comments
 (0)