Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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': [
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/annotation_import/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/annotation_import/test_data_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thx for merging this too

rename_cuid_key_recursive(exported_annotations)
assert exported_annotations == exports_v2_by_data_type[data_type_string]

Expand Down
9 changes: 0 additions & 9 deletions tests/integration/test_ontology.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'}
Expand Down