From 122e3ec85dc489482ddbb9914b99eb7ab3dfee3e Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Mon, 19 Jun 2023 14:24:26 +0000 Subject: [PATCH 01/19] [skip actions] Automatic Bump of build version --- .bumpversion.cfg | 2 +- mobros/__version__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index cab489f..447c668 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.1.0-0 +current_version = 2.1.0-1 commit = True message = [SKIP] Automatic version bump {current_version} -> {new_version} diff --git a/mobros/__version__.py b/mobros/__version__.py index 74623e6..2dfa58c 100644 --- a/mobros/__version__.py +++ b/mobros/__version__.py @@ -1,2 +1,2 @@ """ Module that contains the application version """ -version = "2.1.0-0" +version = "2.1.0-1" diff --git a/setup.py b/setup.py index 4663e4c..d8ff49f 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="mobros", - version="2.1.0-0", + version="2.1.0-1", author="DevOps team", author_email="devops@mov.ai", description="Movai Object Builder for Ros, The framework to build, raise and package ros and ros movai packages", From de2668bbf6232f8d18441ac9460eaee6552ee120 Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Mon, 19 Jun 2023 15:38:05 +0000 Subject: [PATCH 02/19] [skip actions] Automatic Bump of build version --- .bumpversion.cfg | 2 +- mobros/__version__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 447c668..125bd9c 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.1.0-1 +current_version = 2.1.0-2 commit = True message = [SKIP] Automatic version bump {current_version} -> {new_version} diff --git a/mobros/__version__.py b/mobros/__version__.py index 2dfa58c..2d9211d 100644 --- a/mobros/__version__.py +++ b/mobros/__version__.py @@ -1,2 +1,2 @@ """ Module that contains the application version """ -version = "2.1.0-1" +version = "2.1.0-2" diff --git a/setup.py b/setup.py index d8ff49f..0d2eea7 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="mobros", - version="2.1.0-1", + version="2.1.0-2", author="DevOps team", author_email="devops@mov.ai", description="Movai Object Builder for Ros, The framework to build, raise and package ros and ros movai packages", From 5c30850d7133d148defbc0d6d8a1e0fe4d22682e Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Wed, 21 Jun 2023 11:07:18 +0000 Subject: [PATCH 03/19] [skip actions] Automatic Bump of build version --- .bumpversion.cfg | 2 +- mobros/__version__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 125bd9c..3305a97 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.1.0-2 +current_version = 2.1.0-3 commit = True message = [SKIP] Automatic version bump {current_version} -> {new_version} diff --git a/mobros/__version__.py b/mobros/__version__.py index 2d9211d..df0dea5 100644 --- a/mobros/__version__.py +++ b/mobros/__version__.py @@ -1,2 +1,2 @@ """ Module that contains the application version """ -version = "2.1.0-2" +version = "2.1.0-3" diff --git a/setup.py b/setup.py index 0d2eea7..8f41315 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="mobros", - version="2.1.0-2", + version="2.1.0-3", author="DevOps team", author_email="devops@mov.ai", description="Movai Object Builder for Ros, The framework to build, raise and package ros and ros movai packages", From 47d41ad3b402fd20e150d8ef4efe9422c9658ae3 Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Wed, 12 Jul 2023 14:38:58 +0000 Subject: [PATCH 04/19] [skip actions] Automatic Bump of build version --- .bumpversion.cfg | 2 +- mobros/__version__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 3305a97..97266db 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.1.0-3 +current_version = 2.1.0-4 commit = True message = [SKIP] Automatic version bump {current_version} -> {new_version} diff --git a/mobros/__version__.py b/mobros/__version__.py index df0dea5..96a3f4e 100644 --- a/mobros/__version__.py +++ b/mobros/__version__.py @@ -1,2 +1,2 @@ """ Module that contains the application version """ -version = "2.1.0-3" +version = "2.1.0-4" diff --git a/setup.py b/setup.py index 8f41315..1c285a5 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="mobros", - version="2.1.0-3", + version="2.1.0-4", author="DevOps team", author_email="devops@mov.ai", description="Movai Object Builder for Ros, The framework to build, raise and package ros and ros movai packages", From ef029b3a0ad8044567eb265baf995832e9fa61c1 Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Thu, 13 Jul 2023 11:07:48 +0000 Subject: [PATCH 05/19] [skip actions] Automatic Bump of build version --- .bumpversion.cfg | 2 +- mobros/__version__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 97266db..fe26c13 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.1.0-4 +current_version = 2.1.0-5 commit = True message = [SKIP] Automatic version bump {current_version} -> {new_version} diff --git a/mobros/__version__.py b/mobros/__version__.py index 96a3f4e..787a539 100644 --- a/mobros/__version__.py +++ b/mobros/__version__.py @@ -1,2 +1,2 @@ """ Module that contains the application version """ -version = "2.1.0-4" +version = "2.1.0-5" diff --git a/setup.py b/setup.py index 1c285a5..c054b9a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="mobros", - version="2.1.0-4", + version="2.1.0-5", author="DevOps team", author_email="devops@mov.ai", description="Movai Object Builder for Ros, The framework to build, raise and package ros and ros movai packages", From 9e21c29ab1956f6d059bdf94cd9e27fd3e97d94d Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Mon, 17 Jul 2023 08:50:52 +0000 Subject: [PATCH 06/19] [skip actions] Automatic Bump of build version --- .bumpversion.cfg | 2 +- mobros/__version__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index fe26c13..9522361 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.1.0-5 +current_version = 2.1.0-6 commit = True message = [SKIP] Automatic version bump {current_version} -> {new_version} diff --git a/mobros/__version__.py b/mobros/__version__.py index 787a539..495a468 100644 --- a/mobros/__version__.py +++ b/mobros/__version__.py @@ -1,2 +1,2 @@ """ Module that contains the application version """ -version = "2.1.0-5" +version = "2.1.0-6" diff --git a/setup.py b/setup.py index c054b9a..83fb631 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="mobros", - version="2.1.0-5", + version="2.1.0-6", author="DevOps team", author_email="devops@mov.ai", description="Movai Object Builder for Ros, The framework to build, raise and package ros and ros movai packages", From 84b153b9dbb9e6ef07bc6a8c0f943f74dd76ebfd Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Wed, 9 Aug 2023 13:34:49 +0000 Subject: [PATCH 07/19] [skip actions] Automatic Bump of build version --- .bumpversion.cfg | 2 +- mobros/__version__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 9522361..fe6c2d4 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.1.0-6 +current_version = 2.1.0-7 commit = True message = [SKIP] Automatic version bump {current_version} -> {new_version} diff --git a/mobros/__version__.py b/mobros/__version__.py index 495a468..93a65a4 100644 --- a/mobros/__version__.py +++ b/mobros/__version__.py @@ -1,2 +1,2 @@ """ Module that contains the application version """ -version = "2.1.0-6" +version = "2.1.0-7" diff --git a/setup.py b/setup.py index 83fb631..89748ef 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="mobros", - version="2.1.0-6", + version="2.1.0-7", author="DevOps team", author_email="devops@mov.ai", description="Movai Object Builder for Ros, The framework to build, raise and package ros and ros movai packages", From d2f4aac261e5dd0d89c7297996f0710f619128aa Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Fri, 11 Aug 2023 08:23:25 +0000 Subject: [PATCH 08/19] [skip actions] Automatic Bump of build version --- .bumpversion.cfg | 2 +- mobros/__version__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index fe6c2d4..5cfe95d 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.1.0-7 +current_version = 2.1.0-8 commit = True message = [SKIP] Automatic version bump {current_version} -> {new_version} diff --git a/mobros/__version__.py b/mobros/__version__.py index 93a65a4..67fb767 100644 --- a/mobros/__version__.py +++ b/mobros/__version__.py @@ -1,2 +1,2 @@ """ Module that contains the application version """ -version = "2.1.0-7" +version = "2.1.0-8" diff --git a/setup.py b/setup.py index 89748ef..e57efa7 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="mobros", - version="2.1.0-7", + version="2.1.0-8", author="DevOps team", author_email="devops@mov.ai", description="Movai Object Builder for Ros, The framework to build, raise and package ros and ros movai packages", From c923af8fd2193ceabd5ceadcd2e90f656a9c9c59 Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Fri, 20 Oct 2023 10:57:22 +0000 Subject: [PATCH 09/19] [skip actions] Automatic Bump of build version --- .bumpversion.cfg | 2 +- mobros/__version__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 5cfe95d..1bf91a2 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.1.0-8 +current_version = 2.1.0-9 commit = True message = [SKIP] Automatic version bump {current_version} -> {new_version} diff --git a/mobros/__version__.py b/mobros/__version__.py index 67fb767..521b803 100644 --- a/mobros/__version__.py +++ b/mobros/__version__.py @@ -1,2 +1,2 @@ """ Module that contains the application version """ -version = "2.1.0-8" +version = "2.1.0-9" diff --git a/setup.py b/setup.py index e57efa7..11d7c4e 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="mobros", - version="2.1.0-8", + version="2.1.0-9", author="DevOps team", author_email="devops@mov.ai", description="Movai Object Builder for Ros, The framework to build, raise and package ros and ros movai packages", From 53a395af76b891faa4a784e0db8212910797e563 Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Wed, 21 Feb 2024 12:48:44 +0000 Subject: [PATCH 10/19] [skip actions] Automatic Bump of build version --- .bumpversion.cfg | 2 +- mobros/__version__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 1bf91a2..ba4ada4 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.1.0-9 +current_version = 2.1.0-10 commit = True message = [SKIP] Automatic version bump {current_version} -> {new_version} diff --git a/mobros/__version__.py b/mobros/__version__.py index 521b803..486594c 100644 --- a/mobros/__version__.py +++ b/mobros/__version__.py @@ -1,2 +1,2 @@ """ Module that contains the application version """ -version = "2.1.0-9" +version = "2.1.0-10" diff --git a/setup.py b/setup.py index 11d7c4e..2bfac2d 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="mobros", - version="2.1.0-9", + version="2.1.0-10", author="DevOps team", author_email="devops@mov.ai", description="Movai Object Builder for Ros, The framework to build, raise and package ros and ros movai packages", From 948c9f04ca15073e47ffa77c5a38f68135007e7a Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Fri, 21 Jun 2024 16:00:54 +0000 Subject: [PATCH 11/19] [skip actions] Automatic Bump of build version --- .bumpversion.cfg | 2 +- mobros/__version__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ba4ada4..26793a0 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.1.0-10 +current_version = 2.1.0-11 commit = True message = [SKIP] Automatic version bump {current_version} -> {new_version} diff --git a/mobros/__version__.py b/mobros/__version__.py index 486594c..a5d455d 100644 --- a/mobros/__version__.py +++ b/mobros/__version__.py @@ -1,2 +1,2 @@ """ Module that contains the application version """ -version = "2.1.0-10" +version = "2.1.0-11" diff --git a/setup.py b/setup.py index 2bfac2d..b4e2a05 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="mobros", - version="2.1.0-10", + version="2.1.0-11", author="DevOps team", author_email="devops@mov.ai", description="Movai Object Builder for Ros, The framework to build, raise and package ros and ros movai packages", From db94fc2cf3ec6f73d69853116bf45fb7e9517479 Mon Sep 17 00:00:00 2001 From: duartecoelhomovai <84720623+duartecoelhomovai@users.noreply.github.com> Date: Tue, 2 Jul 2024 08:06:22 +0100 Subject: [PATCH 12/19] DUMMY COMMIT --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3c0925f..4d7fe9e 100644 --- a/README.md +++ b/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) From 25aead5d577725863959a6f916dfd27d0a4d3e84 Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Tue, 2 Jul 2024 07:09:31 +0000 Subject: [PATCH 13/19] [skip actions] Automatic Bump of build version --- .bumpversion.cfg | 2 +- mobros/__version__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 26793a0..ac52c2f 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.1.0-11 +current_version = 2.1.0-12 commit = True message = [SKIP] Automatic version bump {current_version} -> {new_version} diff --git a/mobros/__version__.py b/mobros/__version__.py index a5d455d..fa79b4b 100644 --- a/mobros/__version__.py +++ b/mobros/__version__.py @@ -1,2 +1,2 @@ """ Module that contains the application version """ -version = "2.1.0-11" +version = "2.1.0-12" diff --git a/setup.py b/setup.py index b4e2a05..9a19450 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="mobros", - version="2.1.0-11", + version="2.1.0-12", author="DevOps team", author_email="devops@mov.ai", description="Movai Object Builder for Ros, The framework to build, raise and package ros and ros movai packages", From f8704e2b2f3866bb4a1dbf87f18c436ff379d730 Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Tue, 14 Jan 2025 11:24:59 +0000 Subject: [PATCH 14/19] [skip actions] Automatic Bump of build version --- .bumpversion.cfg | 2 +- mobros/__version__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ac52c2f..17945df 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.1.0-12 +current_version = 2.1.0-13 commit = True message = [SKIP] Automatic version bump {current_version} -> {new_version} diff --git a/mobros/__version__.py b/mobros/__version__.py index fa79b4b..3f077e9 100644 --- a/mobros/__version__.py +++ b/mobros/__version__.py @@ -1,2 +1,2 @@ """ Module that contains the application version """ -version = "2.1.0-12" +version = "2.1.0-13" diff --git a/setup.py b/setup.py index 9a19450..3c08643 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="mobros", - version="2.1.0-12", + version="2.1.0-13", author="DevOps team", author_email="devops@mov.ai", description="Movai Object Builder for Ros, The framework to build, raise and package ros and ros movai packages", From 52f414e2c0af2ed7fb946fccca6e0c925c32b2fa Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Fri, 21 Feb 2025 12:41:37 +0000 Subject: [PATCH 15/19] [skip actions] Automatic Bump of build version --- .bumpversion.cfg | 2 +- mobros/__version__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 17945df..1ddcc15 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.1.0-13 +current_version = 2.1.0-14 commit = True message = [SKIP] Automatic version bump {current_version} -> {new_version} diff --git a/mobros/__version__.py b/mobros/__version__.py index 3f077e9..47ca92e 100644 --- a/mobros/__version__.py +++ b/mobros/__version__.py @@ -1,2 +1,2 @@ """ Module that contains the application version """ -version = "2.1.0-13" +version = "2.1.0-14" diff --git a/setup.py b/setup.py index 3c08643..ebe56f1 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="mobros", - version="2.1.0-13", + version="2.1.0-14", author="DevOps team", author_email="devops@mov.ai", description="Movai Object Builder for Ros, The framework to build, raise and package ros and ros movai packages", From fe4288483cf73bcb08597e0d0b00a48f9df0ba4e Mon Sep 17 00:00:00 2001 From: Alex Fernandes Date: Fri, 21 Feb 2025 15:20:07 +0000 Subject: [PATCH 16/19] bump cicd to v2 --- .github/workflows/DeployOnGitRelease.yml | 2 +- .github/workflows/DeployOnMergeMain.yml | 2 +- .github/workflows/TestOnPR.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/DeployOnGitRelease.yml b/.github/workflows/DeployOnGitRelease.yml index fe0aa42..9af2d66 100644 --- a/.github/workflows/DeployOnGitRelease.yml +++ b/.github/workflows/DeployOnGitRelease.yml @@ -5,7 +5,7 @@ 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' prod_publish_repos: '["ppa-main","ppa-public"]' diff --git a/.github/workflows/DeployOnMergeMain.yml b/.github/workflows/DeployOnMergeMain.yml index 3da78cd..3c11074 100644 --- a/.github/workflows/DeployOnMergeMain.yml +++ b/.github/workflows/DeployOnMergeMain.yml @@ -10,7 +10,7 @@ on: 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' secrets: diff --git a/.github/workflows/TestOnPR.yml b/.github/workflows/TestOnPR.yml index 45e2797..a99672d 100644 --- a/.github/workflows/TestOnPR.yml +++ b/.github/workflows/TestOnPR.yml @@ -11,7 +11,7 @@ on: 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' secrets: From f346573b08efb4e8564f0c233eeb60b2ed5c45b1 Mon Sep 17 00:00:00 2001 From: Alex Fernandes Date: Fri, 21 Feb 2025 15:25:25 +0000 Subject: [PATCH 17/19] fix workflow vars --- .github/workflows/DeployOnGitRelease.yml | 3 ++- .github/workflows/DeployOnMergeMain.yml | 8 +++----- .github/workflows/TestOnPR.yml | 4 +++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/DeployOnGitRelease.yml b/.github/workflows/DeployOnGitRelease.yml index 9af2d66..fc67e5a 100644 --- a/.github/workflows/DeployOnGitRelease.yml +++ b/.github/workflows/DeployOnGitRelease.yml @@ -7,11 +7,12 @@ jobs: Release: 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 }} diff --git a/.github/workflows/DeployOnMergeMain.yml b/.github/workflows/DeployOnMergeMain.yml index 3c11074..5f96443 100644 --- a/.github/workflows/DeployOnMergeMain.yml +++ b/.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@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 }} diff --git a/.github/workflows/TestOnPR.yml b/.github/workflows/TestOnPR.yml index a99672d..ccc4108 100644 --- a/.github/workflows/TestOnPR.yml +++ b/.github/workflows/TestOnPR.yml @@ -13,10 +13,12 @@ jobs: CI: 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 }} From 056cb985cd6c6e880014d6069327e26517c289f7 Mon Sep 17 00:00:00 2001 From: David Dias Date: Fri, 21 Feb 2025 15:58:28 +0000 Subject: [PATCH 18/19] Migrate to pyproject.toml --- .bumpversion.cfg | 15 -------- .github/workflows/TestOnPR.yml | 3 -- .pre-commit-config.yaml | 1 - .pylintrc | 2 +- build-requirements.txt | 3 +- pyproject.toml | 62 ++++++++++++++++++++++++++++++++-- setup.py | 31 ----------------- 7 files changed, 61 insertions(+), 56 deletions(-) delete mode 100644 .bumpversion.cfg delete mode 100644 setup.py diff --git a/.bumpversion.cfg b/.bumpversion.cfg deleted file mode 100644 index 1ddcc15..0000000 --- a/.bumpversion.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[bumpversion] -current_version = 2.1.0-14 -commit = True -message = - [SKIP] Automatic version bump {current_version} -> {new_version} -tag = True -tag_message = - Automatic version bump {current_version} -> {new_version} -parse = (?P\d+)\.(?P\d+)\.(?P\d+)?(\-(?P\d+))? -serialize = - {major}.{minor}.{patch}-{build} - -[bumpversion:file:setup.py] - -[bumpversion:file:./mobros/__version__.py] diff --git a/.github/workflows/TestOnPR.yml b/.github/workflows/TestOnPR.yml index ccc4108..cb76dd5 100644 --- a/.github/workflows/TestOnPR.yml +++ b/.github/workflows/TestOnPR.yml @@ -5,9 +5,6 @@ on: - dev - main - 'releases/**' - paths-ignore: - - '.bumpversion.cfg' - - 'setup.py' jobs: CI: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 14a5501..107c50e 100644 --- a/.pre-commit-config.yaml +++ b/.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: diff --git a/.pylintrc b/.pylintrc index 7fb1872..c933227 100644 --- a/.pylintrc +++ b/.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] diff --git a/build-requirements.txt b/build-requirements.txt index d67c83b..6bb1855 100644 --- a/build-requirements.txt +++ b/build-requirements.txt @@ -1,11 +1,10 @@ pytest pytest-cov mock -bump2version flake8 pylint black -tox +tox==4.* ruamel.yaml boto3 pydpkg diff --git a/pyproject.toml b/pyproject.toml index b5a3c46..568e237 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,62 @@ [build-system] requires = [ - "setuptools>=42", - "wheel" + "setuptools>=61", + "setuptools-scm>=8.0", ] -build-backend = "setuptools.build_meta" \ No newline at end of file +build-backend = "setuptools.build_meta" + +[project] +name = "mobros" +version = "2.1.0.14" +authors = [ + {name = "DevOps team", email = "bacdevopskend@mov.ai"}, +] +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\\d+)\\.(?P\\d+)\\.(?P\\d+)?(\\.(?P\\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 diff --git a/setup.py b/setup.py deleted file mode 100644 index ebe56f1..0000000 --- a/setup.py +++ /dev/null @@ -1,31 +0,0 @@ -import setuptools - -with open("README.md", "r") as fh: - long_description = fh.read() - -setuptools.setup( - name="mobros", - version="2.1.0-14", - author="DevOps team", - author_email="devops@mov.ai", - description="Movai Object Builder for Ros, The framework to build, raise and package ros and ros movai packages", - long_description=long_description, - long_description_content_type="text/markdown", - url="https://github.com/MOV-AI/movai-ros-build-system", - packages=setuptools.find_packages(), - include_package_data=True, - classifiers=["Programming Language :: Python :: 3"], - install_requires=[ - "boto3", - "ruamel.yaml", - "pydpkg", - "rosdep", - "setuptools==45.0", - "pyopenssl==23.0.0", - "anytree", - "termcolor", - "urllib3==1.*" - ], - entry_points={ - "console_scripts": ["mobros = mobros.handler:handle"]}, -) From f72369729ce141020a15e4d130a2e19a69ac878a Mon Sep 17 00:00:00 2001 From: Alex Fernandes Date: Fri, 21 Feb 2025 16:29:19 +0000 Subject: [PATCH 19/19] add changelog --- CHANGELOG.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..e69de29