Update release script and release 3.6.1

Travis password should be fixed and thus upload to pypi
should be back online.

Author: gsemet

.travis.yml

@@ -63,8 +63,9 @@ deploy:
   distributions: sdist bdist_wheel
   password:
     secure: >
-      ARo04J13A2+CGAqvIoKsypctOIQZI8e07to8OGtrhC7gVv92Fkw0peHpn7t0DFODFAjPhFZIGsNAvy3bST
-      sB2UQ85b+fCdcsltFSBHKknvixXOSfE0LbBEzHpGKYvUci0Y2cYWzBVZuj7gR76YWWIGK9560EnXML2eNtTJ4cVuQ=
+        MIbsyar7H1epBcp+TpSJ3APYUnIiQAB0M9cLEXFzqwJU1bjPev8fYNbfCQB0bA/TSHXaQjfR
+        F3sTFFYxpVOxjRHPIWctBTTuKOETAd3XR96YtVRGLpglxLvI+9U5YPuGWC4SbKuAE8L8pqH9
+        O9pnKqZCaarGxOm+GjEZrfzfm1g=
   on:
     tags: true
     repo: Guake/guake

Makefile

@@ -433,26 +433,27 @@ release-note-github: reno-lint
 			sed 's/\\\#/\#/g' | \
 		tr '\r' '\n'
 
-release: git-pull-rebase tag-pbr git-commit-release-commit release-note-news rm-dists update-po dists release-git-tag release-note-github git-commit-amend
-
-git-pull-rebase:
+release:
 	git checkout -f master
 	git pull --rebase upstream master
-
-release-git-tag:
 	@{ \
-		set -x \
-		git tag -d "$$(pipenv run python setup.py --version | cut -d. -f1,2,3)"; \
-		git commit --all -m "Release ???"; \
+		set -e ;\
+		set -x ;\
+		export VERSION=$$(pipenv run python setup.py --version | cut -d. -f1,2,3); \
+		echo "I: Computed new version: $$VERSION"; \
+		echo "I: presse ENTER to accept or type new version number:"; \
+		read VERSION_OVERRIDE; \
+		VERSION=$${VERSION_OVERRIDE:-$$VERSION}; \
 		PROJECTNAME=$$(pipenv run python setup.py --name); \
-		echo "Note: tag has been removed. Use 'make tag-pbr' to tag and push to origin"; \
+		echo "I: Tagging $$PROJECTNAME in version $$VERSION with tag: $$VERSION" ; \
+		echo "I: Pushing tag $$VERSION, press ENTER to continue, C-c to interrupt"; \
+		(git commit --all -m "Release $${VERSION}" || true) ; \
+		git tag $$VERSION -m "$$PROJECTNAME $$VERSION"; \
+		make release-note-news rm-dists update-po dists ; \
+		git commit --all --amend -n; \
+		git tag -f "$${VERSION}"; \
 	}
-
-git-commit-amend:
-	git commit -a --amend
-
-git-commit-release-commit:
-	git commit --all -m "Release $$(pipenv run python setup.py --version | cut -d. -f1,2,3)"
+	make release-note-github
 
 
 # aliases to gracefully handle typos on poor dev's terminal

NEWS.rst

@@ -2,6 +2,14 @@
 Guake
 =====
 
+3.6.1
+=====
+
+Bug Fixes
+---------
+
+- Minor build system fixes
+
 3.6.0
 =====
 

guake/main.py

@@ -42,7 +42,6 @@
 from guake.utils import restore_preferences
 from guake.utils import save_preferences
 
-
 # When we are in the document generation on readthedocs, we do not have paths.py generated
 try:
     from guake.paths import LOCALE_DIR

guake/support.py

@@ -10,10 +10,10 @@
 from gi.repository import GdkX11
 from gi.repository import Gtk
 
-from guake import guake_version
 from guake import gtk_version
-from guake import vte_version
+from guake import guake_version
 from guake import vte_runtime_version
+from guake import vte_version
 
 
 def horizonal_line():
@@ -35,17 +35,18 @@ def populate_display(display):
         monitor = display.get_monitor(i)
         manufacturer = monitor.get_manufacturer()
         model = monitor.get_model()
-        v = '%s%s%s' % (manufacturer if manufacturer else '',
-                        ' ' if manufacturer or model else '',
-                        model if model else '')
+        v = '%s%s%s' % (
+            manufacturer if manufacturer else '', ' ' if manufacturer or model else '',
+            model if model else ''
+        )
         print('* Monitor: {} - {}'.format(i, v))
 
         # Geometry
         rect = monitor.get_geometry()
         scale = monitor.get_scale_factor()
-        v = '%d x %d%s at %d, %d' % (rect.width, rect.height,
-                                     ' % 2' if scale == 2 else '',
-                                     rect.x, rect.y)
+        v = '%d x %d%s at %d, %d' % (
+            rect.width, rect.height, ' % 2' if scale == 2 else '', rect.x, rect.y
+        )
         print('    * Geometry:\t\t{}'.format(v))
 
         # Size

releasenotes/notes/hotfix-5b676642440c4100.yaml

@@ -0,0 +1,3 @@
+fixes:
+  - |
+    Minor build system fixes