Fixed python_requires versions. Updated message for extras.

Samsung · Mar 21, 2021 · 8ea3001 · 8ea3001
1 parent d5ba878
commit 8ea3001
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -14,9 +14,16 @@ Y88b  d88P Y88..88P Y88b. Y88..88P 888 d88P 888  888 .d8""8b. 888
 
 [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](LICENSE)
 ![GitHub top language](https://img.shields.io/github/languages/top/Samsung/cotopaxi)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+![Lines of code](https://img.shields.io/tokei/lines/github/samsung/cotopaxi)
+![PyPI - Python Version](https://img.shields.io/pypi/pyversions/cotopaxi)
 ![LGTM Grade](https://img.shields.io/lgtm/grade/python/github/Samsung/cotopaxi)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 ![GitHub search hit counter](https://img.shields.io/github/search/Samsung/cotopaxi/*)
+![PyPI - Downloads](https://img.shields.io/pypi/dm/cotopaxi)
+![GitHub all releases](https://img.shields.io/github/downloads/Samsung/cotopaxi/total)
+![GitHub release (latest by date)](https://img.shields.io/github/v/release/Samsung/cotopaxi)
+![GitHub issues](https://img.shields.io/github/issues/Samsung/cotopaxi)
+
 
 Set of tools for security testing of Internet of Things devices using protocols: AMQP, CoAP, DTLS, HTCPCP, KNX, mDNS, MQTT, MQTT-SN, QUIC, RTSP, SSDP.
 
@@ -67,6 +74,7 @@ Optional:
 
 4. Install extras
 
+(ml - Machine Learning tools, dev - development tools, all - all of the above)
 ```
 pip install -e .[ml]
 ```

diff --git a/cotopaxi/device_identification.py b/cotopaxi/device_identification.py
@@ -37,7 +37,7 @@
 except ImportError:
     sys.exit(
         "This tool requires pandas and tensorflow!\n"
-        "Please install them using: pip install -r requirements.txt or pip install -e .[ml]"
+        "Please install them using: pip install cotopaxi[ml] or pip install -r requirements.txt"
     )
 
 from .common_utils import prepare_separator

diff --git a/cotopaxi/traffic_analyzer.py b/cotopaxi/traffic_analyzer.py
@@ -35,7 +35,7 @@
 except ImportError:
     sys.exit(
         "This tool requires numpy and xgboost!\n"
-        "Please install them using: pip install -r requirements.txt or pip install -e .[ml]"
+        "Please install them using: pip install cotopaxi[ml] or pip install -r requirements.txt"
     )
 
 from .common_utils import prepare_separator

diff --git a/setup.py b/setup.py
@@ -120,7 +120,7 @@ def package_files(directory):
         "Topic :: System",
         "Topic :: System :: Networking",
     ],
-    python_requires=">=2.7, <=3.8",
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, !=3.9.*, <4',
     project_urls={
         "Bug Reports": "https://github.com/Samsung/cotopaxi/issues",
         "Source Code": "https://github.com/Samsung/cotopaxi",