Skip to content

Commit ea1b9b4

Browse files
authored
Merge pull request #226 from Labelbox/develop
rc1
2 parents 73e2336 + 71d3643 commit ea1b9b4

File tree

24 files changed

+1577
-1721
lines changed

24 files changed

+1577
-1721
lines changed

.github/workflows/publish.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ jobs:
2828
run: |
2929
python setup.py sdist bdist_wheel
3030
31-
- name: Update help docs
32-
run: |
33-
python setup.py install
34-
python ./tools/api_reference_generator.py ${{ secrets.HELPDOCS_API_KEY }}
35-
3631
- name: Publish
3732
env:
3833
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}

CHANGELOG.md

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

3-
# Version 3.0.0-rc0
3+
# Version 3.0.0-rc1 (2021-08-05)
4+
## Added
5+
* Model diagnostics notebooks
6+
* Minor annotation type improvements
7+
8+
# Version 3.0.0-rc0 (2021-08-04)
49
## Added
510
* Annotation types
611
- A set of python objects for working with labelbox data

CONTRIB.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,11 @@ yapf labelbox -i --verbose --recursive --parallel --style "google"
4747
Each release should follow the following steps:
4848

4949
1. Update the Python SDK package version in `REPO_ROOT/setup.py`
50-
2. Make sure the `CHANGELOG.md` contains appropriate info
50+
2. Make sure the `CHANGELOG.md` contains appropriate info
5151
3. Commit these changes and tag the commit in Git as `vX.Y`
5252
4. Merge `develop` to `master` (fast-forward only).
5353
5. Create a GitHub release.
5454
6. This will kick off a Github Actions workflow that will:
5555
- Build the library in the [standard way](https://packaging.python.org/tutorials/packaging-projects/#generating-distribution-archives)
5656
- Upload the distribution archives in the [standard way](https://packaging.python.org/tutorials/packaging-projects/#uploading-the-distribution-archives)
5757
with credentials for the `labelbox` PyPI user.
58-
- Run the `REPO_ROOT/tools/api_reference_generator.py` script to update
59-
[HelpDocs documentation](https://labelbox.helpdocs.io/docs/). You will need
60-
to provide a HelpDocs API key for.

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
copyright = '2021, Labelbox'
2222
author = 'Labelbox'
2323

24-
release = '2.6.0'
24+
release = '3.0.0-rc0'
2525

2626
# -- General configuration ---------------------------------------------------
2727

docs/source/index.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ AssetAttachment
2121
:members:
2222
:show-inheritance:
2323

24-
AssetMetadata
25-
--------------------------------------
26-
27-
.. automodule:: labelbox.schema.asset_metadata
28-
:members:
29-
:show-inheritance:
3024

3125
Benchmark
3226
--------------------------------

examples/README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,10 @@
5757
| Annotation Type Basics | [Github](annotation_types/basics.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/annotation_types/basics.ipynb) |
5858
| Converters | [Github](annotation_types/converters.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/annotation_types/converters.ipynb) |
5959
| Label Containers | [Github](annotation_types/label_containers.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/annotation_types/label_containers.ipynb) |
60-
| MAL With Annotation Types | [Github](annotation_types/mal_with_annotation_types.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/annotation_types/mal_with_annotation_types.ipynb) |
60+
| MAL Using Annotation Types | [Github](annotation_types/mal_using_annotation_types.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/annotation_types/mal_using_annotation_types.ipynb) |
61+
62+
## [Model Diagnostics](model_diagnostics)
63+
| Notebook | Github | Google Colab |
64+
| --------------------------- | --------------------------------- | ------------ |
65+
| Model Diagnostics Guide | [Github](model_diagnostics/model_diagnostics_guide.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/model_diagnostics/model_diagnostics_guide.ipynb) |
66+
| Model Diagnostics Demo | [Github](model_diagnostics/model_diagnostics_demo.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/model_diagnostics/model_diagnostics_demo.ipynb) |

examples/annotation_types/basics.ipynb

Lines changed: 133 additions & 324 deletions
Large diffs are not rendered by default.

examples/annotation_types/converters.ipynb

Lines changed: 246 additions & 58 deletions
Large diffs are not rendered by default.

examples/annotation_types/label_containers.ipynb

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"metadata": {},
2121
"outputs": [],
2222
"source": [
23-
"!pip install labelbox[data] == 3.0b0"
23+
"!pip install \"labelbox[data]==3.0.0rc1\""
2424
]
2525
},
2626
{
@@ -83,7 +83,6 @@
8383
"source": [
8484
"# Only update this if you have an on-prem deployment\n",
8585
"ENDPOINT = \"https://api.labelbox.com/graphql\"\n",
86-
"\n",
8786
"client = Client(api_key=API_KEY, endpoint=ENDPOINT)"
8887
]
8988
},
@@ -93,7 +92,7 @@
9392
"metadata": {},
9493
"source": [
9594
"#### Helper Functions\n",
96-
"* See annotation_type_basics for details on this"
95+
"* See basics for details on this"
9796
]
9897
},
9998
{
@@ -270,7 +269,12 @@
270269
"outputs": [],
271270
"source": [
272271
"labels = get_labels()\n",
273-
"label_list = LabelList(labels)"
272+
"label_list = LabelList(labels)\n",
273+
"\n",
274+
"# Also build label lists iteratively\n",
275+
"label_list = LabelList()\n",
276+
"for label in labels:\n",
277+
" label_list.append(label)"
274278
]
275279
},
276280
{
@@ -825,7 +829,7 @@
825829
],
826830
"metadata": {
827831
"kernelspec": {
828-
"display_name": "Python 3",
832+
"display_name": "Python 3 (ipykernel)",
829833
"language": "python",
830834
"name": "python3"
831835
},

0 commit comments

Comments
 (0)