Merge branch 'develop'

.gitignore

@@ -106,7 +106,11 @@ ENV/
 # Sublime
 *.sublime-*
 
+# Pytest
+.pytest_cache/
+
 # Coconut
 tests/dest/
 docs/
 index.rst
+profile.json

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 -   repo: git://github.com/pre-commit/pre-commit-hooks.git
-    sha: v1.1.1
+    rev: v1.3.0
     hooks:
     -   id: check-byte-order-marker
     -   id: check-merge-conflict
@@ -26,6 +26,6 @@ repos:
         args:
         - --ignore=W503,E501,E265,E402,F405,E305
 -   repo: https://github.com/asottile/add-trailing-comma
-    sha: v0.6.4
+    rev: v0.6.4
     hooks:
     -   id: add-trailing-comma

.travis.yml

@@ -18,6 +18,8 @@ script:
 - make test-all
 deploy:
   provider: pypi
+  edge:
+    branch: v1.8.45
   user: evhub-develop
   password:
     secure: f5zfnO9cuMJyszSVG7h6ZZ0NtrQpI33NuCvyOEYeoLCL5815ANElRuBlGcP6KbydHM1rSp2/i62DXANy73U2mcPiQyiWUkhffOLxYnSGIMQ2hyRz2ZAopCusf5ZQFWH40NhT2q/gOnN/Cwyjd6KyU1oXSpolfROaE5aimu5dQcg=

CONTRIBUTING.md

@@ -10,6 +10,16 @@ If you are considering contributing to Coconut, you'll be doing so on the [`deve
 
 If you are thinking about contributing to Coconut, please don't hesitate to ask questions at Coconut's [Gitter](https://gitter.im/evhub/coconut)! That includes any questions at all about contributing, including understanding the source code, figuring out how to implement a specific change, or just trying to figure out what needs to be done.
 
+## Bounties
+
+Coconut development is monetarily supported by Coconut's [Backers](https://opencollective.com/coconut#backer) and [Sponsors](https://opencollective.com/coconut#sponsor) on Open Collective. As a result of this, many of Coconut's open issues are [labeled](https://github.com/evhub/coconut/labels) with bounties denoting the compensation available for resolving them. If you successfully resolve one of these issues (defined as getting a pull request resolving the issue merged), you become eligible to collect that issue's bounty. To do so, simply [file an expense report](https://opencollective.com/coconut/expenses/new#) for the correct amount with a link to the issue you resolved.
+
+If an issue you really want fixed or an issue you're really excited to work on doesn't currently have a bounty on it, please leave a comment on the issue! Bounties are flexible, and some issues will always fall through the cracks, so don't be afraid to just ask if an issue doesn't have a bounty and you want it to.
+
+## Good First Issues
+
+Want to help out, but don't know what to work on? Head over to Coconut's [open issues](https://github.com/evhub/coconut/issues) and look for ones labeled "good first issue." These issues are those that require less intimate knowledge of Coconut's inner workings, and are thus possible for new contributors to work on.
+
 ## Contribution Process
 
 Contributing to Coconut is as simple as
@@ -18,11 +28,7 @@ Contributing to Coconut is as simple as
 2. making changes to the [`develop` branch](https://github.com/evhub/coconut/tree/develop), and
 3. proposing a pull request.
 
-_Note: Don't forget to add yourself to the "Authors:" section in the docstrings of any files you modify!_
-
-## Contributor Friendly Issues
-
-Want to help out, but don't know what to work on? Head over to Coconut's [open issues](https://github.com/evhub/coconut/issues) and look for ones labeled "contributor friendly." Contributor friendly issues are those that require less intimate knowledge of Coconut's inner workings, and are thus possible for new contributors to work on.
+_Note: Don't forget to add yourself to the "Authors:" section in the moduledocs of any files you modify!_
 
 ## Testing New Changes
 
@@ -179,8 +185,10 @@ After you've tested your changes locally, you'll want to add more permanent test
     1. Run `make dev`
     1. Push to `develop`
     1. Update [website](https://github.com/evhub/coconut/tree/gh-pages) if it needs updating
-    1. Wipe all updated versions on readthedocs
-    1. Copy PyPI keywords to readthedocs tags
-    1. Build all updated versions on readthedocs
+    1. Wipe all updated versions on [readthedocs](https://readthedocs.org/projects/coconut/versions/)
+    1. Copy [PyPI](https://pypi.python.org/pypi/coconut) keywords to readthedocs tags
+    1. Build all updated versions on [readthedocs](https://readthedocs.org/projects/coconut/builds/)
+    1. Download latest [PyPI](https://pypi.python.org/pypi/coconut) `.tar.gz` file, hash it with `openssl sha256 coconut-<version>.tar.gz`, and use that to update the [local feedstock](https://github.com/conda-forge/coconut-feedstock)
     1. Submit PR to update [Coconut's `conda-forge` feedstock](https://github.com/conda-forge/coconut-feedstock)
+    1. Wait until feedstock PR is passing then merge it
     1. Close release milestone