Skip to content

Commit

Permalink
Allow to run setup.py on not installed package dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
penguinolog committed Apr 7, 2017
1 parent e55f04b commit 103602a
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 20 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
CHANGELOG
=========

Version 2.3.5
-------------
* Allow to run setup.py on not installed package (`__init__.py` imports fix).
* Simplify code

Version 2.3.4
Expand Down
44 changes: 25 additions & 19 deletions logwrap/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright 2016 Alexey Stepanov aka penguinolog

# Copyright 2016-2017 Alexey Stepanov aka penguinolog
#
# Copyright 2016 Mirantis, Inc.

#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
Expand All @@ -24,24 +24,30 @@

from __future__ import absolute_import

import six
try:
import six

from ._repr_utils import PrettyFormat, pretty_repr, pretty_str

from ._repr_utils import PrettyFormat, pretty_repr, pretty_str
__all__ = (
'logwrap',
'PrettyFormat',
'pretty_repr',
'pretty_str'
)

__all__ = (
'logwrap',
'PrettyFormat',
'pretty_repr',
'pretty_str'
)
# pylint: disable=ungrouped-imports, no-name-in-module
if six.PY34:
from ._log_wrap3 import logwrap, LogWrap, async_logwrap, AsyncLogWrap

# pylint: disable=ungrouped-imports, no-name-in-module
if six.PY34:
from ._log_wrap3 import logwrap, LogWrap, async_logwrap, AsyncLogWrap
__all__ += ('async_logwrap', 'AsyncLogWrap')
else:
from ._log_wrap2 import logwrap, LogWrap
# pylint: enable=ungrouped-imports, no-name-in-module

__all__ += ('async_logwrap', 'AsyncLogWrap')
else:
from ._log_wrap2 import logwrap, LogWrap
# pylint: enable=ungrouped-imports, no-name-in-module
except ImportError:
# Package is not installed
pass

__version__ = '2.3.4'
__version__ = '2.3.5'
__author__ = "Alexey Stepanov <penguinolog@gmail.com>"

0 comments on commit 103602a

Please sign in to comment.