From b11d69eb899a378a9bdfde5b7d37ea953d0bda62 Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Fri, 20 Dec 2024 19:56:05 +0530 Subject: [PATCH 1/2] [deps] Bumped version to 1.2.0a - Bumped openwisp-utils~=1.2.0a --- CHANGES.rst | 5 +++++ netdiff/info.py | 2 +- requirements-test.txt | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 21f6894..78afa09 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,11 @@ Changelog ========= +Version 1.2.0 [Unreleased] +-------------------------- + +Work in progress. + Version 1.1.0 [14-08-2024] -------------------------- diff --git a/netdiff/info.py b/netdiff/info.py index 00e80d2..4684bee 100644 --- a/netdiff/info.py +++ b/netdiff/info.py @@ -1,4 +1,4 @@ -VERSION = (1, 1, 0, 'final') +VERSION = (1, 2, 0, 'alpha') __version__ = VERSION diff --git a/requirements-test.txt b/requirements-test.txt index 1de34e7..f28ffe3 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,5 +1,5 @@ nose2[coverage_plugin]>=0.6.5 responses~=0.25.3 -openwisp-utils[qa] @ https://github.com/openwisp/openwisp-utils/tarball/master +openwisp-utils[qa] @ https://github.com/openwisp/openwisp-utils/tarball/1.2 parameterized~=0.9.0 freezegun==1.5.1 From 1e27d5a60b54b2997c4cfb15cce01619682cc7bc Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Fri, 20 Dec 2024 19:59:17 +0530 Subject: [PATCH 2/2] [ci] Added GitHub workflow to replicate commits to version branch --- .github/workflows/version-branch.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/workflows/version-branch.yml diff --git a/.github/workflows/version-branch.yml b/.github/workflows/version-branch.yml new file mode 100644 index 0000000..1e60acc --- /dev/null +++ b/.github/workflows/version-branch.yml @@ -0,0 +1,13 @@ +name: Replicate Commits to Version Branch + +on: + push: + branches: + - master + +jobs: + version-branch: + uses: openwisp/openwisp-utils/.github/workflows/reusable-version-branch.yml@master + with: + module_name: netdiff + install_package: true