From 928aaa12b6b34d9872eda4effca9217ecda8e245 Mon Sep 17 00:00:00 2001 From: Roman Mogilatov Date: Fri, 9 Jun 2017 01:45:12 +0300 Subject: [PATCH 1/4] Update makefile --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f3684c28..73c32de4 100644 --- a/Makefile +++ b/Makefile @@ -58,8 +58,13 @@ check: pydocstyle examples/ publish: cythonize - # Create and upload build - python setup.py sdist upload + # Merge release to master branch + git checkout master + git merge --no-ff release/$(VERSION) + git commit -m 'Release $(VERSION)' + git push origin master # Create and upload tag git tag -a $(VERSION) -m 'version $(VERSION)' git push --tags + # Create and upload build + python setup.py sdist upload From 2712d693a0360046257a38cd153d64280d3b1673 Mon Sep 17 00:00:00 2001 From: Roman Mogilatov Date: Fri, 9 Jun 2017 01:46:06 +0300 Subject: [PATCH 2/4] Bump version to 3.4.8 --- src/dependency_injector/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dependency_injector/__init__.py b/src/dependency_injector/__init__.py index 91a172aa..35faf460 100644 --- a/src/dependency_injector/__init__.py +++ b/src/dependency_injector/__init__.py @@ -1,6 +1,6 @@ """Dependency injector top-level package.""" -__version__ = '3.4.7' +__version__ = '3.4.8' """Version number that follows semantic versioning. :type: str From 0635d7783f647ec63c1b640d47abe717256ea2e1 Mon Sep 17 00:00:00 2001 From: Roman Mogilatov Date: Fri, 9 Jun 2017 01:46:18 +0300 Subject: [PATCH 3/4] Add changelog for 3.4.8 --- docs/main/changelog.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/main/changelog.rst b/docs/main/changelog.rst index 838950f7..3676a07c 100644 --- a/docs/main/changelog.rst +++ b/docs/main/changelog.rst @@ -9,6 +9,10 @@ follows `Semantic versioning`_ Development version ------------------- +- No features. + +3.4.8 +----- - Code style fixes in ``providers`` module. 3.4.7 From 67745f8b882b23a79e2bab3220cd30bfe9fd20e0 Mon Sep 17 00:00:00 2001 From: Roman Mogilatov Date: Fri, 9 Jun 2017 01:50:09 +0300 Subject: [PATCH 4/4] Update makefile --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 73c32de4..c5c3f271 100644 --- a/Makefile +++ b/Makefile @@ -60,8 +60,7 @@ check: publish: cythonize # Merge release to master branch git checkout master - git merge --no-ff release/$(VERSION) - git commit -m 'Release $(VERSION)' + git merge --no-ff release/$(VERSION) -m 'Merge branch release/$(VERSION)' git push origin master # Create and upload tag git tag -a $(VERSION) -m 'version $(VERSION)'