From 6eaef88a8309e6a913872d07b6bea421c6960713 Mon Sep 17 00:00:00 2001 From: Ian Stapleton Cordasco Date: Wed, 26 Jul 2017 06:51:25 -0500 Subject: [PATCH] Update project for new organization home Update AUTHORS.rst with names of contributors thus far and fix-up my name in some places. Further, include both licenses in our packaging. --- AUTHORS.rst | 13 ++++++++++++- README.rst | 11 +++++------ setup.py | 5 +++-- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/AUTHORS.rst b/AUTHORS.rst index 55848f0..2581f4d 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -1,4 +1,15 @@ Development Lead ---------------- -- Ian Cordasco +- Ian Stapleton Cordasco + +Contributors +------------ + +- Brett Cannon +- Daniel Imhoff +- Eugene Eeo +- Jeff Potter +- Philippe Ombredanne +- Thierry Bastian +- Thomas Grainger diff --git a/README.rst b/README.rst index 6e4ea38..2c9d98d 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ uritemplate =========== -Documentation_ -- GitHub_ -- BitBucket_ -- Travis-CI_ +Documentation_ -- GitHub_ -- Travis-CI_ Simple python library to deal with `URI Templates`_. The API looks like @@ -56,9 +56,8 @@ License Modified BSD license_ -.. _Documentation: http://uritemplate.rtfd.org/ -.. _GitHub: https://github.com/sigmavirus24/uritemplate -.. _BitBucket: https://bitbucket.org/icordasc/uritemplate -.. _Travis-CI: https://travis-ci.org/sigmavirus24/uritemplate +.. _Documentation: https://uritemplate.readthedocs.io/ +.. _GitHub: https://github.com/python-hyper/uritemplate +.. _Travis-CI: https://travis-ci.org/python-hyper/uritemplate .. _URI Templates: http://tools.ietf.org/html/rfc6570 -.. _license: https://github.com/sigmavirus24/uritemplate/blob/master/LICENSE +.. _license: https://github.com/python-hyper/uritemplate/blob/master/LICENSE diff --git a/setup.py b/setup.py index 7f37118..210576a 100644 --- a/setup.py +++ b/setup.py @@ -13,11 +13,12 @@ long_description="\n\n".join([open("README.rst").read(), open("HISTORY.rst").read()]), license="BSD 3-Clause License or Apache License, Version 2.0", - author="Ian Cordasco", + author="Ian Stapleton Cordasco", author_email="graffatcolmingov@gmail.com", url="https://uritemplate.readthedocs.org", packages=packages, - package_data={'': ['LICENSE', 'AUTHORS.rst']}, + package_data={'': ['LICENSE', 'LICENSE.APACHE', 'LICENSE.BSD', + 'AUTHORS.rst']}, include_package_data=True, classifiers=[ 'Development Status :: 5 - Production/Stable',