Skip to content

Commit 7f4497d

Browse files
committed
Merge remote-tracking branch 'origin/master' into v2-pull-integration
2 parents 548ec73 + 52ce00f commit 7f4497d

3 files changed

Lines changed: 44 additions & 2 deletions

File tree

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Python-api QA (Security & Style)
2+
3+
# Trigger the workflow on every push
4+
on: [push]
5+
6+
jobs:
7+
quality-assurance:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout code
11+
uses: actions/checkout@v4
12+
13+
- name: Set up Python
14+
uses: actions/setup-python@v4
15+
with:
16+
python-version: '3.9'
17+
18+
- name: Install dependencies
19+
run: |
20+
# Upgrade pip and install security/linting tools
21+
python -m pip install --upgrade pip
22+
pip install bandit detect-secrets
23+
24+
# - name: Install dependencies
25+
# run: |
26+
# # Upgrade pip and install security/linting tools
27+
# python -m pip install --upgrade pip
28+
# pip install bandit detect-secrets flake8 flake8-json
29+
30+
- name: Run Bandit (Security Scan)
31+
# Scan the mergin folder for vulnerabilities, excluding the test directory
32+
run: bandit -r ./mergin/ -ll --exclude ./mergin/test
33+
34+
- name: Run Detect Secrets
35+
# Scan the plugin directory for hardcoded secrets/credentials
36+
run: detect-secrets scan ./mergin/ --all-files
37+
38+
# - name: Run Flake8 (Style Check)
39+
# # Style enforcement using MerginMaps standards
40+
# # Ignoring E501 (line length) and W503 (operator line breaks)
41+
# run: |
42+
# flake8 ./mergin/ --max-line-length=120 --ignore=E501,W503 --exclude=test

mergin/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# The version is also stored in ../setup.py
2-
__version__ = "0.12.3"
2+
__version__ = "0.12.4"
33

44
# There seems to be no single nice way to keep version info just in one place:
55
# https://packaging.python.org/guides/single-sourcing-package-version/

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setup(
77
name="mergin-client",
8-
version="0.12.3",
8+
version="0.12.4",
99
url="https://github.com/MerginMaps/python-api-client",
1010
license="MIT",
1111
author="Lutra Consulting Ltd.",

0 commit comments

Comments
 (0)