Skip to content

Commit

Permalink
Merge branch 'release/0.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
xeroc committed Aug 20, 2019
2 parents 9b561cc + eacda8d commit f9256e0
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 1 deletion.
6 changes: 6 additions & 0 deletions .changes/0.0.1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"description": "Update README.md and Makefile to reflect the use of semversioner",
"type": "patch"
}
]
6 changes: 6 additions & 0 deletions .changes/0.0.2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"description": "Improve release script",
"type": "patch"
}
]
6 changes: 6 additions & 0 deletions .changes/0.0.3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"description": "Improve Makefile to work with semver",
"type": "patch"
}
]
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Changelog
Note: version releases in the 0.x.y range may introduce breaking changes.

## 0.0.3

- patch: Improve Makefile to work with semver

## 0.0.2

- patch: Improve release script

## 0.0.1

- patch: Update README.md and Makefile to reflect the use of semversioner

6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.PHONY: clean-pyc clean-build docs
CURRENT_VERSION := $(shell semversioner current-version)

clean: clean-build clean-pyc

Expand Down Expand Up @@ -49,5 +50,10 @@ prepare: clean test docs authors
semver:
semversioner release
semversioner changelog > CHANGELOG.md
sed -i "s/^__version__.*/__version__ = \"$(CURRENT_VERSION)\"/" setup.py
git add .changes setup.py CHANGELOG.md
git commit -m "semverioner release updates" --no-verify
git flow release start $(CURRENT_VERSION)
git flow release finish $(CURRENT_VERSION)

release: semver clean check dist git
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from setuptools import setup

__version__ = "0.0.1"
__version__ = "0.0.2"

setup(
name="Flask-Beet",
Expand Down

0 comments on commit f9256e0

Please sign in to comment.