Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
0b1a04a
parallelize
jtsodapop Nov 3, 2021
98e11ab
parallelize
jtsodapop Nov 3, 2021
438f3ff
parallelize
jtsodapop Nov 3, 2021
3b7fa28
parallelize
jtsodapop Nov 3, 2021
f06cb75
parallelize
jtsodapop Nov 3, 2021
366e4fc
parallelize
jtsodapop Nov 3, 2021
16bbc6c
parallelize
jtsodapop Nov 3, 2021
490c393
parallelize
jtsodapop Nov 3, 2021
6871c0e
parallelize
jtsodapop Nov 3, 2021
6a27651
parallelize
jtsodapop Nov 3, 2021
f4c3ecf
parallelize
jtsodapop Nov 3, 2021
8721380
parallelize
jtsodapop Nov 3, 2021
309c39d
parallelize
jtsodapop Nov 3, 2021
c5c96fe
parallelize
jtsodapop Nov 3, 2021
70dc654
parallelize
jtsodapop Nov 3, 2021
c83b8e5
parallelize
jtsodapop Nov 3, 2021
519a162
parallelize
jtsodapop Nov 3, 2021
6f1b628
parallelize
jtsodapop Nov 3, 2021
4b1d9c3
parallelize
jtsodapop Nov 3, 2021
eaf2fcc
parallelize
jtsodapop Nov 3, 2021
d2eb0aa
parallelize
jtsodapop Nov 3, 2021
1d57a21
parallelize
jtsodapop Nov 3, 2021
f80213f
Merge branch 'develop' of https://github.com/Labelbox/labelbox-python…
Nov 18, 2021
c9a1b6b
Merge pull request #331 from Labelbox/DIAG-891-parallel
msokoloff1 Nov 18, 2021
c265c50
CHG: update db partner connect notebook
Nov 18, 2021
b255334
Merge pull request #348 from Labelbox/gj/open-source-db-notebook
msokoloff1 Nov 18, 2021
cfec417
update to remove the check on if it is a list
jtsodapop Dec 1, 2021
f7b1444
update to remove the check on if it is a list
jtsodapop Dec 1, 2021
73ca08d
Merge pull request #352 from Labelbox/issue350
jtsodapop Dec 1, 2021
0ca276b
update to project upsert instructions to no longer remove old ontolog…
jtsodapop Dec 3, 2021
9cabcc5
nit
jtsodapop Dec 3, 2021
bbcc137
adding back something that wasn't in my own branch
jtsodapop Dec 3, 2021
b890b8e
adding back something that wasn't in my own branch
jtsodapop Dec 3, 2021
7b4b514
Merge pull request #356 from Labelbox/DIAG-1131
jtsodapop Dec 3, 2021
28170ee
update to 3.10.0
jtsodapop Dec 7, 2021
c6b9b32
Merge pull request #357 from Labelbox/jtso/update_docs
msokoloff1 Dec 7, 2021
b42b6bd
removed deprecated functions, fix instruction upsert
Dec 15, 2021
58753c5
fix test
Dec 15, 2021
2f6aab9
Merge pull request #363 from Labelbox/ms/3.11.0-dev
msokoloff1 Dec 15, 2021
70d63c3
fix test
Dec 15, 2021
b103198
format
Dec 15, 2021
7621793
Merge pull request #366 from Labelbox/ms/labeling-frontend-fix
msokoloff1 Dec 15, 2021
0a662d9
remove key
Dec 15, 2021
2edfd8b
Merge pull request #367 from Labelbox/ms/revert-change
msokoloff1 Dec 15, 2021
09997d4
search by frontend name, not url
Dec 15, 2021
a95a93c
Merge pull request #368 from Labelbox/ms/fix-multiple-editor-tests
msokoloff1 Dec 15, 2021
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
119 changes: 61 additions & 58 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,83 +2,86 @@ name: Labelbox Python SDK

on:
push:
branches: [ develop, master ]
branches: [develop, master]
pull_request:
branches: [ develop, master ]
branches: [develop, master]

jobs:
build:
if: github.event.pull_request.head.repo.full_name == github.repository

runs-on: ubuntu-latest
strategy:
max-parallel: 1
matrix:
# TODO: unlock parallel testing by using more API keys
python-version: [3.6, 3.7, 3.8]
include:
- python-version: 3.6
prod-key: LABELBOX_API_KEY
staging-key: STAGING_LABELBOX_API_KEY
- python-version: 3.7
prod-key: PROD_LABELBOX_API_KEY_2
staging-key: STAGING_LABELBOX_API_KEY_2
- python-version: 3.8
prod-key: PROD_LABELBOX_API_KEY_3
staging-key: STAGING_LABELBOX_API_KEY_3

steps:
- name: Cancel previous workflow
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}

- name: Cancel previous workflow
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}

- name: set environment for branch
run: |
- name: set environment for branch
run: |
if [[ "${{github.base_ref}}" == "master" || "${{github.ref}}" == "refs/heads/master" ]]; then
echo "LABELBOX_TEST_ENVIRON=prod" >> $GITHUB_ENV
else
echo "LABELBOX_TEST_ENVIRON=staging" >> $GITHUB_ENV
fi

- uses: actions/checkout@v2
with:
token: ${{ secrets.ACTIONS_ACCESS_TOKEN }}
ref: ${{ github.head_ref }}
- uses: actions/checkout@v2
with:
token: ${{ secrets.ACTIONS_ACCESS_TOKEN }}
ref: ${{ github.head_ref }}

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: yapf
id: yapf
uses: AlexanderMelde/yapf-action@master
with:
args: --verbose --recursive --parallel --style "google"
- name: dependencies
run: |
sudo apt-get -y update
sudo apt install -y libsm6 \
libxext6 \
ffmpeg \
libfontconfig1 \
libxrender1 \
libgl1-mesa-glx
- name: install labelbox package
run: |
python -m pip install --upgrade pip
python -m pip install .
- name: mypy
run: |
pip install mypy==0.782
mypy -p labelbox --pretty --show-error-codes
- name: Install package and test dependencies
run: |
pip install tox==3.18.1
- name: yapf
id: yapf
uses: AlexanderMelde/yapf-action@master
with:
args: --verbose --recursive --parallel --style "google"
- name: dependencies
run: |
sudo apt-get -y update
sudo apt install -y libsm6 \
libxext6 \
ffmpeg \
libfontconfig1 \
libxrender1 \
libgl1-mesa-glx
- name: install labelbox package
run: |
python -m pip install --upgrade pip
python -m pip install .
- name: mypy
run: |
pip install mypy==0.782
mypy -p labelbox --pretty --show-error-codes
- name: Install package and test dependencies
run: |
pip install tox==3.18.1

# TODO: replace tox.ini with what the Makefile does
# to make sure local testing is
# identical to github actions which uses tox.ini
- name: Test with tox
env:
# make sure to tell tox to use these environs in tox.ini
#
# [email protected]
LABELBOX_TEST_API_KEY_PROD: ${{ secrets.LABELBOX_API_KEY }}
# TODO: replace tox.ini with what the Makefile does
# to make sure local testing is
# identical to github actions which uses tox.ini
- name: Test with tox
env:
# make sure to tell tox to use these environs in tox.ini
LABELBOX_TEST_API_KEY_PROD: ${{ secrets[matrix.prod-key] }}

# [email protected]
LABELBOX_TEST_API_KEY_STAGING: ${{ secrets.STAGING_LABELBOX_API_KEY }}
run: |
tox -e py -- -svvx
LABELBOX_TEST_API_KEY_STAGING: ${{ secrets[matrix.staging-key] }}
run: |
tox -e py -- -svvx
19 changes: 12 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
# Changelog

## Deprecation Notice
| Name | Replacement | Removed After |
| ------------------------------------- | ------------------------------------- | ------------- |
| `ModelRun.delete_annotation_groups()` | `ModelRun.delete_model_run_data_rows()`| 2021-12-06 |
| `ModelRun.annotation_groups()` | `ModelRun.model_run_data_rows()` | 2021-12-06 |
| `DataRowMetadataSchema.id` | `DataRowMetadataSchema.uid` | 2021-12-06 |
-----
# Version 3.11.0 (2021-12-15)

## Fix
* `Dataset.create_data_rows()` now accepts an iterable of data row information instead of a list
* `project.upsert_instructions()`
* now only supports pdfs since that is what the editor requires
* There was a bug that could cause this to modify the project ontology

## Removed
* `DataRowMetadataSchema.id` use `DataRowMetadataSchema.uid` instead
* `ModelRun.delete_annotation_groups()` use `ModelRun.delete_model_run_data_rows()` instead
* `ModelRun.annotation_groups()` use `ModelRun.model_run_data_rows()` instead

# Version 3.10.0 (2021-11-18)
## Added
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
copyright = '2021, Labelbox'
author = 'Labelbox'

release = '3.8.0'
release = '3.11.0'

# -- General configuration ---------------------------------------------------

Expand Down
Loading