Skip to content

Commit

Permalink
Merge branch 'hotfix/1.1.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
rlskoeser committed Jun 3, 2016
2 parents ab7d5a4 + 84169d6 commit 17d71c7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ The following is a summary of changes and improvements to
:mod:`eulxml`. New features in each version should be listed, with
any necessary information about installation or upgrade notes.

1.1.3
-----

* Require lxml 3.4 for ``collect_ids`` feature used in duplicate id
support added in eulxml 1.1.2

1.1.2
-----

Expand Down
2 changes: 1 addition & 1 deletion eulxml/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import os
import pkg_resources

__version_info__ = (1, 1, 2, None)
__version_info__ = (1, 1, 3, None)

# Dot-connect all but the last. Last is dash-connected if not None.
__version__ = '.'.join([str(i) for i in __version_info__[:-1]])
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def run(self):
],
install_requires=[
'ply>=3.8',
'lxml',
'lxml>=3.4',
'six>=1.10',
],
extras_require={
Expand Down

0 comments on commit 17d71c7

Please sign in to comment.