From fe3c1027e716e4302fa2df6a97554a1994f9a447 Mon Sep 17 00:00:00 2001 From: drebs Date: Sun, 18 Jun 2017 16:20:39 -0300 Subject: [bug] fix package __version__ attribute --- src/leap/soledad/__init__.py | 29 +++++++++++++++++++++++------ src/leap/soledad/client/__init__.py | 7 +------ src/leap/soledad/common/__init__.py | 6 ------ src/leap/soledad/server/__init__.py | 6 ------ src/leap/soledad/server/_server_info.py | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/leap/soledad/__init__.py b/src/leap/soledad/__init__.py index f48ad105..548099ed 100644 --- a/src/leap/soledad/__init__.py +++ b/src/leap/soledad/__init__.py @@ -1,6 +1,23 @@ -# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages -try: - __import__('pkg_resources').declare_namespace(__name__) -except ImportError: - from pkgutil import extend_path - __path__ = extend_path(__path__, __name__) +# -*- coding: utf-8 -*- +# __init__.py +# Copyright (C) 2017 LEAP +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from ._version import get_versions + +__version__ = get_versions()['version'] +del get_versions + +__all__ = ['__version__'] diff --git a/src/leap/soledad/client/__init__.py b/src/leap/soledad/client/__init__.py index bcad78db..a54eb5e1 100644 --- a/src/leap/soledad/client/__init__.py +++ b/src/leap/soledad/client/__init__.py @@ -21,10 +21,5 @@ from leap.soledad.common import soledad_assert from .api import Soledad from ._document import Document, AttachmentStates -from ._version import get_versions -__version__ = get_versions()['version'] -del get_versions - -__all__ = ['soledad_assert', 'Soledad', 'Document', 'AttachmentStates', - '__version__'] +__all__ = ['soledad_assert', 'Soledad', 'Document', 'AttachmentStates'] diff --git a/src/leap/soledad/common/__init__.py b/src/leap/soledad/common/__init__.py index 4948ad20..bea322fd 100644 --- a/src/leap/soledad/common/__init__.py +++ b/src/leap/soledad/common/__init__.py @@ -18,7 +18,6 @@ from leap.common.check import leap_assert as soledad_assert from leap.common.check import leap_assert_type as soledad_assert_type -from ._version import get_versions """ Soledad routines common to client and server. @@ -36,12 +35,7 @@ SHARED_DB_NAME = 'shared' # Global functions # -__version__ = get_versions()['version'] -del get_versions - - __all__ = [ "soledad_assert", "soledad_assert_type", - "__version__", ] diff --git a/src/leap/soledad/server/__init__.py b/src/leap/soledad/server/__init__.py index a4080f13..2023ef5e 100644 --- a/src/leap/soledad/server/__init__.py +++ b/src/leap/soledad/server/__init__.py @@ -31,14 +31,12 @@ from .sync import SyncResource from .sync import MAX_REQUEST_SIZE from .sync import MAX_ENTRY_SIZE -from ._version import get_versions from ._config import get_config __all__ = [ 'SoledadApp', 'get_config', - '__version__', ] @@ -186,7 +184,3 @@ class HTTPInvocationByMethodWithBody( # monkey patch server with new http invocation http_app.HTTPInvocationByMethodWithBody = HTTPInvocationByMethodWithBody - - -__version__ = get_versions()['version'] -del get_versions diff --git a/src/leap/soledad/server/_server_info.py b/src/leap/soledad/server/_server_info.py index 50659338..a6cf403f 100644 --- a/src/leap/soledad/server/_server_info.py +++ b/src/leap/soledad/server/_server_info.py @@ -21,7 +21,7 @@ import json from twisted.web.resource import Resource -from leap.soledad.server import __version__ +from leap.soledad import __version__ __all__ = ['ServerInfo'] -- cgit v1.2.3