From d619cd34341ad3a4a55a7198f0147235bf438c09 Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Thu, 19 Dec 2024 15:17:56 +0530 Subject: [PATCH 1/2] [deps] Bumped version to 1.3.0a - Bumped openwisp-utils~=1.2.0a --- CHANGES.rst | 5 +++++ django_x509/__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 0dbf727..30cdc50 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,11 @@ Changelog ========= +Version 1.3.0 [Unreleased] +-------------------------- + +Work in progress. + Version 1.2.0 [2024-08-16] -------------------------- diff --git a/django_x509/__init__.py b/django_x509/__init__.py index 1af3f76..ed5be90 100644 --- a/django_x509/__init__.py +++ b/django_x509/__init__.py @@ -1,4 +1,4 @@ -VERSION = (1, 2, 0, 'final') +VERSION = (1, 3, 0, 'alpha') __version__ = VERSION # alias diff --git a/requirements-test.txt b/requirements-test.txt index 76ec861..87f7ddd 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -openwisp-utils[qa]~=1.1.1 +openwisp-utils[qa] @ https://github.com/openwisp/openwisp-utils/tarball/1.2 diff --git a/requirements.txt b/requirements.txt index 684be03..27c3640 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # Does not supports Django 4.0.0 django>=3.2.18,!=4.0.*,<5.2 -openwisp-utils~=1.1.1 +openwisp-utils @ https://github.com/openwisp/openwisp-utils/tarball/1.2 jsonfield>=3.1.0,<4.0.0 cryptography~=43.0.3 pyOpenSSL~=24.2.1 From 5cd0ab3eaa23578bcc7a24e7687bca83fc37999e Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Thu, 19 Dec 2024 15:19:53 +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 0000000..6b3fa53 --- /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: django_x509