Skip to content

Commit a8e0d41

Browse files
committed
Improves release process via Makefile and doc
Adds `Makefile` `release/*` target.
1 parent b21eee2 commit a8e0d41

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
# Change Log
22

33
## [Unreleased]
4+
45
- Update buildozer, p4a, and ndk versions, refs #21
56
- Publish to F-Droid, refs #20
67
- Improve Android camera permission handling, refs #12, #16
78
- Use upstream autofocus, refs #8
89

9-
## [20190902]
10+
## [2019.0902]
1011

1112
- Update Cython for Python3.7 support, refs #35
1213
- Make garden.zbarcam a package again, refs #36

Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ GARDEN=$(VENV_NAME)/bin/garden
55
PYTHON=$(VENV_NAME)/bin/python
66
ISORT=$(VENV_NAME)/bin/isort
77
FLAKE8=$(VENV_NAME)/bin/flake8
8+
TWINE=`which twine`
89
SOURCES=src/ tests/ setup.py setup_meta.py
910
# using full path so it can be used outside the root dir
1011
SPHINXBUILD=$(shell realpath venv/bin/sphinx-build)
@@ -134,3 +135,12 @@ lint: isort-check flake8
134135

135136
docs:
136137
cd $(DOCS_DIR) && SPHINXBUILD=$(SPHINXBUILD) make html
138+
139+
release/build:
140+
rm -rf dist/ build/
141+
$(PYTHON) setup.py sdist bdist_wheel
142+
$(PYTHON) setup_meta.py sdist bdist_wheel
143+
$(TWINE) check dist/*
144+
145+
release/upload:
146+
$(TWINE) upload dist/*

doc/source/release.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ This is documenting the release process.
88
Make sure the CHANGELOG.md is up to date and follows the http://keepachangelog.com guidelines.
99
Start the release with git flow:
1010
```sh
11-
git flow release start YYYYMMDD
11+
git flow release start YYYY.MMDD
1212
```
1313
Now update the [CHANGELOG.md](/CHANGELOG.md) `[Unreleased]` section to match the new release version.
1414
Also update the `version` string from the
1515
[src/kivy_garden/zbarcam/version.py](https://github.com/kivy-garden/zbarcam/blob/develop/src/kivy_garden/zbarcam/version.py)
1616
file.
1717
Then commit and finish release.
1818
```sh
19-
git commit -a -m "YYYYMMDD"
19+
git commit -a -m "YYYY.MMDD"
2020
git flow release finish
2121
```
2222
Push everything, make sure tags are also pushed:

0 commit comments

Comments
 (0)