From 9e1fcacc6dde366b6fc4280e210c5ff6bd0ffa9e Mon Sep 17 00:00:00 2001 From: mnoszczak Date: Mon, 26 Jun 2023 20:11:39 +0200 Subject: [PATCH 1/5] Rise limit --- tests/integration/annotation_import/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/annotation_import/conftest.py b/tests/integration/annotation_import/conftest.py index 6c4db3485..6a9ded94d 100644 --- a/tests/integration/annotation_import/conftest.py +++ b/tests/integration/annotation_import/conftest.py @@ -11,8 +11,8 @@ from labelbox.schema.annotation_import import LabelImport, AnnotationImportState from labelbox.schema.queue_mode import QueueMode -DATA_ROW_PROCESSING_WAIT_TIMEOUT_SECONDS = 30 -DATA_ROW_PROCESSING_WAIT_SLEEP_INTERNAL_SECONDS = 5 +DATA_ROW_PROCESSING_WAIT_TIMEOUT_SECONDS = 40 +DATA_ROW_PROCESSING_WAIT_SLEEP_INTERNAL_SECONDS = 7 @pytest.fixture() From fbae46750ebb60be687f3ba2b552aeec08e73e61 Mon Sep 17 00:00:00 2001 From: Val Brodsky Date: Mon, 26 Jun 2023 12:53:48 -0400 Subject: [PATCH 2/5] Exclude feature_schema_id from exporter v2 expected results --- tests/integration/annotation_import/test_data_types.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/integration/annotation_import/test_data_types.py b/tests/integration/annotation_import/test_data_types.py index f57124ba5..a38f0dbf9 100644 --- a/tests/integration/annotation_import/test_data_types.py +++ b/tests/integration/annotation_import/test_data_types.py @@ -234,7 +234,8 @@ def test_import_data_types_v2(client, configured_project, exported_project_labels = exported_project['labels'][0] exported_annotations = exported_project_labels['annotations'] - remove_keys_recursive(exported_annotations, ['feature_id']) + remove_keys_recursive(exported_annotations, + ['feature_id', 'feature_schema_id']) rename_cuid_key_recursive(exported_annotations) assert exported_annotations == exports_v2_by_data_type[data_type_string] From 6300bfcb5b7d021ce54595dfa08bca8148291df2 Mon Sep 17 00:00:00 2001 From: Sergey Dubinin Date: Mon, 26 Jun 2023 21:56:20 +0500 Subject: [PATCH 3/5] AL-000: Removed ontology test --- tests/integration/test_ontology.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tests/integration/test_ontology.py b/tests/integration/test_ontology.py index e95e9eff7..3c96b7914 100644 --- a/tests/integration/test_ontology.py +++ b/tests/integration/test_ontology.py @@ -106,15 +106,6 @@ def test_cant_delete_an_ontology_with_project(client): client.delete_unused_feature_schema(feature_schema_id) -def test_cant_delete_an_ontology_that_doesnt_exist(client): - with pytest.raises( - Exception, - match= - "Failed to delete the ontology, message: Failed to find ontology by id: doesntexist" - ): - client.delete_unused_ontology("doesntexist") - - def test_inserts_a_feature_schema_at_given_position(client): tool1 = {'tool': 'polygon', 'name': 'tool1', 'color': 'blue'} tool2 = {'tool': 'polygon', 'name': 'tool2', 'color': 'blue'} From d6c0b84efa11c3b8cc949be962c5ad5dd81f05b7 Mon Sep 17 00:00:00 2001 From: mnoszczak <99751601+mnoszczak@users.noreply.github.com> Date: Fri, 23 Jun 2023 18:55:12 +0200 Subject: [PATCH 4/5] Update python-package.yml --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 92baf5529..e06f147c7 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -89,4 +89,4 @@ jobs: DA_GCP_LABELBOX_API_KEY: ${{ secrets[matrix.da-test-key] }} run: | - tox -e py -- -n 10 -svv --reruns 3 --reruns-delay 3 + tox -e py -- -n 10 -svv --reruns 3 --reruns-delay 8 From d190f998d7d1b392dd96e58bb052248914e8903c Mon Sep 17 00:00:00 2001 From: mnoszczak Date: Mon, 26 Jun 2023 20:14:31 +0200 Subject: [PATCH 5/5] Fix numpy version --- requirements.txt | 1 - setup.py | 10 ++++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4f1055233..e17f9a079 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,6 @@ google-api-core>=1.22.1 imagesize nbconvert~=7.2.6 nbformat~=5.7.0 -numpy~=1.21.6 opencv-python PILLOW pydantic>=1.8,<2.0 diff --git a/setup.py b/setup.py index e459b0f5e..4b1d309ee 100644 --- a/setup.py +++ b/setup.py @@ -20,8 +20,14 @@ url="https://labelbox.com", packages=setuptools.find_packages(), install_requires=[ - "backoff==1.10.0", "requests>=2.22.0", "google-api-core>=1.22.1", - "pydantic>=1.8,<2.0", "tqdm", "python-dateutil>=2.8.2,<2.9.0" + "backoff==1.10.0", + "requests>=2.22.0", + "google-api-core>=1.22.1", + "pydantic>=1.8,<2.0", + "tqdm", + "python-dateutil>=2.8.2,<2.9.0", + 'numpy==1.21.6; python_version<"3.8"', + 'numpy~=1.23.5; python_version>="3.8"', ], extras_require={ 'data': [