diff options
| author | Marius Gedminas <marius@gedmin.as> | 2018-07-18 15:26:47 +0300 |
|---|---|---|
| committer | Marius Gedminas <marius@gedmin.as> | 2018-07-18 15:27:10 +0300 |
| commit | 7561b3a82cf6281648a1cf2ef31aa38b6551bed1 (patch) | |
| tree | 73a5c1ec355de14dd41ada598fd76cbd1f3e58b7 | |
| parent | 5150fa27ab347698a4c070bd022a7b5042265634 (diff) | |
Preparing release 0.11.10.11.1
| -rw-r--r-- | CHANGES.rst | 2 | ||||
| -rw-r--r-- | MANIFEST.in | 3 | ||||
| -rw-r--r-- | release.mk | 14 | ||||
| -rw-r--r-- | src/gtimelog/__init__.py | 2 |
4 files changed, 13 insertions, 8 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 0b2f9bd..e9526e8 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,7 +1,7 @@ Changelog --------- -0.11.1 (unreleased) +0.11.1 (2018-07-18) ~~~~~~~~~~~~~~~~~~~ * The undocmented remote task list over HTTP(S) feature is now able to ask diff --git a/MANIFEST.in b/MANIFEST.in index b6e4049..b759c7f 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -23,3 +23,6 @@ prune docs/build # added by check_manifest.py include *.mk + +# added by check_manifest.py +recursive-include flatpak *.json @@ -1,6 +1,7 @@ -# Makefile.rules version 1.0 (2017-12-19) +# Makefile.rules version 1.1 (2017-12-20) # # Helpful Makefile rules for releasing Python packages. +# https://github.com/mgedmin/python-project-skel # You might want to change these FILE_WITH_VERSION ?= setup.py @@ -10,15 +11,18 @@ CHANGELOG_FORMAT ?= $(changelog_ver) ($(changelog_date)) # These should be fine PYTHON ?= python -PYPI_PUBLISH ?= rm -rf dist && $(PYTHON) setup.py -q sdist bdist_wheel && twine upload dist/* && $(VCS_TAG) `$(PYTHON) setup.py --version` +PYPI_PUBLISH ?= rm -rf dist && $(PYTHON) setup.py -q sdist bdist_wheel && twine upload dist/* # These should be fine, as long as you use Git VCS_GET_LATEST ?= git pull VCS_STATUS ?= git status --porcelain VCS_EXPORT ?= git archive --format=tar --prefix=tmp/tree/ HEAD | tar -xf - -VCS_TAG ?= git tag -s +VCS_TAG ?= git tag -s $(changelog_ver) -m \"Release $(changelog_ver)\" VCS_COMMIT_AND_PUSH ?= git commit -av -m "Post-release version bump" && git push && git push --tags +# These are internal implementation details +changelog_ver = `$(PYTHON) setup.py --version` +changelog_date = `LC_ALL=C date +'$(CHANGELOG_DATE_FORMAT)'` .PHONY: dist @@ -81,9 +85,6 @@ check-version-number: check-long-description: @$(PYTHON) setup.py --long-description | rst2html --exit-status=2 > /dev/null -changelog_ver = `$(PYTHON) setup.py --version` -changelog_date = `LC_ALL=C date +'$(CHANGELOG_DATE_FORMAT)'` - .PHONY: check-changelog check-changelog: @ver_and_date="$(CHANGELOG_FORMAT)" && \ @@ -106,6 +107,7 @@ define release_recipe = @echo "Please run" @echo @echo " $(PYPI_PUBLISH)" + @echo " $(VCS_TAG)" @echo @echo "Please increment the version number in $(FILE_WITH_VERSION)" @echo "and add a new empty entry at the top of the changelog in $(FILE_WITH_CHANGELOG), then" diff --git a/src/gtimelog/__init__.py b/src/gtimelog/__init__.py index 03ef0c9..1132dd2 100644 --- a/src/gtimelog/__init__.py +++ b/src/gtimelog/__init__.py @@ -1,3 +1,3 @@ # The gtimelog package. -__version__ = '0.11.1.dev0' +__version__ = '0.11.1' |