Skip to content
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mergin/client_push.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ def push_project_finalize(job):
f"Upload details: {len(job.upload_queue_items)} file chunks, total size {job.total_size} bytes."
)
# server returns various error messages with filename or something generic
# it would be better if it returned list of failed files (and reasons) whenever possible
# it would be better if it returned list of failed files (and reasons) whenever possible
job.mp.log.error("--- push finish failed! " + str(err))

# if push finish fails, the transaction is not killed, so we
Expand Down
6 changes: 3 additions & 3 deletions scripts/update_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
45 changes: 21 additions & 24 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,32 @@
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='[email protected]',
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="[email protected]",
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",
"pathvalidate==3.3.1",
],

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"]},
)