Imported Upstream version 7.1.0upstream/7.1.0

1 files changed, 20 insertions, 26 deletions

diff --git a/setup.py b/setup.py
index 815b01d..282e9d2 100755
--- a/setup.py
+++ b/setup.py
@@ -130,17 +130,11 @@ def install_manpages(root, prefix):
 
 def remove_old_files(self):
     tree = os.path.join(self.install_lib, 'nikola')
-    tree2 = os.path.join('build', 'lib', 'nikola')
     try:
         shutil.rmtree(tree, ignore_errors=True)
     except:
         pass
 
-    try:
-        shutil.rmtree(tree2, ignore_errors=True)
-    except:
-        pass
-
 
 class nikola_install(install):
     def run(self):
@@ -151,7 +145,7 @@ class nikola_install(install):
 
 
 setup(name='Nikola',
-      version='7.0.1',
+      version='7.1.0',
       description='A modular, fast, simple, static website generator',
       long_description=open('README.rst').read(),
       author='Roberto Alsina and others',
@@ -170,25 +164,25 @@ setup(name='Nikola',
                 ],
       license='MIT',
       keywords='website, static',
-      classifiers=(b'Development Status :: 5 - Production/Stable',
-                   b'Environment :: Console',
-                   b'Environment :: Plugins',
-                   b'Environment :: Web Environment',
-                   b'Intended Audience :: End Users/Desktop',
-                   b'License :: OSI Approved :: MIT License',
-                   b'Operating System :: MacOS',
-                   b'Operating System :: Microsoft :: Windows',
-                   b'Operating System :: OS Independent',
-                   b'Operating System :: POSIX',
-                   b'Operating System :: Unix',
-                   b'Programming Language :: Python',
-                   b'Programming Language :: Python :: 2.6',
-                   b'Programming Language :: Python :: 2.7',
-                   b'Programming Language :: Python :: 3.3',
-                   b'Programming Language :: Python :: 3.4',
-                   b'Topic :: Internet',
-                   b'Topic :: Internet :: WWW/HTTP',
-                   b'Topic :: Text Processing :: Markup'),
+      classifiers=('Development Status :: 5 - Production/Stable',
+                   'Environment :: Console',
+                   'Environment :: Plugins',
+                   'Environment :: Web Environment',
+                   'Intended Audience :: End Users/Desktop',
+                   'License :: OSI Approved :: MIT License',
+                   'Operating System :: MacOS',
+                   'Operating System :: Microsoft :: Windows',
+                   'Operating System :: OS Independent',
+                   'Operating System :: POSIX',
+                   'Operating System :: Unix',
+                   'Programming Language :: Python',
+                   'Programming Language :: Python :: 2.6',
+                   'Programming Language :: Python :: 2.7',
+                   'Programming Language :: Python :: 3.3',
+                   'Programming Language :: Python :: 3.4',
+                   'Topic :: Internet',
+                   'Topic :: Internet :: WWW/HTTP',
+                   'Topic :: Text Processing :: Markup'),
       install_requires=dependencies,
       extras_require=extras,
       tests_require=['pytest'],