Skip to content

Commit

Permalink
Bump version, update changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
Rich Leland committed Mar 30, 2016
1 parent 7be6972 commit 84dc850
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 6 deletions.
4 changes: 3 additions & 1 deletion AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ Patches and suggestions

- Barthelemy Dagenais `@bartdag <https://github.com/bartdag>`_
- Mohammad Hossain `@rajumsys <https://github.com/rajumsys>`_
- Jared Morse `@jarcoal <https://github.com/jarcoal>`_
- Marko Mrdjenovic `@friedcell <https://github.com/friedcell>`_
- Zdeněk Softič `@btx <https://github.com/btx>`_
- Simeon Visser `@svisser <https://github.com/svisser>`_
- `@gnarvaja <https://github.com/gnarvaja>`_
- `@pegler <https://github.com/pegler>`_
- `@puttu <https://github.com/puttu>`_
- Marko Mrdjenovic `@friedcell <https://github.com/friedcell>`_
- ADD YOURSELF HERE (and link to your github page)
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased][unreleased]

## [1.1.0] - 2016-03-30
### Added
- Better extensibility with support for Tornado
- Support for inline images
- Support for specifying IP pool

### Fixed
- Issue where substitution data was being improperly passed to the templates preview endpoint
- Issue where Django backend was not properly base64 encoding attachments

## [1.0.5] - 2016-03-18
### Fixed
- Issue where global Django settings object was being modified, causing mixed emails
Expand Down Expand Up @@ -65,7 +75,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Metrics class for getting a list of campaigns and domains
- Docs on readthedocs.org

[unreleased]: https://github.com/sparkpost/python-sparkpost/compare/v1.0.5...HEAD
[unreleased]: https://github.com/sparkpost/python-sparkpost/compare/v1.1.0...HEAD
[1.1.0]: https://github.com/sparkpost/python-sparkpost/compare/v1.0.5...v1.1.0
[1.0.5]: https://github.com/sparkpost/python-sparkpost/compare/v1.0.4...v1.0.5
[1.0.4]: https://github.com/sparkpost/python-sparkpost/compare/v1.0.3...v1.0.4
[1.0.3]: https://github.com/sparkpost/python-sparkpost/compare/v1.0.2...v1.0.3
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@
# built documents.
#
# The short X.Y version.
version = '1.0'
version = '1.1'
# The full version, including alpha/beta/rc tags.
release = '1.0.5'
release = '1.1.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

setup(
name='sparkpost',
version='1.0.5',
version='1.1.0',
author='Message Systems',
author_email='appteam@messagesystems.com',
packages=find_packages(),
Expand Down
2 changes: 1 addition & 1 deletion sparkpost/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from .transmissions import Transmissions


__version__ = '1.0.6.dev1'
__version__ = '1.1.0'


class SparkPost(object):
Expand Down

0 comments on commit 84dc850

Please sign in to comment.