Upgrade setuptools

Author: wetneb

setup.cfg

@@ -2,10 +2,10 @@
 name = git-deps
 summary = automatically detect dependencies between git commits
 author = Adam Spiers
-author-email = git@adamspiers.org
+author_email = git@adamspiers.org
 license = GPL-2+
-home-page = https://github.com/aspiers/git-deps
-description-file = README.md
+home_page = https://github.com/aspiers/git-deps
+description_file = README.md
 classifier =
     Development Status :: 4 - Beta
     Environment :: Console
@@ -27,11 +27,17 @@ console_scripts =
 [files]
 scripts =
     bin/git-fixup
-packages =
-    git_deps
 data_files =
     share/git_deps = share/gitfile-handler.desktop
 
+[options]
+packages =
+    git_deps
+
+[options.entry_points]
+console_scripts =
+    git-deps = git_deps.cli:run
+
 [test]
 # py.test options when running `python setup.py test`
 addopts = tests

setup.py

@@ -18,7 +18,7 @@ def setup_package():
     setup(
         setup_requires=[
             'six',
-            'pyscaffold>=2.5.10,<2.6a0',
+            'pyscaffold',
         ] + sphinx,
         long_description='README.md',
         long_description_content_type="text/markdown",