Merge pull request #144 from MerginMaps/infra

add some more CI

Author: PeterPetrik

.github/workflows/code_style.yml

@@ -0,0 +1,13 @@
+name: Code Style
+
+on: [push, pull_request]
+
+jobs:
+  code_style_python:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: psf/black@stable
+        with:
+          options: "--check --diff --verbose -l 120"
+          src: "./mergin"

.github/workflows/python_packages.yml

@@ -0,0 +1,41 @@
+name: Build and upload to PyPI
+
+on: [push]
+jobs:
+  build_sdist:
+    name: Build source distribution
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-python@v2
+        name: Install Python
+        with:
+          python-version: '3.x'
+
+      - name: Install deps
+        run: |
+          pip install --upgrade pip
+          pip install setuptools twine wheel
+        
+      - name: Build sdist
+        run: python setup.py sdist
+
+      - uses: actions/upload-artifact@v2
+        with:
+          path: dist/*.tar.gz
+
+  upload_pypi:
+    needs: [build_sdist]
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: artifact
+          path: dist
+
+      - uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_TOKEN }}

README.md

@@ -1,18 +1,21 @@
 [![PyPI version](https://badge.fury.io/py/mergin-client.svg)](https://badge.fury.io/py/mergin-client)
+[![Build and upload to PyPI](https://github.com/MerginMaps/mergin-py-client/actions/workflows/python_packages.yml/badge.svg)](https://github.com/MerginMaps/mergin-py-client/actions/workflows/python_packages.yml)
+
+[![Code Style](https://github.com/MerginMaps/mergin-py-client/actions/workflows/code_style.yml/badge.svg)](https://github.com/MerginMaps/mergin-py-client/actions/workflows/code_style.yml)
 [![Auto Tests/Package](https://github.com/MerginMaps/mergin-py-client/workflows/Auto%20Tests/badge.svg)](https://github.com/MerginMaps/mergin-py-client/actions?query=workflow%3A%22Auto+Tests%22)
 [![Coverage Status](https://img.shields.io/coveralls/MerginMaps/mergin-py-client.svg)](https://coveralls.io/github/MerginMaps/mergin-py-client)
 
 # Mergin Maps Python Client
 
-This repository contains a Python client module for access to [Mergin Maps](https://merginmaps.com/)
-service and a command-line tool for easy access to data stored in Mergin Maps.
+This repository contains a Python client module for access to [Mergin Maps](https://merginmaps.com/) service and a command-line tool for easy access to data stored in Mergin Maps.
 
 <div><img align="left" width="45" height="45" src="https://github.com/MerginMaps/docs/main/src/.vuepress/public/slack.svg"><a href="https://merginmaps.com/community/join">Join our community chat</a><br/>and ask questions!</div><br />
 
 
 To install the module:
-
+```bash
     pip3 install mergin-client
+```
 
 Note: Check also [Mergin Maps Cpp Client](https://github.com/MerginMaps/mergin-cpp-client)
 
@@ -149,17 +152,6 @@ it is possible to run other commands without specifying username/password.
 
 ## Development
 
-### How to release
-
-1. Update version in `setup.py` and `mergin/version.py`
-2. Tag git repository with the new version
-3. Create package and upload it
-
-```
-python3 setup.py sdist
-python3 -m twine upload dist/mergin-client-x.y.z.tar.gz
-```
-
 ### Installing deps
 
 Python 3.7+ required. Create `mergin/deps` folder where [geodiff](https://github.com/MerginMaps/geodiff) lib is supposed to be and install dependencies:

mergin/version.py

@@ -1,6 +1,6 @@
 
 # The version is also stored in ../setup.py
-__version__ = '0.7.2'
+__version__ = '1.0.0'
 
 # There seems to be no single nice way to keep version info just in one place:
 # https://packaging.python.org/guides/single-sourcing-package-version/

scripts/check_all.bash

@@ -0,0 +1,5 @@
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+PWD=`pwd`
+cd $DIR
+black --verbose -l 120 $DIR/../mergin
+cd $PWD

scripts/update_version.bash

@@ -0,0 +1,8 @@
+#!/bin/bash
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+VER=$1
+
+python3 $DIR/update_version.py --version $VER
+
+
+

scripts/update_version.py

@@ -0,0 +1,29 @@
+import os
+import re
+import argparse
+
+
+def replace_in_file(filepath, regex, sub):
+    with open(filepath, 'r') as f:
+        content = f.read()
+
+    content_new = re.sub(regex, sub, content, flags=re.M)
+
+    with open(filepath, "w") as f:
+        f.write(content_new)
+
+
+dir_path = os.path.dirname(os.path.realpath(__file__))
+parser = argparse.ArgumentParser()
+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 + "'")
+
+setup_file = os.path.join(dir_path, os.pardir, "setup.py")
+print("patching " + setup_file)
+replace_in_file(setup_file, "VERSION='.*", "VERSION='" + ver + "'")