Fixes url, author_email in setup.py.

Signed-off-by: Kouhei Maeda <mkouhei@palmtb.net>
mkouhei · Mar 7, 2016 · ef34d8f · ef34d8f
1 parent 056bd78
commit ef34d8f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/bootstrap_py/templates/setup.py.j2 b/bootstrap_py/templates/setup.py.j2
@@ -6,6 +6,12 @@ import sys
 from setuptools import setup
 from setuptools.command.test import test as TestCommand
 
+{% if username -%}
+{% set url='https://github.com/%s/%s'|format(username, name) -%}
+{% else -%}
+{% set url=url -%}
+{% endif -%}
+
 
 class Tox(TestCommand):
     user_options = [('tox-args=', 'a', 'Arguments to pass to tox')]
@@ -73,7 +79,7 @@ setup(name='{{ name }}',
       description='{{ description }}',
       long_description=long_description,
       author='{{ author }}',
-      author_email='{{ author_email }}',
+      author_email='{{ email }}',
       url='{{ url }}',
       classifiers=classifiers,
       packages=['{{ name }}'],

diff --git a/bootstrap_py/tests/test_package.py b/bootstrap_py/tests/test_package.py
@@ -89,7 +89,7 @@ def setUp(self):
         params = Dummy()
         setattr(params, 'name', 'foo')
         setattr(params, 'author', 'Alice')
-        setattr(params, 'author_email', 'alice@example.org')
+        setattr(params, 'email', 'alice@example.org')
         setattr(params, 'url', 'https://example.org/foo')
         setattr(params, 'license', 'gplv3')
         setattr(params, 'outdir', self.testdir)