Skip to content

Commit 99b764b

Browse files
Merge pull request #580 from Labelbox/develop
3.22.0 Release
2 parents 356faaa + 30edebd commit 99b764b

38 files changed

+8657
-161
lines changed

.github/workflows/python-package.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,15 @@ jobs:
1717
- python-version: 3.6
1818
prod-key: LABELBOX_API_KEY
1919
staging-key: STAGING_LABELBOX_API_KEY
20+
da-test-key: DA_GCP_LABELBOX_API_KEY
2021
- python-version: 3.7
2122
prod-key: PROD_LABELBOX_API_KEY_2
2223
staging-key: STAGING_LABELBOX_API_KEY_2
24+
da-test-key: DA_GCP_LABELBOX_API_KEY
2325
- python-version: 3.8
2426
prod-key: PROD_LABELBOX_API_KEY_3
2527
staging-key: STAGING_LABELBOX_API_KEY_3
28+
da-test-key: DA_GCP_LABELBOX_API_KEY
2629

2730
steps:
2831
- name: Cancel previous workflow
@@ -83,5 +86,7 @@ jobs:
8386
LABELBOX_TEST_API_KEY_PROD: ${{ secrets[matrix.prod-key] }}
8487

8588
LABELBOX_TEST_API_KEY_STAGING: ${{ secrets[matrix.staging-key] }}
89+
90+
DA_GCP_LABELBOX_API_KEY: ${{ secrets[matrix.da-test-key] }}
8691
run: |
8792
tox -e py -- -svv --reruns 5 --reruns-delay 10

CHANGELOG.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
# Changelog
22

3-
# Version 3.21.0
3+
# Version 3.22.0 (2022-05-20)
4+
## Added
5+
* `Dataset.create_data_row()` and `Dataset.create_data_rows()` now uploads metadata to data row
6+
* Added `media_attributes` and `metadata` to `BaseData`
7+
8+
## Updated
9+
* Removed `iou` from classification metrics
10+
11+
# Version 3.21.1 (2022-05-12)
12+
## Updated
13+
* `Project.create_batch()` timeout increased to 180 seconds
14+
15+
# Version 3.21.0 (2022-05-11)
416
## Added
517
* Projects can be created with a `media_type`
618
* Added `media_type` attribute to `Project`

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,28 @@ build:
66
test-local: build
77
docker run -it -v ${PWD}:/usr/src -w /usr/src \
88
-e LABELBOX_TEST_ENVIRON="local" \
9+
-e DA_GCP_LABELBOX_API_KEY=${DA_GCP_LABELBOX_API_KEY} \
910
-e LABELBOX_TEST_API_KEY_LOCAL=${LABELBOX_TEST_API_KEY_LOCAL} \
1011
local/labelbox-python:test pytest $(PATH_TO_TEST)
1112

1213
test-staging: build
1314
docker run -it -v ${PWD}:/usr/src -w /usr/src \
1415
-e LABELBOX_TEST_ENVIRON="staging" \
16+
-e DA_GCP_LABELBOX_API_KEY=${DA_GCP_LABELBOX_API_KEY} \
1517
-e LABELBOX_TEST_API_KEY_STAGING=${LABELBOX_TEST_API_KEY_STAGING} \
1618
local/labelbox-python:test pytest $(PATH_TO_TEST)
1719

1820
test-prod: build
1921
docker run -it -v ${PWD}:/usr/src -w /usr/src \
2022
-e LABELBOX_TEST_ENVIRON="prod" \
23+
-e DA_GCP_LABELBOX_API_KEY=${DA_GCP_LABELBOX_API_KEY} \
2124
-e LABELBOX_TEST_API_KEY_PROD=${LABELBOX_TEST_API_KEY_PROD} \
2225
local/labelbox-python:test pytest $(PATH_TO_TEST)
2326

2427
test-onprem: build
2528
docker run -it -v ${PWD}:/usr/src -w /usr/src \
2629
-e LABELBOX_TEST_ENVIRON="onprem" \
30+
-e DA_GCP_LABELBOX_API_KEY=${DA_GCP_LABELBOX_API_KEY} \
2731
-e LABELBOX_TEST_API_KEY_ONPREM=${LABELBOX_TEST_API_KEY_ONPREM} \
2832
-e LABELBOX_TEST_ONPREM_HOSTNAME=${LABELBOX_TEST_ONPREM_HOSTNAME} \
2933
local/labelbox-python:test pytest $(PATH_TO_TEST)

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,3 +121,6 @@ make test-prod # with an optional flag: PATH_TO_TEST=tests/integration/...etc LA
121121
```
122122
make -B {build|test-staging|test-prod}
123123
```
124+
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.

e2e_tests_codefresh_pipeline.yaml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
version: "1.0"
2+
stages:
3+
- "clone"
4+
- "build"
5+
- "e2e_test"
6+
steps:
7+
main_clone:
8+
title: "Cloning repository"
9+
type: "git-clone"
10+
repo: "Labelbox/labelbox-python"
11+
stage: "clone"
12+
revision: "${{CF_BRANCH}}"
13+
parallel_build:
14+
type: "parallel"
15+
stage: "build"
16+
steps:
17+
build_sdk_test:
18+
description: "Building Docker image for sdk tests"
19+
tag: "testing"
20+
type: "build"
21+
image_name: "sdk-tests"
22+
disable_push: true
23+
working_directory: "${{main_clone}}"
24+
dockerfile: "Dockerfile"
25+
e2e_test:
26+
title: "Python SDK e2e tests"
27+
description: "Running Python SDK e2e tests"
28+
fail_fast: false
29+
stage: "e2e_test"
30+
image: "${{build_sdk_test}}"
31+
working_directory: "IMAGE_WORK_DIR"
32+
commands:
33+
- pytest
34+
send_slack_success_to_pages_active_learning:
35+
title: "Alert on success to pages active learning"
36+
type: slack-message-sender
37+
arguments:
38+
WEBHOOK_URL: "${{slack_webhook_url}}"
39+
MESSAGE: "SDK Tests have succeeded-- ${{CF_BUILD_URL}}"
40+
when:
41+
condition:
42+
all:
43+
succeeded: e2e_test.result == 'success'
44+
send_slack_failure_to_e2e:
45+
title: "Alert on failure to e2e channel"
46+
type: slack-message-sender
47+
arguments:
48+
WEBHOOK_URL: "${{slack_webhook_e2e}}"
49+
MESSAGE: "SDK Tests have failed-- ${{CF_BUILD_URL}}"
50+
when:
51+
condition:
52+
all:
53+
failed: e2e_test.result == 'failure'
54+
send_slack_failure_to_deploy_prod:
55+
title: "Alert on failure to deployments prod channel"
56+
type: slack-message-sender
57+
arguments:
58+
WEBHOOK_URL: "${{slack_webhook_deployments_prod}}"
59+
MESSAGE: "SDK Tests have failed-- ${{CF_BUILD_URL}}"
60+
when:
61+
condition:
62+
all:
63+
failed: e2e_test.result == 'failure'
64+
check_for_failures:
65+
image: alpine
66+
commands:
67+
- exit 1
68+
when:
69+
condition:
70+
any:
71+
myCondition: e2e_test.result == 'failure'

0 commit comments

Comments
 (0)