From 38f36d7860d43b3b2feb60095d666c5e3ca56c80 Mon Sep 17 00:00:00 2001
From: Dmitri Bogomolov <4glitch@gmail.com>
Date: Mon, 22 Apr 2019 13:38:39 +0300
Subject: [PATCH] Added package fallback and suppressed pylint relative-import
 warning

---
 setup.py       | 8 ++++----
 src/depends.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index 26960c24..e3f97bac 100644
--- a/setup.py
+++ b/setup.py
@@ -64,12 +64,13 @@ if __name__ == "__main__":
         'pybitmessage',
         'pybitmessage.bitmessageqt',
         'pybitmessage.bitmessagecurses',
+        'pybitmessage.fallback',
         'pybitmessage.messagetypes',
         'pybitmessage.network',
+        'pybitmessage.plugins',
         'pybitmessage.pyelliptic',
         'pybitmessage.socks',
-        'pybitmessage.storage',
-        'pybitmessage.plugins'
+        'pybitmessage.storage'
     ]
 
     # this will silently accept alternative providers of msgpack
@@ -84,8 +85,7 @@ if __name__ == "__main__":
             import umsgpack
             installRequires.append("umsgpack")
         except ImportError:
-            packages += [
-                'pybitmessage.fallback', 'pybitmessage.fallback.umsgpack']
+            packages += ['pybitmessage.fallback.umsgpack']
 
     dist = setup(
         name='pybitmessage',
diff --git a/src/depends.py b/src/depends.py
index 53bd0184..0114ec94 100755
--- a/src/depends.py
+++ b/src/depends.py
@@ -165,7 +165,7 @@ def try_import(module, log_extra=False):
 def check_ripemd160():
     """Check availability of the RIPEMD160 hash function"""
     try:
-        from fallback import RIPEMD160Hash
+        from fallback import RIPEMD160Hash  # pylint: disable=relative-import
     except ImportError:
         return False
     return RIPEMD160Hash is not None