Merge tag 'upstream/7.8.1'

Upstream version 7.8.1

# gpg: Firmado el mar 15 nov 2016 14:18:48 ART
# gpg:                usando RSA clave A6C7B88B9583046A11C5403E0B00FB6CEBE2D002
# gpg: Firma correcta de "Ulises Vitulli <dererk@debian.org>" [absoluta]
# gpg:                 alias "Dererk <dererk@torproject.org>" [absoluta]
# gpg:                 alias "Ulises Vitulli <uvitulli@fi.uba.ar>" [absoluta]
# gpg:                 alias "Ulises Vitulli <dererk@satellogic.com>" [absoluta]

1 files changed, 10 insertions, 8 deletions

diff --git a/setup.py b/setup.py
index 6ae145c..64b5e9d 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,6 @@
 # Don't use __future__ in this script, it breaks buildout
 # from __future__ import print_function
 import os
-import subprocess
 import sys
 import shutil
 from setuptools import setup, find_packages
@@ -75,8 +74,8 @@ def expands_symlinks_for_windows():
     path to the file it points to. If not corrected, installing from a git
     clone will end with some files with bad content
 
-    After install the working copy will be dirty (symlink markers overwritten with
-    real content)
+    After install the working copy will be dirty (symlink markers overwritten
+    with real content)
     """
     if sys.platform != 'win32':
         return
@@ -90,7 +89,8 @@ def expands_symlinks_for_windows():
     sys.path = oldpath
     del sys.modules['winutils']
     if failures != -1:
-        print('WARNING: your working copy is now dirty by changes in samplesite, sphinx and themes')
+        print('WARNING: your working copy is now dirty by changes in '
+              'samplesite, sphinx and themes')
     if failures > 0:
         raise Exception("Error: \n\tnot all symlinked files could be fixed." +
                         "\n\tYour best bet is to start again from clean.")
@@ -112,15 +112,15 @@ class nikola_install(install):
 
 
 setup(name='Nikola',
-      version='7.6.4',
-      description='A modular, fast, simple, static website generator',
+      version='7.8.1',
+      description='A modular, fast, simple, static website and blog generator',
       long_description=open('README.rst').read(),
       author='Roberto Alsina and others',
       author_email='ralsina@netmanagers.com.ar',
       url='https://getnikola.com/',
       packages=find_packages(exclude=('tests',)),
       license='MIT',
-      keywords='website, static',
+      keywords='website, blog, static',
       classifiers=('Development Status :: 5 - Production/Stable',
                    'Environment :: Console',
                    'Environment :: Plugins',
@@ -128,6 +128,7 @@ setup(name='Nikola',
                    'Intended Audience :: End Users/Desktop',
                    'License :: OSI Approved :: MIT License',
                    'Operating System :: MacOS',
+                   'Operating System :: MacOS :: MacOS X',
                    'Operating System :: Microsoft :: Windows',
                    'Operating System :: OS Independent',
                    'Operating System :: POSIX',
@@ -136,6 +137,7 @@ setup(name='Nikola',
                    'Programming Language :: Python :: 2.7',
                    'Programming Language :: Python :: 3.3',
                    'Programming Language :: Python :: 3.4',
+                   'Programming Language :: Python :: 3.5',
                    'Topic :: Internet',
                    'Topic :: Internet :: WWW/HTTP',
                    'Topic :: Text Processing :: Markup'),
@@ -151,7 +153,7 @@ setup(name='Nikola',
                'docs/extending.txt']),
               ('share/man/man1', ['docs/man/nikola.1.gz']),
       ],
-      entry_points = {
+      entry_points={
           'console_scripts': [
               'nikola = nikola.__main__:main'
           ]