Skip to content

Commit 3de55fa

Browse files
author
Matt Sokoloff
committed
Merge branch 'develop' of https://github.com/Labelbox/labelbox-python into bulk-upload-convo
2 parents 2f766b7 + bcb23d8 commit 3de55fa

File tree

7 files changed

+457
-56
lines changed

7 files changed

+457
-56
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ client = Client( endpoint = "<local deployment>")
8585
client = Client(api_key=os.environ['LABELBOX_TEST_API_KEY_LOCAL'], endpoint="http://localhost:8080/graphql")
8686
8787
# Staging
88-
client = Client(api_key=os.environ['LABELBOX_TEST_API_KEY_LOCAL'], endpoint="https://staging-api.labelbox.com/graphql")
88+
client = Client(api_key=os.environ['LABELBOX_TEST_API_KEY_LOCAL'], endpoint="https://api.lb-stage.xyz/graphql")
8989
```
9090

9191
## Contribution
@@ -122,5 +122,5 @@ make test-prod # with an optional flag: PATH_TO_TEST=tests/integration/...etc LA
122122
make -B {build|test-staging|test-prod}
123123
```
124124

125-
6. Testing against Delegated Access will be skipped unless the local env contains the key:
126-
DA_GCP_LABELBOX_API_KEY. These tests will be included when run against a PR. If you would like to test it manually, please reach out to the Devops team for information on the key.
125+
6. Testing against Delegated Access will be skipped unless the local env contains the key:
126+
DA_GCP_LABELBOX_API_KEY. These tests will be included when run against a PR. If you would like to test it manually, please reach out to the Devops team for information on the key.

labelbox/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from labelbox.schema.role import Role, ProjectRole
2222
from labelbox.schema.invite import Invite, InviteLimit
2323
from labelbox.schema.data_row_metadata import DataRowMetadataOntology
24-
from labelbox.schema.model_run import ModelRun
24+
from labelbox.schema.model_run import ModelRun, DataSplit
2525
from labelbox.schema.benchmark import Benchmark
2626
from labelbox.schema.iam_integration import IAMIntegration
2727
from labelbox.schema.resource_tag import ResourceTag

0 commit comments

Comments
 (0)