From ae77c537fde6889d4ac5520dfdc23155e80c2df1 Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Thu, 19 Dec 2024 16:03:06 +0530 Subject: [PATCH 1/3] [deps] Upgraded depdendencies - Bumped netjsonconfig~=1.2.0a - Bumped django-x509~=1.3.0a - Bumped django-loci~=1.2.0a - Bumped openwisp-users~=1.2.0a - Bumped openwisp-utils[celery]~=1.2.0a - Bumped openwisp-notifications~=1.2.0a - Bumped openwisp-ipam~=1.2.0a - Bumped djangorestframework-gis~=1.2.0a --- requirements-test.txt | 2 +- requirements.txt | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/requirements-test.txt b/requirements-test.txt index d97f348f1..91f8f4641 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,7 +1,7 @@ pytest-django~=4.9.0 pytest-asyncio~=0.24.0 pytest-cov~=5.0.0 -openwisp-utils[qa,selenium]~=1.1.1 +openwisp-utils[qa,selenium] @ https://github.com/openwisp/openwisp-utils/tarball/1.2 channels_redis~=4.2.1 django_redis~=5.4.0 mock-ssh-server~=0.9.1 diff --git a/requirements.txt b/requirements.txt index 710a789e7..00a825c83 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,15 +1,15 @@ django-sortedm2m~=4.0.0 django-reversion~=5.1.0 django-taggit~=4.0.0 -netjsonconfig~=1.1.0 -django-x509~=1.2.0 -django-loci~=1.1.0 +netjsonconfig @ https://github.com/openwisp/netjsonconfig/tarball/1.2 +django-x509 @ https://github.com/openwisp/django-x509/tarball/1.3 +django-loci @ https://github.com/openwisp/django-loci/tarball/1.2 django-flat-json-widget~=0.3.0 -openwisp-users~=1.1.0 -openwisp-utils[celery]~=1.1.1 -openwisp-notifications~=1.1.0 -openwisp-ipam~=1.1.0 -djangorestframework-gis~=1.1 +openwisp-users @ https://github.com/openwisp/openwisp-users/tarball/1.2 +openwisp-utils[celery] @ https://github.com/openwisp/openwisp-utils/tarball/1.2 +openwisp-notifications @ https://github.com/openwisp/openwisp-notifications/tarball/1.2 +openwisp-ipam @ https://github.com/openwisp/openwisp-ipam/tarball/1.2 +djangorestframework-gis @ https://github.com/openwisp/django-rest-framework-gis/tarball/1.2 paramiko[ed25519]~=3.5.0 scp~=0.15.0 django-cache-memoize~=0.2.0 From b64e40fc72581c1619b171fc8fb2f6bad1a684b6 Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Thu, 19 Dec 2024 16:04:31 +0530 Subject: [PATCH 2/3] [chores] Added unreleased 1.2.0 to changelog --- CHANGES.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index fb0f951e7..6be282cc6 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-22] -------------------------- From cfc6d256ff12720bdff063583ce47e37802fd8b2 Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Thu, 19 Dec 2024 16:06:06 +0530 Subject: [PATCH 3/3] [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 000000000..ce3dd5b3f --- /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_controller