Skip to content

Commit

Permalink
Merge af5ac6d into 82544c2
Browse files Browse the repository at this point in the history
  • Loading branch information
JonathanHuot committed Apr 22, 2020
2 parents 82544c2 + af5ac6d commit 851c7f2
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
@@ -1,6 +1,6 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
github: [JonathanHuot]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
Expand Down
17 changes: 15 additions & 2 deletions docs/contributing.rst
Expand Up @@ -188,7 +188,7 @@ submit a breaking change, confirm that other projects builds are not affected.
$ make


If you add code you need to add tests!
If you add code, add tests!
--------------------------------------

We've learned the hard way that code without tests is undependable. If your pull
Expand Down Expand Up @@ -303,7 +303,7 @@ First we pull the code into a local branch::

Then we run the tests::

pytest
tox

We finish with a non-fastforward merge (to preserve the branch history) and push
to GitHub::
Expand All @@ -312,6 +312,19 @@ to GitHub::
git merge --no-ff <branch-name>
git push upstream master

Sponsoring
==========

The OAuthlib project is open to sponsoring.

As a sponsor, you can participate by clicking on the "Sponsor" button in
the https://github.com/oauthlib/oauthlib homepage.

As a contributor, you can adhere to the sponsoring program. Feel free
to open a PR by adding your name into the ``.github/FUNDING.yml``
file.


.. _installation: install.html
.. _GitHub project: https://github.com/oauthlib/oauthlib
.. _issue tracker: https://github.com/oauthlib/oauthlib/issues
2 changes: 1 addition & 1 deletion tox.ini
Expand Up @@ -9,7 +9,7 @@ commands=


# tox -e docs to mimick readthedocs build.
# as of today, RTD is using python2.7 and doesn't run "setup.py install"
# as of today, RTD is using python3.6 and doesn't run "setup.py install"
[testenv:docs]
basepython=python3.6
skipsdist=True
Expand Down

0 comments on commit 851c7f2

Please sign in to comment.