From 43c7b0fe2e544b887ba874ea09af4dc7d489c5c8 Mon Sep 17 00:00:00 2001 From: abhishekram Date: Tue, 30 Apr 2019 15:58:01 +0530 Subject: [PATCH] Bump version --- .travis.yml | 1 + CHANGELOG.md | 2 +- pyas2lib/__init__.py | 38 +++++++++++++++++--------------------- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3349ac0..d5b2585 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +dist: xenial language: python python: - '3.5' diff --git a/CHANGELOG.md b/CHANGELOG.md index 57a110d..11121cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.0.4 - 2019-04-26 +## 1.1.0 - 2019-04-30 * Handle cases where compression is done before signing. * Add support for additional encryption algorithms. diff --git a/pyas2lib/__init__.py b/pyas2lib/__init__.py index 2b8876b..7ed9010 100644 --- a/pyas2lib/__init__.py +++ b/pyas2lib/__init__.py @@ -1,28 +1,24 @@ -from __future__ import absolute_import -# from pyas2lib.as2 import DIGEST_ALGORITHMS, ENCRYPTION_ALGORITHMS,\ -# MDN_CONFIRM_TEXT, MDN_FAILED_TEXT, Partner, Organization, Message, Mdn -import sys +from pyas2lib.as2 import DIGEST_ALGORITHMS +from pyas2lib.as2 import ENCRYPTION_ALGORITHMS +from pyas2lib.as2 import MDN_CONFIRM_TEXT +from pyas2lib.as2 import MDN_FAILED_TEXT +from pyas2lib.as2 import Mdn +from pyas2lib.as2 import Message +from pyas2lib.as2 import Organization +from pyas2lib.as2 import Partner -VERSION = (1, 0, 3) +VERSION = (1, 1, 0) __version__ = '.'.join(map(str, VERSION)) __all__ = [ 'VERSION', - # 'DIGEST_ALGORITHMS', - # 'ENCRYPTION_ALGORITHMS', - # 'MDN_CONFIRM_TEXT', - # 'MDN_FAILED_TEXT', - # 'Partner', - # 'Organization', - # 'Message', - # 'Mdn' + 'DIGEST_ALGORITHMS', + 'ENCRYPTION_ALGORITHMS', + 'MDN_CONFIRM_TEXT', + 'MDN_FAILED_TEXT', + 'Partner', + 'Organization', + 'Message', + 'Mdn' ] - -if (2, 7) <= sys.version_info < (3, 2): - # On Python 2.7 and Python3 < 3.2, install no-op handler to silence - # `No handlers could be found for logger "elasticsearch"` message per - # - import logging - logger = logging.getLogger('pyas2lib') - logger.addHandler(logging.NullHandler())