diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/conf.py | 16 | ||||
| -rw-r--r-- | docs/contributing.rst | 7 |
2 files changed, 11 insertions, 12 deletions
diff --git a/docs/conf.py b/docs/conf.py index 3388de6..91b5de4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -45,8 +45,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'OAuthLib' -copyright = u'2019, The OAuthlib Community' +project = 'OAuthLib' +copyright = '2019, The OAuthlib Community' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -190,8 +190,8 @@ latex_elements = { # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('index', 'OAuthLib.tex', u'OAuthLib Documentation', - u'The OAuhthlib Community', 'manual'), + ('index', 'OAuthLib.tex', 'OAuthLib Documentation', + 'The OAuhthlib Community', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -220,8 +220,8 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'oauthlib', u'OAuthLib Documentation', - [u'The OAuthlib Community'], 1) + ('index', 'oauthlib', 'OAuthLib Documentation', + ['The OAuthlib Community'], 1) ] # If true, show URL addresses after external links. @@ -234,8 +234,8 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'OAuthLib', u'OAuthLib Documentation', - u'The OAuthlib Community', 'OAuthLib', 'One line description of project.', + ('index', 'OAuthLib', 'OAuthLib Documentation', + 'The OAuthlib Community', 'OAuthLib', 'One line description of project.', 'Miscellaneous'), ] diff --git a/docs/contributing.rst b/docs/contributing.rst index 5473aab..4a46e3b 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -144,7 +144,7 @@ the project root via: .. sourcecode:: bash - $ py.test + $ pytest The first thing the core committers will do is run this command. Any pull request that fails this test suite will be **rejected**. @@ -152,7 +152,7 @@ request that fails this test suite will be **rejected**. Testing multiple versions of Python ----------------------------------- -OAuthLib supports Python 2.7, 3.5, 3.6, 3.7 and PyPy 2.7 & PyPy 3. Testing +OAuthLib supports Python 3.5, 3.6, 3.7 and PyPy 2.7 & PyPy 3. Testing all versions conveniently can be done using `Tox`_. .. sourcecode:: bash @@ -167,7 +167,6 @@ The versions beloew may not be up to date. .. sourcecode:: bash - $ pyenv install 2.7.16 $ pyenv install 3.5.7 $ pyenv install 3.6.9 $ pyenv install 3.7.4 @@ -304,7 +303,7 @@ First we pull the code into a local branch:: Then we run the tests:: - py.test + pytest We finish with a non-fastforward merge (to preserve the branch history) and push to GitHub:: |