Skip to content

Commit

Permalink
Merge pull request #6 from adamboche/authors
Browse files Browse the repository at this point in the history
Update authors
  • Loading branch information
adamboche committed Jun 8, 2019
2 parents 43df357 + d30eb27 commit 0326c34
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.1.7
current_version = 0.1.8
commit = True
tag = True

Expand Down
2 changes: 1 addition & 1 deletion AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Authors
=======

* akb - https://www.example.com
* Adam Boche - https://github.com/adamboche
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
MIT License

Copyright (c) 2019, akb
Copyright (c) 2019, Adam Boche

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ Overview
:alt: PyPI Package latest release
:target: https://pypi.org/pypi/marshmallow-union

.. |commits-since| image:: https://img.shields.io/github/commits-since/adamboche/python-marshmallow-union/v0.1.7.svg
.. |commits-since| image:: https://img.shields.io/github/commits-since/adamboche/python-marshmallow-union/v0.1.8.svg
:alt: Commits since latest release
:target: https://github.com/adamboche/python-marshmallow-union/compare/v0.1.7...master
:target: https://github.com/adamboche/python-marshmallow-union/compare/v0.1.8...master

.. |wheel| image:: https://img.shields.io/pypi/wheel/marshmallow-union.svg
:alt: PyPI Wheel
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
master_doc = "index"
project = "marshmallow-union"
year = "2019"
author = "akb"
author = "Adam Boche"
copyright = "{0}, {1}".format(year, author)
version = release = "version = release = 0.1.7"
version = release = "version = release = 0.1.8"

pygments_style = "trac"
templates_path = ["."]
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def read(*names, **kwargs):

setup(
name="marshmallow-union",
version="version=0.1.7",
version="version=0.1.8",
description="Union fields for marshmallow.",
long_description="%s\n%s"
% (
Expand All @@ -41,7 +41,7 @@ def read(*names, **kwargs):
),
re.sub(":[a-z]+:`~?(.*?)`", r"``\1``", read("CHANGELOG.rst")),
),
author="akb",
author="Adam Boche",
author_email="2lSJlf2MCi6PIgNTboOp@cordaz.com",
url="https://github.com/adamboche/python-marshmallow-union",
packages=find_packages("src"),
Expand Down
2 changes: 1 addition & 1 deletion src/marshmallow_union/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ def deserialize(self, value, attr=None, data=None, **kwargs):
raise marshmallow.exceptions.ValidationError(message=errors, field_name=attr)


__version__ = "__version__ = 0.1.7"
__version__ = "__version__ = 0.1.8"

0 comments on commit 0326c34

Please sign in to comment.