Merge pull request #118 from MOV-AI/fix/update_cicd

Fix: update cicd to v2

.github/workflows/DeployOnGitRelease.yml

@@ -5,13 +5,14 @@ on:
 
 jobs:
   Release:
-    uses: MOV-AI/.github/.github/workflows/py-deb-workflow.yml@v1
+    uses: MOV-AI/.github/.github/workflows/py-deb-workflow.yml@v2
     with:
-      release: 'true'
+      release: true
       prod_publish_repos: '["ppa-main","ppa-public"]'
     secrets:
       auto_commit_user: ${{ secrets.RAISE_BOT_COMMIT_USER }}
       auto_commit_mail: ${{ secrets.RAISE_BOT_COMMIT_MAIL }}
+      auto_commit_password: ${{ secrets.RAISE_BOT_COMMIT_PASSWORD }}
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
       nexus_publisher_user: ${{ secrets.NEXUS_PUBLISHER_USR }}

.github/workflows/DeployOnMergeMain.yml

@@ -1,18 +1,16 @@
-name: "CI - On Push"
+name: "Deploy - On branch main/release Push"
 on:
   push:
     branches:
       - main
       - 'releases/**'
-    paths-ignore:
-      - '.bumpversion.cfg'
-      - 'setup.py'
 
 jobs:
   CI:
-    uses: MOV-AI/.github/.github/workflows/py-deb-workflow.yml@v1
+    uses: MOV-AI/.github/.github/workflows/py-deb-workflow.yml@v2
     with:
-      deploy: 'true'
+      deploy: true
+      with_docs: false
     secrets:
       auto_commit_user: ${{ secrets.RAISE_BOT_COMMIT_USER }}
       auto_commit_mail: ${{ secrets.RAISE_BOT_COMMIT_MAIL }}

.github/workflows/TestOnPR.yml

@@ -5,18 +5,17 @@ on:
       - dev
       - main
       - 'releases/**'
-    paths-ignore:
-      - '.bumpversion.cfg'
-      - 'setup.py'
 
 jobs:
   CI:
-    uses: MOV-AI/.github/.github/workflows/py-deb-workflow.yml@v1
+    uses: MOV-AI/.github/.github/workflows/py-deb-workflow.yml@v2
     with:
-      deploy: 'false'
+      deploy: false
+      with_docs: false
     secrets:
       auto_commit_user: ${{ secrets.RAISE_BOT_COMMIT_USER }}
       auto_commit_mail: ${{ secrets.RAISE_BOT_COMMIT_MAIL }}
+      auto_commit_password: ${{ secrets.RAISE_BOT_COMMIT_PASSWORD }}
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
       nexus_publisher_user: ${{ secrets.NEXUS_PUBLISHER_USR }}

.pre-commit-config.yaml

@@ -12,7 +12,6 @@ repos:
     - id: mixed-line-ending         # fixes line files line ending
       args: [--fix=lf]
     - id: trailing-whitespace       # removes trailing whitespaces from text files
-      exclude: .bumpversion.cfg     # a tool edits this file and leaves trailing spaces, must be ignored
   - repo: https://github.com/koalaman/shellcheck-precommit
     rev: v0.10.0
     hooks:

.pylintrc

@@ -7,7 +7,7 @@ disable=print-statement,
         no-self-use,
         duplicate-code,
         invalid-name
-ignore=setup.py, tests, node_modules, start.py, local_deploy.py
+ignore=tests, node_modules, start.py, local_deploy.py
 ignore-patterns=.*_test.*?py,.*test_.*?py,.*test.*?py,.*pb2.*,.*yml, .*toml, .*txt, .*md, .*yaml, .*bash, .*json
 
 [FORMAT]

README.md

@@ -4,6 +4,7 @@
 Python framework to enable building and packaging of MOV.AI ROS components.
 
 
+
 **main branch:**
 
 [![Deploy - On branch main/release Push](https://github.com/MOV-AI/mobros-build-system/actions/workflows/DeployOnMergeMain.yml/badge.svg)](https://github.com/MOV-AI/mobros-build-system/actions/workflows/DeployOnMergeMain.yml)

build-requirements.txt

@@ -1,11 +1,10 @@
 pytest
 pytest-cov
 mock
-bump2version
 flake8
 pylint
 black
-tox
+tox==4.*
 ruamel.yaml
 boto3
 pydpkg

mobros/__version__.py

@@ -1,2 +1,2 @@
 """ Module that contains the application version """
-version = "2.1.0-0"
+version = "2.1.0-14"

pyproject.toml

@@ -1,6 +1,62 @@
 [build-system]
 requires = [
-    "setuptools>=42",
-    "wheel"
+    "setuptools>=61",
+    "setuptools-scm>=8.0",
 ]
-build-backend = "setuptools.build_meta"
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "mobros"
+version = "2.1.0.14"
+authors = [
+    {name = "DevOps team", email = "[email protected]"},
+]
+description = "Movai Object Builder for Ros, The framework to build, raise and package ros and ros movai packages"
+readme = "README.md"
+requires-python = ">=3.8"
+classifiers = [
+    "Programming Language :: Python :: 3",
+]
+dependencies = [
+    "boto3",
+    "ruamel.yaml",
+    "pydpkg",
+    "rosdep",
+    "setuptools==45.0",
+    "pyopenssl==23.0.0",
+    "anytree",
+    "termcolor",
+    "urllib3==1.*"
+]
+
+[project.urls]
+Repository = "https://github.com/MOV-AI/movai-ros-build-system"
+
+[project.scripts]
+mobros = "mobros.handler:handle"
+
+[tool.setuptools.packages.find]
+include = ["mobros*"]
+exclude = ["mobros.tests*"]
+
+[tool.black]
+line-length = 100
+
+[tool.bumpversion]
+current_version = "2.1.0.14"
+parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)?(\\.(?P<build>\\d+))?"
+serialize = ["{major}.{minor}.{patch}.{build}"]
+
+[[tool.bumpversion.files]]
+filename = "pyproject.toml"
+search = 'version = "{current_version}"'
+replace = 'version = "{new_version}"'
+regex = true
+
+[[tool.bumpversion.files]]
+filename = "CHANGELOG.md"
+search = '# vTBD'
+serialize = ["{major}.{minor}.{patch}"]
+replace = "# v{new_version}"
+regex = true
+ignore_missing_version = true