Skip to content

Commit

Permalink
Fix a mistake in conf.py (licence), do some cleanup, bump minor version
Browse files Browse the repository at this point in the history
  • Loading branch information
Sébastien Andrivet committed Dec 18, 2016
1 parent 1c40fdc commit 7516c58
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.0.0
current_version = 2.1.0
commit = True
tag = True

Expand Down
15 changes: 11 additions & 4 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@

Changelog
=========

2.0.0 (2016-12-17)
-----------------------------------------
2.1.0 (2016-12-18)
------------------

* Add more documentation
* Use (simulated) enumerations
* Add Python 2.6 in automated checks and tests
* Add type hints (for static checking) and fix some code

2.0.0 (2016-12-16)
------------------

* First public release by Sebastien Andrivet
* Support both python 2 and 3 (with Python-Future)
Expand All @@ -13,6 +20,6 @@ Changelog
* Code reorganization

0.9 (2011-05-18)
-----------------------------------------
----------------

* Initial public release by Geert Jansen
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
year = '2007-2016'
author = 'Sebastien Andrivet'
copyright = '{0}, {1}'.format(year, author)
version = release = '2.0.0'
version = release = '2.1.0'

pygments_style = 'trac'
templates_path = ['.']
Expand Down
10 changes: 3 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def read(*names, **kwargs):

setup(
name='asn1',
version='2.0.0',
version='2.1.0',
license='BSD',
description='Python-ASN1 is a simple ASN.1 encoder and decoder for Python 2.6+ and 3.3+.',
long_description='%s\n%s' % (
Expand All @@ -40,25 +40,21 @@ def read(*names, **kwargs):
include_package_data=True,
zip_safe=False,
classifiers=[
# complete classifier list: http://pypi.python.org/pypi?%3Aaction=list_classifiers
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'License :: OSI Approved :: MIT License',
'Operating System :: Unix',
'Operating System :: POSIX',
'Operating System :: Microsoft :: Windows',
'Programming Language :: Python',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
# uncomment if you test on these interpreters:
# 'Programming Language :: Python :: Implementation :: IronPython',
# 'Programming Language :: Python :: Implementation :: Jython',
# 'Programming Language :: Python :: Implementation :: Stackless',
'Topic :: Utilities',
],
keywords=[
Expand Down
2 changes: 1 addition & 1 deletion src/asn1.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from builtins import str


__version__ = "2.0.0"
__version__ = "2.1.0"


class Numbers(object):
Expand Down

0 comments on commit 7516c58

Please sign in to comment.