Skip to content

Commit 97e84e0

Browse files
committed
Merge branch 'release/1.1.1'
2 parents d084f05 + d113876 commit 97e84e0

File tree

7 files changed

+19
-4
lines changed

7 files changed

+19
-4
lines changed

.bumpversion.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 1.1.0
2+
current_version = 1.1.1
33
commit = True
44
tag = False
55
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-]+)*))?

README.rst

+7
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,13 @@ Changelog
7575

7676
Changes as of 6 April 2018
7777

78+
1.1.1 <6 April 2018>
79+
^^^^^^^^^^^^^^^^^^^^
80+
81+
- HOTFIX for 1.1.0
82+
- Fix Python versions badge in the documents index
83+
- Add the Python 3.6 classifier in :code:`setup.py` so the right versions are shown on PyPI
84+
7885
1.1.0 <6 April 2018>
7986
^^^^^^^^^^^^^^^^^^^^
8087

docs/source/changelog.rst

+7
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ Versions postfixed with '-dev' are currently under development and those without
1717

1818
Changes as of 6 April 2018
1919

20+
1.1.1 <6 April 2018>
21+
^^^^^^^^^^^^^^^^^^^^
22+
23+
- HOTFIX for 1.1.0
24+
- Fix Python versions badge in the documents index
25+
- Add the Python 3.6 classifier in :code:`setup.py` so the right versions are shown on PyPI
26+
2027
1.1.0 <6 April 2018>
2128
^^^^^^^^^^^^^^^^^^^^
2229

docs/source/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
# built documents.
6767
#
6868
# The full version, including alpha/beta/rc tags.
69-
release = '1.1.0'
69+
release = '1.1.1'
7070
# The short X.Y version.
7171
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-]+)*))?',
7272
release)

docs/source/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Welcome to :mod:`pushover_complete`
3232
.. |stable_documentation| image:: http://readthedocs.org/projects/pushover-complete/badge/?version=stable
3333
:target: http://pushover-complete.readthedocs.io/en/stable/?badge=stable
3434
:alt: Stable Documentation Status
35-
.. |stable_pyversions| image:: https://img.shields.io/badge/python-2.7%2C%203.5-blue.svg
35+
.. |stable_pyversions| image:: https://img.shields.io/badge/python-2.7%2C%203.5%2C%203.6-blue.svg
3636
:alt: Stable Supported Python Versions
3737

3838

setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
'Programming Language :: Python',
2020
'Programming Language :: Python :: 2.7',
2121
'Programming Language :: Python :: 3.5',
22+
'Programming Language :: Python :: 3.6',
2223
'Topic :: Communications'
2324
]
2425
INSTALL_REQUIRES = ['requests', 'six']

src/pushover_complete/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
'PushoverAPI'
99
]
1010

11-
__version__ = '1.1.0'
11+
__version__ = '1.1.1'
1212

1313
__title__ = 'pushover_complete'
1414
__description__ = 'A Python package for interacting with *all* aspects of the Pushover API'

0 commit comments

Comments
 (0)