From ccf51f682940325d3fab8c8c890ce462a8b0277a Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Tue, 23 Apr 2024 00:58:29 +0800 Subject: [PATCH] Chore: Re-arrange requirements list --- deploy/AidLux/requirements_generator.py | 1 + deploy/docker/requirements.txt | 63 +++++++++++++---------- deploy/docker/requirements_generator.py | 6 ++- deploy/git.py | 5 ++ deploy/headless/requirements.txt | 63 +++++++++++++---------- deploy/headless/requirements_generator.py | 6 ++- requirements-in.txt | 63 +++++++++++++---------- 7 files changed, 127 insertions(+), 80 deletions(-) diff --git a/deploy/AidLux/requirements_generator.py b/deploy/AidLux/requirements_generator.py index 14ed0f642..041a37bb5 100644 --- a/deploy/AidLux/requirements_generator.py +++ b/deploy/AidLux/requirements_generator.py @@ -45,6 +45,7 @@ def write_file(file, data): def aidlux_requirements_generate(requirements_in='requirements-in.txt'): logger.info('aidlux_requirements_generate') requirements = read_file(requirements_in) + requirements = dict(sorted(requirements.items())) for aidlux in iter_version(): logger.info(f'Generate requirements for AidLux {aidlux}') pre_installed = read_file(os.path.join(BASE_FOLDER, f'./{aidlux}/pre-installed.txt')) diff --git a/deploy/docker/requirements.txt b/deploy/docker/requirements.txt index 43fff96cf..bdddcf10a 100644 --- a/deploy/docker/requirements.txt +++ b/deploy/docker/requirements.txt @@ -1,31 +1,42 @@ -adbutils==0.11.0 -aiofiles -anyio==1.3.1 -av==10.0.0 -cnocr==1.2.2 -imageio==2.27.0 -inflection -jellyfish==0.11.2 -lz4 -mxnet==1.6.0 +# Image processing numpy==1.16.6 -onepush==1.3.0 -opencv-python-headless -pillow -prettytable==2.2.1 -psutil==5.9.3 -pydantic -pypresence==4.2.1 -pywebio==1.6.2 -pyyaml -pyzmq==22.3.0 -retrying -rich==11.2.0 scipy==1.4.1 -starlette==0.14.2 -tqdm +pillow +opencv-python-headless +imageio==2.27.0 + +# Device connection +adbutils==0.11.0 uiautomator2==2.16.17 uiautomator2cache==0.3.0.1 -uvicorn[standard]==0.17.6 wrapt==1.13.1 -zerorpc==0.6.3 \ No newline at end of file +retrying +lz4 +av==10.0.0 +psutil==5.9.3 + +# Utils +rich==11.2.0 +tqdm +jellyfish==0.11.2 +pyyaml +inflection +pydantic +aiofiles +prettytable==2.2.1 +anyio==1.3.1 + +# Pushing +onepush==1.3.0 +pypresence==4.2.1 + +# Ocr +cnocr==1.2.2 +mxnet==1.6.0 + +# Webui +pywebio==1.6.2 +starlette==0.14.2 +uvicorn[standard]==0.17.6 +zerorpc==0.6.3 +pyzmq==22.3.0 \ No newline at end of file diff --git a/deploy/docker/requirements_generator.py b/deploy/docker/requirements_generator.py index 84daab3c8..0e13db8d9 100644 --- a/deploy/docker/requirements_generator.py +++ b/deploy/docker/requirements_generator.py @@ -10,6 +10,8 @@ def read_file(file): out = {} with open(file, 'r', encoding='utf-8') as f: for line in f.readlines(): + if not line.strip(): + continue res = [s.strip() for s in line.split('==')] if len(res) > 1: name, version = res @@ -29,7 +31,9 @@ def write_file(file, data): lines.append(str(name)) with open(file, 'w', encoding='utf-8', newline='') as f: - f.write('\n'.join(lines)) + text = '\n'.join(lines) + text = text.replace('#', '\n#').strip() + f.write(text) def docker_requirements_generate(requirements_in='requirements-in.txt'): diff --git a/deploy/git.py b/deploy/git.py index aa4da24f2..83572e769 100644 --- a/deploy/git.py +++ b/deploy/git.py @@ -108,3 +108,8 @@ class GitManager(DeployConfig): ssl_verify=self.SSLVerify, keep_changes=self.KeepLocalChanges, ) + + +if __name__ == '__main__': + self = GitManager() + self.goc_client.get_status() \ No newline at end of file diff --git a/deploy/headless/requirements.txt b/deploy/headless/requirements.txt index c563a82b7..279c39778 100644 --- a/deploy/headless/requirements.txt +++ b/deploy/headless/requirements.txt @@ -1,31 +1,42 @@ -adbutils==0.11.0 -aiofiles==23.1.0 -anyio==1.3.1 -av==10.0.0 -cnocr==1.2.2 -imageio==2.27.0 -inflection==0.5.1 -jellyfish==0.11.2 -lz4==4.3.2 -mxnet==1.6.0 +# Image processing numpy==1.17.4 -onepush==1.2.0 -opencv-python-headless==4.7.0.72 -pillow==9.5.0 -prettytable==2.2.1 -psutil==5.9.3 -pydantic==1.10.9 -pypresence==4.2.1 -pywebio==1.6.2 -pyyaml==6.0 -pyzmq==22.3.0 -retrying==1.3.4 -rich==11.2.0 scipy==1.4.1 -starlette==0.14.2 -tqdm==4.65.0 +pillow==9.5.0 +opencv-python-headless==4.7.0.72 +imageio==2.27.0 + +# Device connection +adbutils==0.11.0 uiautomator2==2.16.17 uiautomator2cache==0.3.0.1 -uvicorn[standard]==0.17.6 wrapt==1.15.0 -zerorpc==0.6.3 \ No newline at end of file +retrying==1.3.4 +lz4==4.3.2 +av==10.0.0 +psutil==5.9.3 + +# Utils +rich==11.2.0 +tqdm==4.65.0 +jellyfish==0.11.2 +pyyaml==6.0 +inflection==0.5.1 +pydantic==1.10.9 +aiofiles==23.1.0 +prettytable==2.2.1 +anyio==1.3.1 + +# Pushing +onepush==1.2.0 +pypresence==4.2.1 + +# Ocr +cnocr==1.2.2 +mxnet==1.6.0 + +# Webui +pywebio==1.6.2 +starlette==0.14.2 +uvicorn[standard]==0.17.6 +zerorpc==0.6.3 +pyzmq==22.3.0 \ No newline at end of file diff --git a/deploy/headless/requirements_generator.py b/deploy/headless/requirements_generator.py index bacf1ec7a..5282fee3d 100644 --- a/deploy/headless/requirements_generator.py +++ b/deploy/headless/requirements_generator.py @@ -10,6 +10,8 @@ def read_file(file): out = {} with open(file, 'r', encoding='utf-8') as f: for line in f.readlines(): + if not line.strip(): + continue res = [s.strip() for s in line.split('==')] if len(res) > 1: name, version = res @@ -29,7 +31,9 @@ def write_file(file, data): lines.append(str(name)) with open(file, 'w', encoding='utf-8', newline='') as f: - f.write('\n'.join(lines)) + text = '\n'.join(lines) + text = text.replace('#', '\n#').strip() + f.write(text) def headless_requirements_generate(requirements_in='requirements-in.txt'): diff --git a/requirements-in.txt b/requirements-in.txt index 098186309..fdeee4312 100644 --- a/requirements-in.txt +++ b/requirements-in.txt @@ -1,32 +1,43 @@ -adbutils==0.11.0 -aiofiles -alas-webapp==0.3.7 -anyio==1.3.1 -av==10.0.0 -cnocr==1.2.2 -imageio==2.27.0 -inflection -jellyfish==0.11.2 -lz4 -mxnet==1.6.0 +# Image processing numpy==1.16.6 -onepush==1.3.0 -opencv-python -pillow -prettytable==2.2.1 -psutil==5.9.3 -pydantic -pypresence==4.2.1 -pywebio==1.6.2 -pyyaml -pyzmq==22.3.0 -retrying -rich==11.2.0 scipy==1.4.1 -starlette==0.14.2 -tqdm +pillow +opencv-python +imageio==2.27.0 + +# Device connection +adbutils==0.11.0 uiautomator2==2.16.17 uiautomator2cache==0.3.0.1 -uvicorn[standard]==0.17.6 wrapt==1.13.1 +retrying +lz4 +av==10.0.0 +psutil==5.9.3 + +# Utils +rich==11.2.0 +tqdm +jellyfish==0.11.2 +pyyaml +inflection +pydantic +aiofiles +prettytable==2.2.1 +anyio==1.3.1 + +# Pushing +onepush==1.3.0 +pypresence==4.2.1 + +# Ocr +cnocr==1.2.2 +mxnet==1.6.0 + +# Webui +pywebio==1.6.2 +starlette==0.14.2 +uvicorn[standard]==0.17.6 +alas-webapp==0.3.7 zerorpc==0.6.3 +pyzmq==22.3.0