Fix imports and package resolution, and updated requirements

Cyberwatch · Aug 29, 2023 · e792d55 · e792d55
1 parent c825202
commit e792d55
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 19 deletions.
diff --git a/cli/__init__.py b/cli/__init__.py
diff --git a/cli/bin/airgap/__init__.py b/cli/bin/airgap/__init__.py
@@ -1,5 +1,5 @@
 import sys
-from . import download_scripts, download_compliance_scripts, upload_scripts, upload_compliance_scripts
+from cli.bin.airgap import download_scripts, download_compliance_scripts, upload_scripts, upload_compliance_scripts
 
 def help():
     print("Usage : cyberwatch-cli airgap [COMMAND] [ARGS]")

diff --git a/cli/bin/airgap/download_compliance_scripts.py b/cli/bin/airgap/download_compliance_scripts.py
@@ -1,7 +1,6 @@
-from cyberwatch_api import Cyberwatch_Pyhelper
-from os.path import abspath, basename, dirname, join
+from os.path import abspath,  join
 import os
-from .. import os as cbw_os
+from cli.bin import os as cbw_os
 import argparse
 import sys
 import shutil

diff --git a/cli/bin/airgap/download_scripts.py b/cli/bin/airgap/download_scripts.py
@@ -1,8 +1,6 @@
-from cyberwatch_api import Cyberwatch_Pyhelper
 from os.path import abspath, basename, dirname, join
 from itertools import groupby
 import argparse
-import sys
 import os
 import requests
 

diff --git a/cli/bin/airgap/upload_compliance_scripts.py b/cli/bin/airgap/upload_compliance_scripts.py
@@ -1,9 +1,5 @@
-from cyberwatch_api import Cyberwatch_Pyhelper
-from os.path import abspath, basename, dirname, join
-from itertools import groupby
 import argparse
 import chardet
-import sys
 import os
 
 def help():

diff --git a/cli/bin/airgap/upload_scripts.py b/cli/bin/airgap/upload_scripts.py
@@ -1,9 +1,5 @@
-from cyberwatch_api import Cyberwatch_Pyhelper
-from os.path import abspath, basename, dirname, join
-from itertools import groupby
 import argparse
 import chardet
-import sys
 import os
 
 def help():

diff --git a/cli/bin/os.py b/cli/bin/os.py
@@ -1,4 +1,3 @@
-from cyberwatch_api import Cyberwatch_Pyhelper
 import sys
 
 def help():

diff --git a/cli/cyberwatch-cli b/cli/cyberwatch-cli
@@ -2,7 +2,7 @@
 
 from cyberwatch_api import Cyberwatch_Pyhelper
 import sys
-from bin import os, airgap
+from cli.bin import os, airgap
 import requests
 from urllib3.exceptions import InsecureRequestWarning
 

diff --git a/requirements.txt b/requirements.txt
@@ -1 +1,2 @@
 requests
+chardet
diff --git a/setup.py b/setup.py
@@ -1,14 +1,13 @@
 from setuptools import setup, find_packages
 
 setup(name='cyberwatch_api',
-      version='0.3.3',
+      version='0.3.5',
       description='Python Api client for the Cyberwatch software',
       long_description=open('README.md').read().strip(),
       long_description_content_type="text/markdown",
       author='CyberWatch SAS',
-      packages=find_packages(where='cli'),
-      package_dir={"": "cli"},
       py_modules=['cyberwatch_api'],
+      packages=find_packages(include=['cli.*']),
       license='MIT',
       install_requires=['requests>=2.20.1'],
       scripts=['cli/cyberwatch-cli']