Merge branch 'release/0.2.2'

* release/0.2.2:
  Finalize change log for 0.2.2
  Move change log to a separate file
  Fix index entries that broke the latex builder
This commit is contained in:
Jan Dittberner 2016-05-05 12:00:33 +02:00
commit b7b4ac4c40
4 changed files with 26 additions and 19 deletions

19
CHANGES.rst Normal file
View file

@ -0,0 +1,19 @@
Changes
=======
0.2.2 - 2016-05-05
------------------
* fix index entries that broke the latex builder
0.2.1 - 2016-05-05
------------------
* fix handling of invalid IP address/range values
* implement a proper clear_doc method for the ip domain
0.2.0 - 2016-05-04
------------------
* display IP address lists as tables
* sort IP address lists numericaly

View file

@ -24,18 +24,3 @@ Contributors
* `Jan Dittberner`_ * `Jan Dittberner`_
.. _Jan Dittberner: https://jan.dittberner.info/ .. _Jan Dittberner: https://jan.dittberner.info/
Changes
=======
0.2.1 - 2016-05-05
------------------
* fix handling of invalid IP address/range values
* implement a proper clear_doc method for the ip domain
0.2.0 - 2016-05-04
------------------
* display IP address lists as tables
* sort IP address lists numericaly

View file

@ -23,7 +23,7 @@ from sphinx.locale import l_
from sphinx.roles import XRefRole from sphinx.roles import XRefRole
from sphinx.util.nodes import make_refnode from sphinx.util.nodes import make_refnode
__version__ = '0.2.1' __version__ = '0.2.2'
def ip_object_anchor(typ, path): def ip_object_anchor(typ, path):
@ -120,8 +120,8 @@ class IPRange(Directive):
doctitle = self.state.document.traverse(nodes.title)[0].astext() doctitle = self.state.document.traverse(nodes.title)[0].astext()
idx_text = "%s; %s" % (self.rangespec, doctitle) idx_text = "%s; %s" % (self.rangespec, doctitle)
self.indexnode = addnodes.index(entries=[ self.indexnode = addnodes.index(entries=[
('single', idx_text, name, ''), ('single', idx_text, name, False, ''),
('single', self.get_index_text(), name, '') ('single', self.get_index_text(), name, False, '')
]) ])
if self.content: if self.content:

View file

@ -2,11 +2,14 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
version = '0.2.1' version = '0.2.2'
with open('README.rst') as readme: with open('README.rst') as readme:
description = readme.read() + "\n\n" description = readme.read() + "\n\n"
with open('CHANGES.rst') as changes:
description += changes.read()
requires = ['Sphinx>=1.4', 'ipcalc>=1.99'] requires = ['Sphinx>=1.4', 'ipcalc>=1.99']
tests_requires = ['path.py>=8.2.1'] tests_requires = ['path.py>=8.2.1']