Added package fallback and suppressed pylint relative-import warning

Bitmessage · Apr 24, 2019 · 38f36d7 · 38f36d7
1 parent 0d7b3a3
commit 38f36d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/setup.py b/setup.py
@@ -64,12 +64,13 @@ def run(self):
         '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 @@ def run(self):
             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
@@ -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