Skip to content

Commit

Permalink
Bump version to 1.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
maximkulkin committed Jun 26, 2017
1 parent 785bf72 commit 4c18403
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 22 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.rst
@@ -1,6 +1,13 @@
Changelog
---------

1.1.5 (2017-06-26)
++++++++++++++++++

* Add support for loading extra attributes for Objects
* Update Dict to require presence of fixed keys
* Add IndexField to extract data from dict-like objects

1.1.4 (2017-06-08)
++++++++++++++++++

Expand Down
5 changes: 3 additions & 2 deletions docs/conf.py
Expand Up @@ -65,10 +65,11 @@
# |version| and |release|, also used in various other places throughout the
# built documents.
#
import lollipop
# The short X.Y version.
version = u'1.1.4'
version = lollipop.__version__
# The full version, including alpha/beta/rc tags.
release = u'1.1.4'
release = version

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion lollipop/__init__.py
@@ -1,2 +1,2 @@
__version__ = '1.1.4'
__version__ = '1.1.5'
__author__ = 'Maxim Kulkin'
21 changes: 2 additions & 19 deletions setup.py
Expand Up @@ -2,24 +2,7 @@
# -*- coding: utf-8 -*-
import re
from setuptools import setup, find_packages

def find_version(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__ = [\'"]([^\'"]*)[\'"]')
for line in fp:
m = reg.match(line)
if m:
version = m.group(1)
break
if not version:
raise RuntimeError('Cannot find version information')
return version

__version__ = find_version("lollipop/__init__.py")
import lollipop


def read(fname):
Expand All @@ -29,7 +12,7 @@ def read(fname):

setup(
name='lollipop',
version=__version__,
version=lollipop.__version__,
description=('Data serialization and validation library'),
long_description=read('README.rst'),
author='Maxim Kulkin',
Expand Down

0 comments on commit 4c18403

Please sign in to comment.