requirements upgrade

Author: Narek Mkhitaryan

CHANGELOG.rst

@@ -7,7 +7,7 @@ History
 All release highlights of this project will be documented in this file.
 
 4.4.12 - April 23, 2023
-______________________
+_______________________
 
 **Updated**
 

pytest.ini

@@ -3,5 +3,5 @@ minversion = 3.7
 log_cli=true
 python_files = test_*.py
 ;pytest_plugins = ['pytest_profiling']
-addopts = -n auto --dist=loadscope
+;addopts = -n auto --dist=loadscope
 

requirements.txt

@@ -1,22 +1,16 @@
-pydicom>=2.0.0
-boto3>=1.14.53
+pydantic~=1.10
+aiohttp~=3.8
+boto3~=1.26
+opencv-python~=4.7
+packaging~=23.1
+plotly~=5.14
+email-validator~=2.0
+pandas~=1.3
+ffmpeg-python~=0.2
+pillow~=9.5
+aiofiles==0.8.0
 requests==2.28.2
-requests-toolbelt>=0.9.1
-aiohttp>=3.8.1
 tqdm==4.64.0
-pillow==9.4.0
-matplotlib>=3.3.1
-xmltodict==0.12.0
-opencv-python>=4.4.0.42
-wheel>=0.40.0
-packaging>=20.4
-plotly>=4.1.0
-ffmpeg-python>=0.2.0
 fire==0.4.0
 mixpanel==4.8.3
-pydantic>=1.10.7
-setuptools>=57.4.0
-email-validator>=1.0.3
 jsonschema==3.2.0
-pandas>=1.1.4
-aiofiles==0.8.0

requirements_extra.txt

@@ -1,13 +1,14 @@
+setuptools~=67.7
+wheel~=0.40
 Sphinx==6.2.1
-Jinja2==3.1.2
-tox==4.4.5
+tox==4.5.1
 sphinx_rtd_theme==1.2.0
-furo==2022.12.7
-jaraco.tidelift==1.5.0
+furo==2023.3.27
+jaraco.tidelift==1.5.1
 sphinx-notfound-page==0.8.3
-sphinx_inline_tabs==2022.1.2b11
-pytest==7.2.1
-pytest-xdist==3.2.0
+sphinx_inline_tabs==2023.4.21
+pytest==7.3.1
+pytest-xdist==3.2.1
 pytest-parallel==0.1.1
 pytest-cov==4.0.0
-pytest-rerunfailures==10.2
+pytest-rerunfailures==11.1.2

src/superannotate/__init__.py

@@ -1,7 +1,6 @@
 import logging
 import os
 import sys
-import typing
 
 __version__ = "4.4.12"
 

src/superannotate/lib/app/interface/cli_interface.py

@@ -29,9 +29,9 @@ def version():
 
     @staticmethod
     def init(
-            token: str,
-            logging_level: str = "INFO",
-            logging_path: str = constances.LOG_FILE_LOCATION,
+        token: str,
+        logging_level: str = "INFO",
+        logging_path: str = constances.LOG_FILE_LOCATION,
     ):
         """
         To initialize CLI (and SDK) with team token
@@ -53,7 +53,7 @@ def init(
         if Path(constances.CONFIG_INI_FILE_LOCATION).exists():
             operation = "updated"
             if not input(
-                    f"File {constances.CONFIG_INI_FILE_LOCATION} exists. Do you want to overwrite? [y/n] : "
+                f"File {constances.CONFIG_INI_FILE_LOCATION} exists. Do you want to overwrite? [y/n] : "
             ).lower() in ("y", "yes"):
                 return
         else:
@@ -84,14 +84,14 @@ def create_folder(self, project: str, name: str):
         sys.exit(0)
 
     def upload_images(
-            self,
-            project: str,
-            folder: str,
-            extensions: str = constances.DEFAULT_IMAGE_EXTENSIONS,
-            set_annotation_status: str = constances.AnnotationStatus.NOT_STARTED.name,
-            exclude_file_patterns=constances.DEFAULT_FILE_EXCLUDE_PATTERNS,
-            recursive_subfolders=False,
-            image_quality_in_editor=None,
+        self,
+        project: str,
+        folder: str,
+        extensions: str = constances.DEFAULT_IMAGE_EXTENSIONS,
+        set_annotation_status: str = constances.AnnotationStatus.NOT_STARTED.name,
+        exclude_file_patterns=constances.DEFAULT_FILE_EXCLUDE_PATTERNS,
+        recursive_subfolders=False,
+        image_quality_in_editor=None,
     ):
         """
         To upload images from folder to project use:
@@ -115,12 +115,12 @@ def upload_images(
         sys.exit(0)
 
     def export_project(
-            self,
-            project,
-            folder,
-            include_fuse=False,
-            disable_extract_zip_contents=False,
-            annotation_statuses=None,
+        self,
+        project,
+        folder,
+        include_fuse=False,
+        disable_extract_zip_contents=False,
+        annotation_statuses=None,
     ):
         project_name, folder_name = split_project_path(project)
         folders = None
@@ -146,7 +146,7 @@ def export_project(
         sys.exit(0)
 
     def upload_annotations(
-            self, project, folder, dataset_name=None, task=None, format=None
+        self, project, folder, dataset_name=None, task=None, format=None
     ):
         """
         To upload annotations from folder to project use
@@ -196,10 +196,10 @@ def _upload_annotations(self, project, folder, format, dataset_name, task):
         sys.exit(0)
 
     def attach_image_urls(
-            self,
-            project: str,
-            attachments: str,
-            annotation_status: Optional[Any] = "NotStarted",
+        self,
+        project: str,
+        attachments: str,
+        annotation_status: Optional[Any] = "NotStarted",
     ):
         """
         To attach image URLs to project use:
@@ -213,10 +213,10 @@ def attach_image_urls(
         sys.exit(0)
 
     def attach_video_urls(
-            self,
-            project: str,
-            attachments: str,
-            annotation_status: Optional[Any] = "NotStarted",
+        self,
+        project: str,
+        attachments: str,
+        annotation_status: Optional[Any] = "NotStarted",
     ):
         SAClient().attach_items(
             project=project,
@@ -227,7 +227,7 @@ def attach_video_urls(
 
     @staticmethod
     def attach_document_urls(
-            project: str, attachments: str, annotation_status: Optional[Any] = "NotStarted"
+        project: str, attachments: str, annotation_status: Optional[Any] = "NotStarted"
     ):
         SAClient().attach_items(
             project=project,
@@ -237,15 +237,15 @@ def attach_document_urls(
         sys.exit(0)
 
     def upload_videos(
-            self,
-            project,
-            folder,
-            target_fps=None,
-            recursive=False,
-            extensions=constances.DEFAULT_VIDEO_EXTENSIONS,
-            set_annotation_status=constances.AnnotationStatus.NOT_STARTED.name,
-            start_time=0.0,
-            end_time=None,
+        self,
+        project,
+        folder,
+        target_fps=None,
+        recursive=False,
+        extensions=constances.DEFAULT_VIDEO_EXTENSIONS,
+        set_annotation_status=constances.AnnotationStatus.NOT_STARTED.name,
+        start_time=0.0,
+        end_time=None,
     ):
         """
         To upload videos from folder to project use

tests/integration/test_cli.py

@@ -199,13 +199,6 @@ def test_attach_document_urls(self):
         )
         self.assertEqual(3, len(sa.search_items(self.PROJECT_NAME)))
 
-    def test_create_server(self):
-        with tempfile.TemporaryDirectory() as temp_dir:
-            self._cli.create_server("test", temp_dir)
-            # self._cli.create_server('testo', '/Users/vaghinak.basentsyan/www/for_fun')
-            assert (Path(temp_dir) / "test" / "app.py").exists()
-            assert (Path(temp_dir) / "test" / "wsgi.py").exists()
-
     def test_init(self):
         _token = "asd=123"
         with tempfile.TemporaryDirectory() as config_dir:

tests/unit/test_classes_serialization.py

@@ -50,7 +50,9 @@ def test_empty_multiselect_bool_serializer(self):
         annotation_class = AnnotationClassEntity(
             name="asd",
             color="blue",
-            attribute_groups=[AttributeGroup(name="sad", is_multiselect="True")],  # noqa
+            attribute_groups=[
+                AttributeGroup(name="sad", is_multiselect="True")
+            ],  # noqa
         )
         serializer_data = json.loads(json.dumps(annotation_class, cls=PydanticEncoder))
         assert {
@@ -66,7 +68,9 @@ def test_group_type_wrong_arg(self):
                 name="asd",
                 color="blue",
                 attribute_groups=[
-                    AttributeGroup(name="sad", is_multiselect=True, group_type="asd")  # noqa
+                    AttributeGroup(
+                        name="sad", is_multiselect=True, group_type="asd"
+                    )  # noqa
                 ],
             )
         except ValidationError as e: