Skip to content

Commit

Permalink
Merge pull request #2815 from minrk/release_author
Browse files Browse the repository at this point in the history
update release/authors
  • Loading branch information
takluyver committed Jan 19, 2013
2 parents 9db8811 + 449de65 commit c171883
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
4 changes: 1 addition & 3 deletions IPython/__init__.py
Expand Up @@ -52,9 +52,7 @@
from .utils.frame import extract_module_locals

# Release data
__author__ = ''
for author, email in release.authors.itervalues():
__author__ += author + ' <' + email + '>\n'
__author__ = '%s <%s>' % (release.author, release.author_email)
__license__ = release.license
__version__ = release.version
version_info = release.version_info
Expand Down
4 changes: 2 additions & 2 deletions IPython/core/release.py
Expand Up @@ -130,7 +130,7 @@

download_url = 'https://github.com/ipython/ipython/downloads'

platforms = ['Linux','Mac OSX','Windows XP/2000/NT/Vista/7']
platforms = ['Linux','Mac OSX','Windows XP/Vista/7/8']

keywords = ['Interactive','Interpreter','Shell','Parallel','Distributed',
'Web-based computing', 'Qt console', 'Embedding']
Expand All @@ -144,8 +144,8 @@
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.1',
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3',
'Topic :: System :: Distributed Computing',
'Topic :: System :: Shells'
]
2 changes: 1 addition & 1 deletion IPython/frontend/terminal/ipapp.py
Expand Up @@ -92,7 +92,7 @@ class IPAppCrashHandler(CrashHandler):
"""sys.excepthook for IPython itself, leaves a detailed report on disk."""

def __init__(self, app):
contact_name = release.authors['Fernando'][0]
contact_name = release.author
contact_email = release.author_email
bug_tracker = 'https://github.com/ipython/ipython/issues'
super(IPAppCrashHandler,self).__init__(
Expand Down

0 comments on commit c171883

Please sign in to comment.