fix: lock jellyfish version to 0.11.2 (#3384)

* fix: lock jellyfish version to 0.11.2

* chore: remove index url

Author: SaarChaffee

deploy/AidLux/0.92/requirements.txt

@@ -5,7 +5,7 @@ av==10.0.0
 cnocr==1.2.2
 imageio==2.27.0
 inflection
-jellyfish
+jellyfish==0.11.2
 lz4
 mxnet==1.6.0
 numpy

deploy/docker/requirements.txt

@@ -5,7 +5,7 @@ av==10.0.0
 cnocr==1.2.2
 imageio==2.27.0
 inflection
-jellyfish
+jellyfish==0.11.2
 lz4
 mxnet==1.6.0
 numpy==1.16.6

deploy/docker/requirements_generator.py

@@ -36,7 +36,7 @@ def docker_requirements_generate(requirements_in='requirements-in.txt'):
     requirements = read_file(requirements_in)
 
     logger.info(f'Generate requirements for Docker image')
-
+    lock = {}
     new = {}
     logger.info(requirements)
     for name, version in requirements.items():
@@ -46,8 +46,9 @@ def docker_requirements_generate(requirements_in='requirements-in.txt'):
         if name == 'opencv-python':
             name = 'opencv-python-headless'
             version = None
-        # if name == 'numpy':
-        #     version = None
+        if name in lock:
+            version = lock[name] if not isinstance(lock[name], dict) else lock[name]['version']
+            name = name if not isinstance(lock[name], dict) else lock[name]['name']
         new[name] = version
 
     write_file(os.path.join(BASE_FOLDER, f'./requirements.txt'), data=new)

deploy/headless/requirements_generator.py

@@ -39,7 +39,6 @@ def headless_requirements_generate(requirements_in='requirements-in.txt'):
     lock = {
         'aiofiles': '23.1.0',
         'inflection': '0.5.1',
-        'jellyfish': '0.11.2',
         'lz4': '4.3.2',
         'numpy': '1.17.4',
         'onepush': '1.2.0',
@@ -55,6 +54,7 @@ def headless_requirements_generate(requirements_in='requirements-in.txt'):
         'wrapt': '1.15.0'
     }
     new = {}
+    logger.info(requirements)
     for name, version in requirements.items():
         if name == 'alas-webapp':
             continue

requirements-in.txt

@@ -6,7 +6,7 @@ av==10.0.0
 cnocr==1.2.2
 imageio==2.27.0
 inflection
-jellyfish
+jellyfish==0.11.2
 lz4
 mxnet==1.6.0
 numpy==1.16.6

requirements.txt

@@ -1,9 +1,10 @@
 #
-# This file is autogenerated by pip-compile with python 3.7
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.7
+# by the following command:
 #
 #    pip-compile --annotation-style=line --output-file=requirements.txt requirements-in.txt
 #
+
 adbutils==0.11.0          # via -r requirements-in.txt, uiautomator2
 aiofiles==0.7.0           # via -r requirements-in.txt
 alas-webapp==0.3.7        # via -r requirements-in.txt
@@ -37,7 +38,7 @@ idna==2.6                 # via requests
 imageio==2.27.0           # via -r requirements-in.txt
 importlib-metadata==4.8.1  # via click, prettytable
 inflection==0.5.1         # via -r requirements-in.txt
-jellyfish==0.8.8          # via -r requirements-in.txt
+jellyfish==0.11.2         # via -r requirements-in.txt
 kiwisolver==1.3.2         # via matplotlib
 logzero==1.7.0            # via uiautomator2
 lxml==4.6.3               # via uiautomator2