getnikola · Mar 4, 2016 · Mar 4, 2016 · Mar 4, 2016 · Mar 4, 2016
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,19 @@
+New in master
+=============
+
+Features
+--------
+
+* Add ``post_type`` to post-list directive (Issue #2272)
+* Use ``sys.executable`` for launching pip in ``plugin`` (Issue #2275)
+
+Bugfixes
+--------
+
+* Don’t display “Good link” messages in ``nikola check -l`` by default,
+  can be re-enabled with ``-v`` option (Issue #2268)
+* Fix a format string in ``nikola check`` (Issue #2267)
+
 New in v7.7.6
 =============
 

diff --git a/docs/extending.txt b/docs/extending.txt
@@ -9,7 +9,7 @@
 Extending Nikola
 ================
 
-:Version: v7.7.6
+:Version: 7.7.6
 :Author: Roberto Alsina <ralsina@netmanagers.com.ar>
 
 .. class:: alert alert-info pull-right

diff --git a/docs/man/nikola.rst b/docs/man/nikola.rst
@@ -6,7 +6,7 @@ Nikola
 A Static Site and Blog Generator
 --------------------------------
 
-:Version: Nikola vv7.7.6
+:Version: Nikola v7.7.6
 :Manual section: 1
 :Manual group: User Commands
 

diff --git a/docs/manual.txt b/docs/manual.txt
@@ -9,7 +9,7 @@
 The Nikola Handbook
 ===================
 
-:Version: v7.7.6
+:Version: 7.7.6
 
 .. class:: alert alert-info pull-right
 

diff --git a/docs/social_buttons.txt b/docs/social_buttons.txt
@@ -9,7 +9,7 @@
 Using Alternative Social Buttons with Nikola
 ============================================
 
-:Version: v7.7.6
+:Version: 7.7.6
 
 .. class:: alert alert-info pull-right
 

diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = 'v7.7.6'
+version = '7.7.6'
 # The full version, including alpha/beta/rc tags.
-release = 'v7.7.6'
+release = '7.7.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/theming.txt b/docs/theming.txt
@@ -9,7 +9,7 @@
 Theming Nikola
 ==============
 
-:Version: v7.7.6
+:Version: 7.7.6
 :Author: Roberto Alsina <ralsina@netmanagers.com.ar>
 
 .. class:: alert alert-info pull-right

diff --git a/nikola/__init__.py b/nikola/__init__.py
@@ -29,7 +29,7 @@
 from __future__ import absolute_import
 import os
 
-__version__ = "v7.7.6"
+__version__ = "7.7.6"
 DEBUG = bool(os.getenv('NIKOLA_DEBUG'))
 
 from .nikola import Nikola  # NOQA

diff --git a/nikola/plugins/command/check.py b/nikola/plugins/command/check.py
@@ -32,6 +32,7 @@
 import re
 import sys
 import time
+import logbook
 try:
     from urllib import unquote
     from urlparse import urlparse, urljoin, urldefrag
@@ -164,9 +165,9 @@ def _execute(self, options, args):
             print(self.help())
             return False
         if options['verbose']:
-            self.logger.level = 1
+            self.logger.level = logbook.DEBUG
         else:
-            self.logger.level = 4
+            self.logger.level = logbook.NOTICE
         failure = False
         if options['links']:
             failure |= self.scan_links(options['find_sources'], options['remote'])
@@ -343,7 +344,7 @@ def analyze(self, fname, find_sources=False, check_remote=False):
 
                 elif target_filename not in self.existing_targets:
                     if os.path.exists(target_filename):
-                        self.logger.notice(u"Good link {0} => {1}".format(target, target_filename))
+                        self.logger.info("Good link {0} => {1}".format(target, target_filename))
                         self.existing_targets.add(target_filename)
                     else:
                         rv = True

diff --git a/scripts/github-release.py b/scripts/github-release.py
@@ -1,19 +1,27 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import subprocess
-import sys
 import os
+import argparse
 
 if not os.path.exists('.pypt/gh-token'):
     print("To use this script, you must create a GitHub token first.")
     print("Get a token here: https://github.com/settings/tokens")
     print("Then, put it in a file named .pypt/gh-token")
     exit(1)
 
-inpf = input if sys.version_info[0] == 3 else raw_input
+parser = argparse.ArgumentParser(description="GitHub Release helper")
+parser.add_argument("FILE", nargs=1, help="Markdown file to use")
+parser.add_argument("TAG", nargs=1, help="Tag name (usually vX.Y.Z)")
+
+args = parser.parse_args()
+
+if not args.TAG[0].startswith("v"):
+    print("WARNING: tag should start with v")
+    i = input("Add `v` to tag? [y/n] ")
+    if i.lower().strip().startswith('y'):
+        args.TAG[0] = 'v' + args.TAG[0]
 
-FILE = inpf("Markdown file to use: ")
 BASEDIR = os.getcwd()
 REPO = 'getnikola/nikola'
-TAG = inpf("Tag name (usually vX.Y.Z): ")
 
-subprocess.call(['.pypt/ghrel', FILE, BASEDIR, REPO, TAG])
+subprocess.call(['.pypt/ghrel', args.FILE[0], BASEDIR, REPO, args.TAG[0]])
diff --git a/scripts/set_version.py b/scripts/set_version.py
@@ -26,7 +26,12 @@ def sed_like_thing(pattern, repl, path):
 
 if __name__ == "__main__":
     inpf = raw_input if sys.version_info[0] == 2 else input
-    version = inpf("New version number (in format X.Y.Z): ").strip()
+    while True:
+        version = inpf("New version number (in format X.Y.Z): ").strip()
+        if version.startswith('v'):
+            print("ERROR: the version number must not start with v.")
+        else:
+            break
 
     for doc in glob.glob(os.path.join("docs/*.txt")):
         sed_like_thing(":Version: .*", ":Version: {0}".format(version), doc)

diff --git a/setup.py b/setup.py
@@ -113,7 +113,7 @@ def run(self):
 
 
 setup(name='Nikola',
-      version='v7.7.6',
+      version='7.7.6',
       description='A modular, fast, simple, static website and blog generator',
       long_description=open('README.rst').read(),
       author='Roberto Alsina and others',