Skip to content

Commit

Permalink
Bump version and update changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
sloria committed Mar 15, 2017
1 parent 67f7212 commit 20e3b6c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Changelog
---------

1.6.0 (unreleased)
1.6.0 (2017-03-14)
******************

Bug fixes:
Expand Down
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
REQUIREMENTS = ['marshmallow>=2.7.0']

def find_version(fname):
'''Attempts to find the version number in the file names fname.
"""Attempts to find the version number in the file names fname.
Raises RuntimeError if not found.
'''
"""
version = ''
with open(fname, 'r') as fp:
reg = re.compile(r'__version__ = [\'"]([^\'"]*)[\'"]')
Expand Down Expand Up @@ -39,7 +39,7 @@ def read(fname):
author='Steven Loria',
author_email='sloria1@gmail.com',
url='https://github.com/sloria/webargs',
packages=find_packages(exclude=("test*", 'examples')),
packages=find_packages(exclude=('test*', 'examples')),
package_dir={'webargs': 'webargs'},
install_requires=REQUIREMENTS,
license='MIT',
Expand All @@ -51,7 +51,7 @@ def read(fname):
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
"Programming Language :: Python :: 2",
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
Expand Down

0 comments on commit 20e3b6c

Please sign in to comment.