Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ci] Added GitHub workflow to replicate commits to version branch #324

Merged
merged 2 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/version-branch.yml
Original file line number Diff line number Diff line change
@@ -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: rest_framework_gis
5 changes: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Changelog
=========

Version 1.2.0 [Unreleased]
--------------------------

Work in progress.

Version 1.1.0 [2024-08-17]
--------------------------

Expand Down
2 changes: 1 addition & 1 deletion requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ psycopg2~=2.9.10
django-filter>=2.0
contexttimer
# QA checks
openwisp-utils[qa]~=1.1.1
openwisp-utils[qa] @ https://github.com/openwisp/openwisp-utils/tarball/1.2
18 changes: 9 additions & 9 deletions rest_framework_gis/__init__.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
VERSION = (1, 1, 0, 'final')
VERSION = (1, 2, 0, 'alpha')
__version__ = VERSION # alias


def get_version():
version = f'{VERSION[0]}.{VERSION[1]}'
if VERSION[2]:
version = f'{version}.{VERSION[2]}'
if VERSION[3:] == ('alpha', 0):
version = '%s pre-alpha' % version
else:
if VERSION[3] != 'final':
version = f'{version} {VERSION[3]}'
version = '%s.%s.%s' % (VERSION[0], VERSION[1], VERSION[2])
if VERSION[3] != 'final':
first_letter = VERSION[3][0:1]
try:
suffix = VERSION[4]
except IndexError:
suffix = 0
version = '%s%s%s' % (version, first_letter, suffix)
return version
Loading