From 3db719fd4b9ec9880e775f4dbd38f15bdc745fdb Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Wed, 18 Dec 2024 18:04:39 +0530 Subject: [PATCH 1/2] [deps] Bumped to version 1.2.0a - Bumped openwisp-utils~=1.2.0a --- CHANGES.rst | 5 +++++ openwisp_users/__init__.py | 2 +- requirements-test.txt | 2 +- requirements.txt | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 5b50175a..835b1b39 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,11 @@ Changelog ========= +Version 1.2.0 [Unreleased] +-------------------------- + +Work in progress. + Version 1.1.0 [2024-11-20] -------------------------- diff --git a/openwisp_users/__init__.py b/openwisp_users/__init__.py index b2d7e964..c8e813a3 100644 --- a/openwisp_users/__init__.py +++ b/openwisp_users/__init__.py @@ -1,4 +1,4 @@ -VERSION = (1, 1, 0, 'final') +VERSION = (1, 2, 0, 'alpha') __version__ = VERSION # alias diff --git a/requirements-test.txt b/requirements-test.txt index 2126fbeb..fdb5bdf2 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,3 +1,3 @@ -openwisp-utils[qa,selenium]~=1.1.1 +openwisp-utils[qa,selenium] @ https://github.com/openwisp/openwisp-utils/tarball/1.2 django-redis~=5.4.0 django-reversion~=5.1.0 diff --git a/requirements.txt b/requirements.txt index ac42a69f..40d7f549 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,6 @@ django-extensions~=3.2.3 django-allauth[socialaccount]~=0.63.6 django-phonenumber-field~=8.0.0 phonenumbers~=8.13.50 -openwisp-utils[rest,celery]~=1.1.1 +openwisp-utils[rest,celery] @ https://github.com/openwisp/openwisp-utils/tarball/1.2 packaging django-sesame~=3.2.2 From 0b95a907d311c7c255935ce9aeab09b9315917b5 Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Wed, 18 Dec 2024 18:07:49 +0530 Subject: [PATCH 2/2] [ci] Added GitHub workflow to replicate commits to version branch --- .github/workflows/version-branch.yml | 12 ++++++++++++ 1 file changed, 12 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 00000000..20206be8 --- /dev/null +++ b/.github/workflows/version-branch.yml @@ -0,0 +1,12 @@ +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: openwisp_users