Merge pull request #1054 from androguard/pyqt

Pyqt

androguard/__init__.py

@@ -1,4 +1,4 @@
 # The current version of Androguard
 # Please use only this variable in any scripts,
 # to keep the version number the same everywhere.
-__version__ = "4.1.1"
+__version__ = "4.1.2"

androguard/cli/cli.py

@@ -552,7 +552,6 @@ def cg(
     from androguard.core.analysis.analysis import ExternalMethod
 
     import matplotlib.pyplot as plt
-    import networkx as nx
 
     a, d, dx = AnalyzeAPK(file_)
 
@@ -571,6 +570,11 @@ def cg(
     )
 
     if show:
+        try:
+            import PyQt5
+        except ImportError:
+            print("PyQt5 is not installed. In most OS you can install it by running 'pip install PyQt5'.\n")
+            exit()
         pos = nx.spring_layout(callgraph)
         internal = []
         external = []

pyproject.toml

@@ -2,7 +2,7 @@
 name = "androguard"
 description = "Androguard is a full python tool to play with Android files."
 authors = ["desnos <desnos@t0t0.fr>"]
-version = "4.1.1"
+version = "4.1.2"
 license = "Apache Licence, Version 2.0"
 readme = "README.md"
 homepage = "https://github.com/androguard/androguard"
@@ -27,14 +27,6 @@ loguru = "*"
 apkInspector = ">=1.1.7"
 matplotlib = "*"
 networkx = "*"
-PyQt5 = "*"
-# address inconsistencies with pyqt5-qt5 binary release files
-# > 5.15.2 exclusively contains releases for macosx
-# 5.15.2 contains release for all, but not arm64 macosx
-PyQt5-Qt5 = [
-    {version = "*", markers = "sys_platform == 'darwin'"},
-    {version = "5.15.2", markers = "sys_platform != 'darwin'"}
-]
 pyyaml = "*"
 oscrypto = ">=1.3.0"
 

requirements.txt

@@ -12,6 +12,5 @@ loguru
 apkInspector>=1.2.1
 matplotlib
 networkx
-PyQt5
 pyyaml
 oscrypto>=1.3.0