setup.py: Use __url__ and __author__ from rss2email/__init__.py

Instead of duplicating those values locally.  This gives us one less
place to forget to update the next time we change the website or
maintainer.

Also, update __url__ to point to my GitHub repository and shift the
email address to rss2email.__email__.

Signed-off-by: W. Trevor King <wking@tremily.us>

diff --git a/rss2email/__init__.py b/rss2email/__init__.py
index 7e1e20adbb8418d4953f115a61d72b99027261db..a2aa9d0da26a1dcac4cd62402ae12bd2cbfdf38e 100644 (file)
--- a/rss2email/__init__.py
+++ b/rss2email/__init__.py
@@ -22,8 +22,9 @@ import sys as _sys
 
 
 __version__ = '3.0'
-__url__ = 'http://rss2email.infogami.com'
+__url__ = 'https://github.com/wking/rss2email'
 __author__ = 'W. Trevor King'
+__email__ = 'rss2email@tremily.us'
 __copyright__ = '(C) 2004 Aaron Swartz. GNU GPL 2 or 3.'
 __contributors__ = [
     'Aaron Swartz (original author)',

diff --git a/setup.py b/setup.py
index d313ddcf0007384d71b32cffa13462fcb041495b..1b8b5ef525a7af1c213575f26deb5f6f166c37d6 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ import codecs as _codecs
 from distutils.core import setup
 import os.path as _os_path
 
-from rss2email import __version__
+from rss2email import __version__, __url__, __author__, __email__
 
 
 _this_dir = _os_path.dirname(__file__)
@@ -28,9 +28,9 @@ _this_dir = _os_path.dirname(__file__)
 setup(
     name='rss2email',
     version=__version__,
-    maintainer='W. Trevor King',
-    maintainer_email='rss2email@tremily.us',
-    url='https://github.com/wking/rss2email/',
+    maintainer=__author__,
+    maintainer_email=__email__,
+    url=__url__,
     download_url='https://github.com/wking/rss2email/archive/v{}.tar.gz'.format(__version__),
     license='GNU General Public License (GPL)',
     platforms=['all'],