From 48f3c266bbbfe66f47e28b63ffd68573f40b2a64 Mon Sep 17 00:00:00 2001 From: Val Brodsky Date: Wed, 6 Sep 2023 14:20:13 -0700 Subject: [PATCH 1/2] Add 3.10 to gihub PR tests --- .github/workflows/python-package.yml | 4 ++++ tox.ini | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 83c0393af..6533555d8 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -26,6 +26,10 @@ jobs: prod-key: PROD_LABELBOX_API_KEY_3 staging-key: STAGING_LABELBOX_API_KEY_3 da-test-key: DA_GCP_LABELBOX_API_KEY + - python-version: '3.10' + prod-key: PROD_LABELBOX_API_KEY_4 + staging-key: STAGING_LABELBOX_API_KEY_4 + da-test-key: DA_GCP_LABELBOX_API_KEY steps: - name: Cancel previous workflow diff --git a/tox.ini b/tox.ini index 40c94cb48..bd16bcb49 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ # content of: tox.ini , put in same dir as setup.py [tox] -envlist = py37, py38, py39 +envlist = py37, py38, py39, py310 [testenv] # install pytest in the virtualenv where commands will be executed From 57da84845727f0bd164e58e2c7d85d1d811b96c2 Mon Sep 17 00:00:00 2001 From: Val Brodsky Date: Fri, 8 Sep 2023 15:10:32 -0700 Subject: [PATCH 2/2] Address test issues --- .../annotation_import/test_ndjson_validation.py | 8 ++++++-- tests/integration/test_data_rows.py | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/integration/annotation_import/test_ndjson_validation.py b/tests/integration/annotation_import/test_ndjson_validation.py index 123752402..fba161ef3 100644 --- a/tests/integration/annotation_import/test_ndjson_validation.py +++ b/tests/integration/annotation_import/test_ndjson_validation.py @@ -1,3 +1,4 @@ +from labelbox.schema.media_type import MediaType import pytest from labelbox import parser @@ -25,8 +26,11 @@ def get_data_row_id(indx=0): @pytest.fixture(scope="module", autouse=True) def configured_project_with_ontology(client, ontology, rand_gen): - project = client.create_project(name=rand_gen(str), - queue_mode=QueueMode.Batch) + project = client.create_project( + name=rand_gen(str), + queue_mode=QueueMode.Batch, + media_type=MediaType.Image, + ) editor = list( client.get_labeling_frontends( where=LabelingFrontend.name == "editor"))[0] diff --git a/tests/integration/test_data_rows.py b/tests/integration/test_data_rows.py index fdc4e7eb4..75e04863b 100644 --- a/tests/integration/test_data_rows.py +++ b/tests/integration/test_data_rows.py @@ -3,6 +3,7 @@ import uuid from datetime import datetime import json +from labelbox.schema.media_type import MediaType import pytest import requests @@ -959,7 +960,8 @@ def test_data_row_bulk_creation_sync_with_same_global_keys( def test_create_conversational_text(dataset, conversational_content): examples = [ { - **conversational_content, 'media_type': 'CONVERSATIONAL' + **conversational_content, 'media_type': + MediaType.Conversational.value }, conversational_content, {