Skip to content

Commit

Permalink
Version and copyright bump, release notes.
Browse files Browse the repository at this point in the history
  • Loading branch information
amcgregor committed Mar 6, 2019
1 parent 16fdba9 commit c198a30
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright © 2006-2018 Alice Bevan-McGregor and contributors.
Copyright © 2006-2019 Alice Bevan-McGregor and contributors.

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:

Expand Down
18 changes: 14 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
cinje
=====

© 2015-2017 Alice Bevan-McGregor and contributors.
© 2015-2019 Alice Bevan-McGregor and contributors.

..
Expand Down Expand Up @@ -580,6 +580,15 @@ Just like with ``using``, the result of the expression must be a callable genera
Version History
===============

Version 1.1.2
-------------

* *Fixed* `Python 3.7 exception use within generators. <https://github.com/marrow/cinje/issues/28>`_

* *Added* Genshi to the `benchmark comparison suite <https://github.com/marrow/cinje/wiki/Benchmarks#python-37>`_.

* *Fixed* minor docstring typo.

Version 1.1.1
-------------

Expand Down Expand Up @@ -628,7 +637,7 @@ cinje has been released under the MIT Open Source license.
The MIT License
---------------

Copyright © 2015-2017 Alice Bevan-McGregor and contributors.
Copyright © 2015-2019 Alice Bevan-McGregor and contributors.

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
Expand All @@ -643,6 +652,7 @@ WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGE
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.


.. |ghwatch| image:: https://img.shields.io/github/watchers/marrow/cinje.svg?style=social&label=Watch
:target: https://github.com/marrow/cinje/subscription
:alt: Subscribe to project activity on Github.
Expand Down Expand Up @@ -683,12 +693,12 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
:target: https://github.com/marrow/cinje/issues
:alt: Github Issues

.. |ghsince| image:: https://img.shields.io/github/commits-since/marrow/cinje/1.1.1.svg
.. |ghsince| image:: https://img.shields.io/github/commits-since/marrow/cinje/1.1.2.svg
:target: https://github.com/marrow/cinje/commits/develop
:alt: Changes since last release.

.. |ghtag| image:: https://img.shields.io/github/tag/marrow/cinje.svg
:target: https://github.com/marrow/cinje/tree/1.1.1
:target: https://github.com/marrow/cinje/tree/1.1.2
:alt: Latest Github tagged release.

.. |latestversion| image:: http://img.shields.io/pypi/v/cinje.svg?style=flat
Expand Down
2 changes: 1 addition & 1 deletion cinje/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from collections import namedtuple


version_info = namedtuple('version_info', ('major', 'minor', 'micro', 'releaselevel', 'serial'))(1, 1, 1, 'final', 0)
version_info = namedtuple('version_info', ('major', 'minor', 'micro', 'releaselevel', 'serial'))(1, 1, 2, 'final', 0)
version = ".".join([str(i) for i in version_info[:3]]) + ((version_info.releaselevel[0] + str(version_info.serial)) if version_info.releaselevel != 'final' else '')

author = namedtuple('Author', ['name', 'email'])("Alice Bevan-McGregor", '[email protected]')
Expand Down

0 comments on commit c198a30

Please sign in to comment.