merge release/1.0.2 into master

Author: scolby33

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.1
+current_version = 1.0.2
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?:-(?P<release>[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+(?P<build>[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?

.travis.yml

@@ -8,6 +8,7 @@ python:
     - "3.3"
     - "3.4"
     - "3.5"
+    - "3.6"
 env:
     - TOXENV=manifest
     - TOXENV=docs
@@ -22,9 +23,12 @@ matrix:
           env: TOXENV=py34
         - python: "3.5"
           env: TOXENV=py35
+        - python: "3.6"
+          env: TOXENV=py36
     allow_failures:
         - python: "3.3"
         - python: "3.4"
+        - python: "3.6"
 
 before_install:
     - pip install codecov

README.rst

@@ -11,7 +11,7 @@ Development |develop_build| |develop_coverage| |develop_documentation| |develop_
     :target: https://travis-ci.org/scolby33/pushover_complete
     :alt: Stable Build Status
 .. |stable_coverage| image:: https://codecov.io/github/scolby33/pushover_complete/coverage.svg?branch=master
-    :target: https://codecov.io/github/scolby33/pushover_complete?branch=master
+    :target: https://codecov.io/gh/scolby33/pushover_complete/branch/master
     :alt: Stable Test Coverage Status
 .. |stable_documentation| image:: http://readthedocs.org/projects/pushover-complete/badge/?version=stable
     :target: http://pushover-complete.readthedocs.io/en/stable/?badge=stable
@@ -24,7 +24,7 @@ Development |develop_build| |develop_coverage| |develop_documentation| |develop_
     :target: https://travis-ci.org/scolby33/pushover_complete
     :alt: Development Build Status
 .. |develop_coverage| image:: https://codecov.io/github/scolby33/pushover_complete/coverage.svg?branch=develop
-    :target: https://codecov.io/github/scolby33/pushover_complete?branch=develop
+    :target: https://codecov.io/gh/scolby33/pushover_complete/branch/develop
     :alt: Development Test Coverage Status
 .. |develop_documentation| image:: http://readthedocs.org/projects/pushover-complete/badge/?version=develop
     :target: http://pushover-complete.readthedocs.io/en/develop/?badge=develop
@@ -69,7 +69,16 @@ The full list of contributors is in :code:`AUTHORS.rst` or `on GitHub <https://g
 Changelog
 ---------
 
-Changes as of 10 May 2016
+Changes as of 23 December 2016
+
+1.0.2 <23 December 2016>
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+- "Add" Python 3.6 support. It's not in Travis as an allowed failure and didn't require any code changes to pass!
+- Fix a major bug with the receipt cancel API. I was using a `GET` request instead of a `POST`
+- Stop using the `releases` Sphinx plugin for the changelog. Its philosophy didn't match well with mine
+- Update release procedure based on no longer using `releases`
+- Some minor documentation fixes
 
 1.0.1 <10 May 2016>
 ^^^^^^^^^^^^^^^^^^^

docs/requirements.txt

@@ -1 +0,0 @@
-releases==1.1.0

docs/source/changelog.rst

@@ -15,13 +15,26 @@ Changelog
 Details about this versioning scheme can be found on the `Semver website <http://semver.org/spec/v2.0.0.html>`_.
 Versions postfixed with '-dev' are currently under development and those without a postfix are stable releases.
 
-.. note:: Links to future releases are currently broken due to how the changelog is parsed.
-   To see the most recent changes, `visit the GitHub repository <https://github.com/scolby33/pushover_complete/tree/develop>`_.
-   I am working on a fix for this issue.
-
-- :release:`1.0.1 <10 May 2016>`
-- :support:`-` Numerous updates to documentation and README, etc. to make them prettier and more useful
-- :support:`-` Officially add Python 2.7 support and add testing for it to tox and Travis
-- :release:`1.0.0 <9 May 2016>`
-- :feature:`-` Documentation and build process
-- :feature:`-` Implementation of methods for the Pushover messages, sounds, users, receipt, subscriptions, groups, and licenses APIs
+Changes as of 23 December 2016
+
+1.0.2 <23 December 2016>
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+- "Add" Python 3.6 support. It's not in Travis as an allowed failure and didn't require any code changes to pass!
+- Fix a major bug with the receipt cancel API. I was using a `GET` request instead of a `POST`
+- Stop using the `releases` Sphinx plugin for the changelog. Its philosophy didn't match well with mine
+- Update release procedure based on no longer using `releases`
+- Some minor documentation fixes
+
+
+1.0.1 <10 May 2016>
+^^^^^^^^^^^^^^^^^^^
+
+- Officially add Python 2.7 support and add testing for it to tox and Travis
+- Numerous updates to documentation and README, etc. to make them prettier and more useful
+
+1.0.0 <9 May 2016>
+^^^^^^^^^^^^^^^^^^
+
+- Implementation of methods for the Pushover messages, sounds, users, receipt, subscriptions, groups, and licenses APIs
+- Documentation and build process

docs/source/conf.py

@@ -38,7 +38,7 @@
     'sphinx.ext.todo',
     'sphinx.ext.coverage',
     'sphinx.ext.viewcode',
-    'releases',
+    # 'releases',
     # 'sphinx.ext.githubpages'
 ]
 
@@ -66,7 +66,7 @@
 # built documents.
 #
 # The full version, including alpha/beta/rc tags.
-release = '1.0.1'
+release = '1.0.2'
 # The short X.Y version.
 parsed_version = re.match('(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?:-(?P<release>[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+(?P<build>[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?',
                           release)
@@ -318,9 +318,9 @@
 
 
 # 'releases' (changelog) configuration
-releases_release_uri = 'https://github.com/scolby33/pushover_complete/releases/tag/v%s'
+# releases_release_uri = 'https://github.com/scolby33/pushover_complete/releases/tag/v%s'
 # releases_future_release_uri = 'https://github.com/scolby33/pushover_complete/tree/develop'
-releases_github_path = 'scolby33/pushover_complete'
+# releases_github_path = 'scolby33/pushover_complete'
 
 if os.environ.get('READTHEDOCS', None):
     tags.add('readthedocs')

docs/source/contributing.rst

@@ -71,8 +71,6 @@ Development takes place on the :code:`develop` branch with individual features b
 Further reading on this style can be found in `this blog post <http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/>`_ by Jeff Kreeftmeijer.
 A git plugin to aid in managing branches in this way, called :code:`git-flow`, can be found `here <https://github.com/nvie/gitflow>`_.
 
-.. note:: This is not quite true yet...once the 1.0 release takes place, development will move to the develop branch. Until then, it's on master because that's just how the project started.
-
 This might seem a bit complicated, but in general you won't have to worry about it as a contributor.
 The long and short of this system for you is:
 
@@ -85,7 +83,7 @@ The maintainers will take care of any other issues relating to this.
 Pull Requests
 -------------
 
-Once you've got your feature or bugfix finished (or if its in a partially complete state but you want to publish it
+Once you've got your feature or bugfix finished (or if it's in a partially complete state but you want to publish it
 for comment), push it to your fork of the repository and open a pull request against the develop branch on GitHub.
 
 Make a descriptive comment about your pull request, perhaps referencing the issue it is meant to fix (something along the lines of "fixes issue #10" will cause GitHub to automatically link to that issue).
@@ -171,8 +169,8 @@ The steps for making a release of :code:`pushover_complete` are:
 
     $ bumpversion release
 
-#. Add a release entry in :code:`docs/source/changelog.rst` (something like :code:`- :release:`{new_version} <date>``)
-#. Update :code:`README.rst` with new version and changelog information, including the last updated date in the changelog
+#. Update the changelog in :code:`docs/source/changelog.rst`, including the last updated date
+#. Update the changelog in :code:`README.rst` to match the changelog in the docs
 #. Check that any new intersphinx links have corresponding inventory locations in :code:`docs/source/conf.py`. Run
 
     ::

docs/source/index.rst

@@ -25,7 +25,7 @@ Welcome to :mod:`pushover_complete`
         :target: https://travis-ci.org/scolby33/pushover_complete
         :alt: Stable Build Status
     .. |stable_coverage| image:: https://codecov.io/github/scolby33/pushover_complete/coverage.svg?branch=master
-        :target: https://codecov.io/github/scolby33/pushover_complete?branch=master
+        :target: https://codecov.io/gh/scolby33/pushover_complete/branch/master
         :alt: Stable Test Coverage Status
     .. |stable_documentation| image:: http://readthedocs.org/projects/pushover-complete/badge/?version=stable
         :target: http://pushover-complete.readthedocs.io/en/stable/?badge=stable
@@ -38,7 +38,7 @@ Welcome to :mod:`pushover_complete`
         :target: https://travis-ci.org/scolby33/pushover_complete
         :alt: Development Build Status
     .. |develop_coverage| image:: https://codecov.io/github/scolby33/pushover_complete/coverage.svg?branch=develop
-        :target: https://codecov.io/github/scolby33/pushover_complete?branch=develop
+        :target: https://codecov.io/gh/scolby33/pushover_complete/branch/develop
         :alt: Development Test Coverage Status
     .. |develop_documentation| image:: http://readthedocs.org/projects/pushover-complete/badge/?version=develop
         :target: http://pushover-complete.readthedocs.io/en/develop/?badge=develop

src/pushover_complete/__init__.py

@@ -8,7 +8,7 @@
     'PushoverAPI'
 ]
 
-__version__ = '1.0.1'
+__version__ = '1.0.2'
 
 __title__ = 'pushover_complete'
 __description__ = 'A Python package for interacting with *all* aspects of the Pushover API'

src/pushover_complete/pushover_api.py

@@ -235,7 +235,7 @@ def cancel_receipt(self, receipt):
         :returns: Response body interpreted as JSON
         :rtype: dict
         """
-        return self._generic_get('receipts/{}/cancel.json', receipt)
+        return self._generic_post('receipts/{}/cancel.json', receipt)
 
     def _migrate_to_subscription(self, user, subscription_code, device=None, sound=None, session=None):
         """The internal function to migrate a user key to a subscription key.

tests/PushoverAPI/test_PushoverAPI.py

@@ -326,7 +326,7 @@ def test_PushoverAPI_cancels_receipt(PushoverAPI):
     """Test cancelling a receipt."""
     url_re = re.compile('https://api\.pushover\.net/1/receipts/r[a-zA-Z0-9]*/cancel\.json')
     responses.add_callback(
-        responses.GET,
+        responses.POST,
         url_re,
         callback=receipt_cancel_callback,
         content_type='application/json'
@@ -347,7 +347,7 @@ def test_PushoverAPI_raises_error_on_bad_receipt_cancel(PushoverAPI):
     """Test the cancelling of a bad receipt value."""
     url_re = re.compile('https://api\.pushover\.net/1/receipts/r[a-zA-Z0-9]*/cancel\.json')
     responses.add_callback(
-        responses.GET,
+        responses.POST,
         url_re,
         callback=receipt_cancel_callback,
         content_type='application/json'

tox.ini

@@ -31,7 +31,6 @@ changedir = docs
 deps =
     sphinx
     sphinx_rtd_theme
-    releases
 commands =
     mkdir -p {envtmpdir}
     cp -r source {envtmpdir}/source