Merge Release 2.0.7 (#519) from skion/2.0.7

.travis.yml

@@ -22,12 +22,24 @@ script: tox
 
 after_success: coveralls
 notifications:
-  irc: irc.freenode.org#oauthlib
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/6008c872bf0ecee344f4
+    on_success: change
+    on_failure: always
+    on_start: never
 deploy:
-  provider: pypi
-  user: ib.lundgren
-  password:
-    secure: PGZF9pRiTGCSwQjk1ddTKF3x4rQ0iAiPbg2uSixyO68uMXRgJjwHhSrNM0OEqtK5YWU5FE5L0DwR1nkrpEJKO4a5q2EOgos+gVoKpJfinoUNOOkjc1VHpqKM0uRf/OKrw1alvWUwqvW8B+DOb9TY5c5VZxQuRL+iwdrtwzFlKls=
-  on:
-    tags: true
-    repo: idan/oauthlib
+  - provider: pypi
+    user: JonathanHuot
+    password:
+      secure: "OozNM16flVLvqDoNzmoTENchhS1w0/dEJZvXBQK2KWmh8fyGj2UZus1vkl6bA5V3Yu9MZLYFpDcltl/qraY3Up6iXQpwKz4q+ICygAudYM2kJ5l8ZEe+wy2FikWbD6LkXf5uKIJJnPNSC8AI86ZyxM/XZxbYjj/+jXyJ1YFZwwQ="
+      distributions: sdist bdist_wheel
+      on:
+        tags: true
+        repo: oauthlib/oauthlib
+  - provider: releases
+    api_key: "$GITHUB_OAUTH_TOKEN"
+    skip_cleanup: true
+    on:
+      tags: true
+      repo: oauthlib/oauthlib

AUTHORS

@@ -26,3 +26,5 @@ Juan Fabio García Solero
 Omer Katz
 Joel Stevenson
 Brendan McCollam
+Jonathan Huot
+Pieter Ennes

CHANGELOG.rst

@@ -1,12 +1,29 @@
 Changelog
 =========
 
+2.0.7 (2018-03-19)
+------------------
+
+* Moved oauthlib into new organization on GitHub.
+* Include license file in the generated wheel package. (#494)
+* When deploying a release to PyPI, include the wheel distribution. (#496)
+* Check access token in self.token dict. (#500)
+* Added bottle-oauthlib to docs. (#509)
+* Update repository location in Travis. (#514)
+* Updated docs for organization change. (#515)
+* Replace G+ with Gitter. (#517)
+* Update requirements. (#518)
+* Add shields for Python versions, license and RTD. (#520)
+* Fix ReadTheDocs build (#521).
+* Fixed "make" command to test upstream with local oauthlib. (#522)
+* Replace IRC notification with Gitter Hook. (#523)
+* Added Github Releases deploy provider. (#523)
+
 2.0.6 (2017-10-20)
 ------------------
 
 * 2.0.5 contains breaking changes.
 
-
 2.0.5 (2017-10-19)
 ------------------
 

Makefile

@@ -1,47 +1,57 @@
-PYS = py27,py34,pypy
+# Downstream tests (Don't be evil)
+#
+# Try and not break the libraries below by running their tests too.
+#
+# Unfortunately there is no neat way to run downstream tests AFAIK
+# Until we have a proper downstream testing system we will
+# stick to this Makefile.
+#---------------------------
+# HOW TO ADD NEW DOWNSTREAM LIBRARIES
+#
+# Please specify your library as well as primary contacts.
+# Since these contacts will be addressed with Github mentions they
+# need to be Github users (for now)(sorry Bitbucket).
+#
+clean:
+	rm -rf .tox
+	rm -rf bottle-oauthlib
+	rm -rf django-oauth-toolkit
+	rm -rf flask-oauthlib
+	rm -rf requests-oauthlib
 
 test:
-	# Test OAuthLib
-	tox -e "$(PYS)"
-	#
-	# Downstream tests (Don't be evil)
-	#
-	# Try and not break the libraries below by running their tests too.
-	#
-	# Unfortunately there is no neat way to run downstream tests AFAIK
-	# Until we have a proper downstream testing system we will
-	# stick to this Makefile.
+	tox
+
+bottle:
 	#---------------------------
-	# HOW TO ADD NEW DOWNSTREAM LIBRARIES
-	#
-	# Please specify your library as well as primary contacts.
-	# Since these contacts will be addressed with Github mentions they
-	# need to be Github users (for now)(sorry Bitbucket).
-	#
+	# Library thomsonreuters/bottle-oauthlib
+	# Contacts: Jonathan.Huot
+	cd bottle-oauthlib 2>/dev/null || git clone https://github.com/thomsonreuters/bottle-oauthlib.git
+	cd bottle-oauthlib && sed -i.old 's,deps =,deps= --editable=file://{toxinidir}/../,' tox.ini && sed -i.old '/oauthlib/d' requirements.txt && tox
+
+flask:
 	#---------------------------
 	# Library: lepture/flask-oauthLib
 	# Contacts: lepture,widnyana
-	git clone https://github.com/lepture/flask-oauthlib.git
-	cd flask-oauthlib && cp ../tox.ini . && sed -i 's/py32,py33,py34,//' tox.ini && sed -i '/mock/a \     Flask-SQLAlchemy' tox.ini &&  tox -e "$(PYS)"
-	rm -rf flask-oauthlib
+	cd flask-oauthlib 2>/dev/null || git clone https://github.com/lepture/flask-oauthlib.git
+	cd flask-oauthlib && sed -i.old 's,deps =,deps= --editable=file://{toxinidir}/../,' tox.ini && sed -i.old '/oauthlib/d' requirements.txt && tox
+
+django:
 	#---------------------------
 	# Library: evonove/django-oauth-toolkit
 	# Contacts: evonove,masci
 	# (note: has tox.ini already)
-	git clone https://github.com/evonove/django-oauth-toolkit.git
-	cd django-oauth-toolkit && tox -e "$(PYS)"
-	rm -rf django-oauth-toolkit
+	cd django-oauth-toolkit 2>/dev/null || git clone https://github.com/evonove/django-oauth-toolkit.git
+	cd django-oauth-toolkit && sed -i.old 's,deps =,deps= --editable=file://{toxinidir}/../,' tox.ini && tox -e py27,py35,py36
+
+requests:
 	#---------------------------
 	# Library requests/requests-oauthlib
 	# Contacts: ib-lundgren,lukasa
-	git clone https://github.com/requests/requests-oauthlib.git
-	cd requests-oauthlib && cp ../tox.ini . && sed -i '/mock/a \     requests' tox.ini && tox -e "$(PYS)"
-	rm -rf requests-oauthlib
-	#---------------------------
-	#
+	cd requests-oauthlib 2>/dev/null || git clone https://github.com/requests/requests-oauthlib.git
+	cd requests-oauthlib && sed -i.old 's,deps=,deps = --editable=file://{toxinidir}/../[signedtoken],' tox.ini && sed -i.old '/oauthlib/d' requirements.txt && tox
 
-pycco:
-	find oauthlib -name "*.py" -exec pycco -p -s reST {} \;
 
-pycco-clean:
-	rm -rf docs/oauthlib docs/pycco.css
+.DEFAULT_GOAL := all
+.PHONY: clean test bottle django flask requests
+all: clean test bottle django flask requests

README.rst

@@ -2,13 +2,26 @@ OAuthLib
 ========
 
 *A generic, spec-compliant, thorough implementation of the OAuth request-signing
-logic for python*
-
-.. image:: https://travis-ci.org/idan/oauthlib.svg?branch=master
-  :target: https://travis-ci.org/idan/oauthlib
-.. image:: https://coveralls.io/repos/idan/oauthlib/badge.svg?branch=master
-  :target: https://coveralls.io/r/idan/oauthlib
-
+logic for Python 2.7 and 3.4+.*
+
+.. image:: https://travis-ci.org/oauthlib/oauthlib.svg?branch=master
+  :target: https://travis-ci.org/oauthlib/oauthlib
+  :alt: Travis
+.. image:: https://coveralls.io/repos/oauthlib/oauthlib/badge.svg?branch=master
+  :target: https://coveralls.io/r/oauthlib/oauthlib
+  :alt: Coveralls
+.. image:: https://img.shields.io/pypi/pyversions/oauthlib.svg
+  :target: https://pypi.python.org/pypi/oauthlib
+  :alt: Download from PyPi
+.. image:: https://img.shields.io/pypi/l/oauthlib.svg
+  :target: https://pypi.python.org/pypi/oauthlib
+  :alt: License
+.. image:: https://img.shields.io/readthedocs/oauthlib.svg
+  :target: https://oauthlib.readthedocs.io/en/latest/index.html
+  :alt: Read the Docs
+.. image:: https://badges.gitter.im/oauthlib/oauthlib.svg
+  :target: https://gitter.im/oauthlib/Lobby
+  :alt: Chat on Gitter
 
 OAuth often seems complicated and difficult-to-implement. There are several
 prominent libraries for handling OAuth requests, but they all suffer from one or
@@ -18,8 +31,8 @@ both of the following:
 2. They predate the `OAuth 2.0 spec`_, AKA RFC 6749.
 3. They assume the usage of a specific HTTP request library.
 
-.. _`OAuth 1.0 spec`: http://tools.ietf.org/html/rfc5849
-.. _`OAuth 2.0 spec`: http://tools.ietf.org/html/rfc6749
+.. _`OAuth 1.0 spec`: https://tools.ietf.org/html/rfc5849
+.. _`OAuth 2.0 spec`: https://tools.ietf.org/html/rfc6749
 
 OAuthLib is a generic utility which implements the logic of OAuth without
 assuming a specific HTTP request object or web framework. Use it to graft OAuth
@@ -33,10 +46,10 @@ Documentation
 
 Full documentation is available on `Read the Docs`_. All contributions are very
 welcome! The documentation is still quite sparse, please open an issue for what
-you'd like to know, or discuss it in our `G+ community`_, or even better, send a
+you'd like to know, or discuss it in our `Gitter community`_, or even better, send a
 pull request!
 
-.. _`G+ community`: https://plus.google.com/communities/101889017375384052571
+.. _`Gitter community`: https://gitter.im/oauthlib/Lobby
 .. _`Read the Docs`: https://oauthlib.readthedocs.io/en/latest/index.html
 
 Interested in making OAuth requests?
@@ -45,7 +58,7 @@ Interested in making OAuth requests?
 Then you might be more interested in using `requests`_ which has OAuthLib
 powered OAuth support provided by the `requests-oauthlib`_ library.
 
-.. _`requests`: https://github.com/kennethreitz/requests
+.. _`requests`: https://github.com/requests/requests
 .. _`requests-oauthlib`: https://github.com/requests/requests-oauthlib
 
 Which web frameworks are supported?
@@ -56,6 +69,7 @@ The following packages provide OAuth support using OAuthLib.
 - For Django there is `django-oauth-toolkit`_, which includes `Django REST framework`_ support.
 - For Flask there is `flask-oauthlib`_ and `Flask-Dance`_.
 - For Pyramid there is `pyramid-oauthlib`_.
+- For Bottle there is `bottle-oauthlib`_.
 
 If you have written an OAuthLib package that supports your favorite framework,
 please open a Pull Request, updating the documentation.
@@ -65,14 +79,15 @@ please open a Pull Request, updating the documentation.
 .. _`Django REST framework`: http://django-rest-framework.org
 .. _`Flask-Dance`: https://github.com/singingwolfboy/flask-dance
 .. _`pyramid-oauthlib`: https://github.com/tilgovi/pyramid-oauthlib
+.. _`bottle-oauthlib`: https://github.com/thomsonreuters/bottle-oauthlib
 
 Using OAuthLib? Please get in touch!
 ------------------------------------
 Patching OAuth support onto an http request framework? Creating an OAuth
 provider extension for a web framework? Simply using OAuthLib to Get Things Done
 or to learn?
 
-No matter which we'd love to hear from you in our `G+ community`_ or if you have
+No matter which we'd love to hear from you in our `Gitter community`_ or if you have
 anything in particular you would like to have, change or comment on don't
 hesitate for a second to send a pull request or open an issue. We might be quite
 busy and therefore slow to reply but we love feedback!
@@ -81,7 +96,7 @@ Chances are you have run into something annoying that you wish there was
 documentation for, if you wish to gain eternal fame and glory, and a drink if we
 have the pleasure to run into eachother, please send a docs pull request =)
 
-.. _`G+ community`: https://plus.google.com/communities/101889017375384052571
+.. _`Gitter community`: https://gitter.im/oauthlib/Lobby
 
 License
 -------

docs/conf.py

@@ -14,8 +14,6 @@
 import os
 import sys
 
-from oauthlib import __version__ as v
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -51,6 +49,7 @@
 #
 # The short X.Y version.
 
+from oauthlib import __version__ as v
 version = v[:3]
 # The full version, including alpha/beta/rc tags.
 release = v
@@ -243,3 +242,5 @@
 
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
 #texinfo_show_urls = 'footnote'
+
+linkcheck_ignore = ["https://github.com/oauthlib/oauthlib/issues/new"]

docs/contributing.rst

@@ -91,7 +91,7 @@ request only to have it rejected because it has diverged too far from master.
 
 To pull in upstream changes::
 
-    git remote add upstream https://github.com/idan/oauthlib.git
+    git remote add upstream https://github.com/oauthlib/oauthlib.git
     git fetch upstream
 
 Check the log to be sure that you actually want the changes, before merging::
@@ -102,7 +102,7 @@ Then merge the changes that you fetched::
 
     git merge upstream/master
 
-For more info, see http://help.github.com/fork-a-repo/
+For more info, see https://help.github.com/fork-a-repo/
 
 How to get your pull request accepted
 =====================================
@@ -148,7 +148,7 @@ version. For Ubuntu you can easily install all after adding one ppa.
    $ sudo apt-get install pypy pypy-dev
 
 .. _`Tox`: https://tox.readthedocs.io/en/latest/install.html
-.. _`virtualenv`: http://www.virtualenv.org/en/latest/#installation
+.. _`virtualenv`: https://virtualenv.pypa.io/en/latest/installation/
 
 If you add code you need to add tests!
 --------------------------------------
@@ -223,5 +223,5 @@ to GitHub::
     git push upstream master
 
 .. _installation: install.html
-.. _GitHub project: https://github.com/idan/oauthlib
-.. _issue tracker: https://github.com/idan/oauthlib/issues
+.. _GitHub project: https://github.com/oauthlib/oauthlib
+.. _issue tracker: https://github.com/oauthlib/oauthlib/issues

docs/faq.rst

@@ -65,10 +65,17 @@ How do I use OAuthLib with Google, Twitter and other providers?
 How do I use OAuthlib as a provider with Django, Flask and other web frameworks?
 --------------------------------------------------------------------------------
 
-    Providers using Django should seek out `django-oauth-toolkit`_
-    and those using Flask `flask-oauthlib`_. For other frameworks,
-    please get in touch by opening a `GitHub issue`_, on `G+`_ or
-    on IRC #oauthlib irc.freenode.net.
+    Providers can be implemented in any web frameworks. However, some of
+    them have ready-to-use libraries to help integration:
+    - Django `django-oauth-toolkit`_
+    - Flask `flask-oauthlib`_
+    - Pyramid `pyramid-oauthlib`_
+    - Bottle `bottle-oauthlib`_
+
+    For other frameworks, please get in touch by opening a `GitHub issue`_, on `G+`_ or
+    on IRC #oauthlib irc.freenode.net. If you have written an OAuthLib package that
+    supports your favorite framework, please open a Pull Request to update the docs.
+
 
 What is the difference between authentication and authorization?
 ----------------------------------------------------------------
@@ -91,6 +98,8 @@ Some argue OAuth 2 is worse than 1, is that true?
 .. _`requests-oauthlib`: https://github.com/requests/requests-oauthlib
 .. _`django-oauth-toolkit`: https://github.com/evonove/django-oauth-toolkit
 .. _`flask-oauthlib`: https://github.com/lepture/flask-oauthlib
-.. _`GitHub issue`: https://github.com/idan/oauthlib/issues/new
+.. _`pyramid-oauthlib`: https://github.com/tilgovi/pyramid-oauthlib
+.. _`bottle-oauthlib`: https://github.com/thomsonreuters/bottle-oauthlib
+.. _`GitHub issue`: https://github.com/oauthlib/oauthlib/issues/new
 .. _`G+`: https://plus.google.com/communities/101889017375384052571
-.. _`difference`: http://www.cyberciti.biz/faq/authentication-vs-authorization/
+.. _`difference`: https://www.cyberciti.biz/faq/authentication-vs-authorization/

docs/index.rst

@@ -7,14 +7,14 @@ Welcome to OAuthLib's documentation!
 ====================================
 
 If you can't find what you need or have suggestions for improvement, don't
-hesitate to open a `new issue on GitHub`_!  
+hesitate to open a `new issue on GitHub`_!
 
 Check out :doc:`error_reporting` for details on how to be an awesome bug reporter.
 
-For news and discussions please head over to our `G+ OAuthLib community`_.
+For news and discussions please head over to our `Gitter OAuthLib community`_.
 
-.. _`new issue on GitHub`: https://github.com/idan/oauthlib/issues/new
-.. _`G+ OAuthLib community`: https://plus.google.com/communities/101889017375384052571
+.. _`new issue on GitHub`: https://github.com/oauthlib/oauthlib/issues/new
+.. _`Gitter OAuthLib community`: https://gitter.im/oauthlib/Lobby
 
 .. toctree::
    :maxdepth: 1

docs/installation.rst

@@ -22,7 +22,7 @@ Bleeding edge from GitHub master
 
 .. code-block:: bash
 
-    pip install -e git+https://github.com/idan/oauthlib.git#egg=oauthlib
+    pip install -e git+https://github.com/oauthlib/oauthlib.git#egg=oauthlib
 
 Debian and derivatives like Ubuntu, Mint, etc.
 ---------------------------------------------

docs/oauth1/preconfigured_servers.rst

@@ -12,7 +12,7 @@ Construction is simple, only import your validator and you are good to go::
 
     server = WebApplicationServer(your_validator)
 
-All endpoints are documented in :doc:`endpoints`.
+All endpoints are documented in :doc:`Provider endpoints <endpoints/endpoints>`.
 
 .. autoclass:: oauthlib.oauth1.WebApplicationServer
     :members:

docs/oauth1/server.rst

@@ -436,7 +436,7 @@ shown below as well as run your flask server locally on port `5000`.
 Drop a line in our `G+ community`_ or open a `GitHub issue`_ =)
 
 .. _`G+ community`: https://plus.google.com/communities/101889017375384052571
-.. _`GitHub issue`: https://github.com/idan/oauthlib/issues/new
+.. _`GitHub issue`: https://github.com/oauthlib/oauthlib/issues/new
 
 If you run into issues it can be helpful to enable debug logging::