Skip to content

Commit 682da9f

Browse files
committed
Release prep !wip
1 parent 6dd7fcc commit 682da9f

File tree

4 files changed

+22
-6
lines changed

4 files changed

+22
-6
lines changed

HISTORY.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,21 @@ Release History
33

44
.. :changelog:
55
6+
v0.8.2 (2018-09-13)
7+
------------------------
8+
9+
Fix
10+
~~~
11+
- Release tag checks for `make pre-release`
12+
- Fixed command API bugs exposed with python3.7.
13+
14+
Other
15+
~~~~~
16+
- Use correct yaml parser and version bump.
17+
- More python version tested.
18+
- Better pytest_cache clean, and formatting updates.
19+
20+
621
v0.8.1 (2018-05-14)
722
--------------------
823

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ pre-release: lint test changelog requirements
132132
@echo "RELEASE_TAG: $(RELEASE_TAG)"
133133
@echo "RELEASE_NAME: $(RELEASE_NAME)"
134134
check-manifest
135-
@if git tag -l | grep -E '^$(shell echo ${RELEASE_TAG} | sed 's|\.|.|g')$$' > /dev/null; then \
135+
@if git tag -l | grep -E '^$(shell echo ${RELEASE_TAG} | sed 's|\.|\\.|g')$$' > /dev/null; then \
136136
echo "Version tag '${RELEASE_TAG}' already exists!"; \
137137
false; \
138138
fi
@@ -151,11 +151,12 @@ requirements:
151151
pip-compile -U requirements.txt -o ./requirements.txt
152152

153153
changelog:
154-
last=`git tag -l --sort=version:refname | grep '^v[0-9]' | tail -n1`;\
154+
last=`git tag -l --sort=taggerdate | grep '^v[0-9]' | tail -n1`;\
155155
if ! grep "${CHANGELOG_HEADER}" ${CHANGELOG} > /dev/null; then \
156156
rm -f ${CHANGELOG}.new; \
157+
echo last: $$last;\
157158
if test -n "$$last"; then \
158-
gitchangelog --author-format=email \
159+
gitchangelog --author-format=email --debug \
159160
--omit-author="travis@pobox.com" $${last}..HEAD |\
160161
sed "s|^%%version%% .*|${CHANGELOG_HEADER}|" |\
161162
sed '/^.. :changelog:/ r/dev/stdin' ${CHANGELOG} \

cookiecutter/{{cookiecutter.project_name}}/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ pre-release: lint test changelog requirements
143143
@echo "RELEASE_TAG: $(RELEASE_TAG)"
144144
@echo "RELEASE_NAME: $(RELEASE_NAME)"
145145
check-manifest
146-
@if git tag -l | grep -E '^$(shell echo ${RELEASE_TAG} | sed 's|\.|.|g')$$' > /dev/null; then \
146+
@if git tag -l | grep -E '^$(shell echo ${RELEASE_TAG} | sed 's|\.|\\.|g')$$' > /dev/null; then \
147147
echo "Version tag '${RELEASE_TAG}' already exists!"; \
148148
false; \
149149
fi
@@ -166,7 +166,7 @@ requirements:
166166
{%- endif %}
167167

168168
changelog:
169-
last=`git tag -l --sort=version:refname | grep '^v[0-9]' | tail -n1`;\
169+
last=`git tag -l --sort=taggerdate | grep '^v[0-9]' | tail -n1`;\
170170
if ! grep "${CHANGELOG_HEADER}" ${CHANGELOG} > /dev/null; then \
171171
rm -f ${CHANGELOG}.new; \
172172
if test -n "$$last"; then \

nicfit/__about__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def __parse_version(v): # pragma: nocover
1414
return ver, rel, ver_info
1515

1616

17-
__version__ = "0.8.1"
17+
__version__ = "0.8.2"
1818
__release_name__ = ""
1919
__years__ = "2016-2018"
2020

0 commit comments

Comments
 (0)