Skip to content

Commit 8602a34

Browse files
lgluszeklgluszek
authored
Merge branch 'develop' into lgluszek/PTDT-2854
2 parents 06d9412 + 76c35ba commit 8602a34

File tree

16 files changed

+65
-34
lines changed

16 files changed

+65
-34
lines changed

‎.github/actions/lbox-matrix/index.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26830,12 +26830,20 @@ try {
2683026830
"python-version": "3.12",
2683126831
"api-key": "STAGING_LABELBOX_API_KEY_5",
2683226832
"da-test-key": "DA_GCP_LABELBOX_API_KEY"
26833-
}
26833+
},
26834+
{
26835+
"python-version": "3.13",
26836+
"api-key": "STAGING_LABELBOX_API_KEY_2",
26837+
"da-test-key": "DA_GCP_LABELBOX_API_KEY"
26838+
},
2683426839
];
2683526840
const testMatrix = [];
26841+
const excludeRegex = /lbox-example/;
26842+
2683626843
const packages = files.map(file => {
2683726844
return file.split('/')[1];
26838-
});
26845+
}).filter(pkg => pkg !== null && !excludeRegex.test(pkg));
26846+
2683926847
const uniquePackages = [... new Set(packages)];
2684026848
uniquePackages.forEach(package => {
2684126849
startingMatrix.forEach(matrixItem => {

‎.github/workflows/lbox-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
list-files: 'json'
3838
filters: |
3939
lbox:
40-
- 'libs/lbox*/**'
40+
- 'libs/lbox-!(example)/**'
4141
- id: matrix
4242
uses: ./.github/actions/lbox-matrix
4343
with:
@@ -54,7 +54,6 @@ jobs:
5454
steps:
5555
- uses: actions/checkout@v4
5656
with:
57-
# ref: ${{ inputs.tag }}
5857
ref: ${{ inputs.tag }}
5958
- name: Install the latest version of rye
6059
uses: eifinger/setup-rye@v2
@@ -148,6 +147,7 @@ jobs:
148147
uses: pypa/gh-action-pypi-publish@release/v1
149148
with:
150149
packages-dir: artifact/
150+
verbose: true
151151
container-publish:
152152
runs-on: ubuntu-latest
153153
needs: ['build', 'path-filter']

‎.github/workflows/publish.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,21 @@ jobs:
8686
fail-fast: false
8787
matrix:
8888
include:
89-
- python-version: 3.9
89+
- python-version: "3.9"
9090
prod-key: PROD_LABELBOX_API_KEY_3
9191
da-test-key: DA_GCP_LABELBOX_API_KEY
9292
- python-version: "3.10"
9393
prod-key: PROD_LABELBOX_API_KEY_4
9494
da-test-key: DA_GCP_LABELBOX_API_KEY
95-
- python-version: 3.11
95+
- python-version: "3.11"
9696
prod-key: LABELBOX_API_KEY
9797
da-test-key: DA_GCP_LABELBOX_API_KEY
98-
- python-version: 3.12
98+
- python-version: "3.12"
9999
prod-key: PROD_LABELBOX_API_KEY_5
100100
da-test-key: DA_GCP_LABELBOX_API_KEY
101+
- python-version: "3.13"
102+
prod-key: PROD_LABELBOX_API_KEY_2
103+
da-test-key: DA_GCP_LABELBOX_API_KEY
101104
steps:
102105
- uses: actions/checkout@v4
103106
with:

‎.github/workflows/python-package-develop.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Get Latest SDK versions
4545
id: get_sdk_versions
4646
run: |
47-
sdk_versions=$(git tag --list --sort=-version:refname "v.*" | head -n 3 | jq -R -s -c 'split("\n")[:-1]')
47+
sdk_versions=$(git tag --list --sort=-version:refname "v.*" | head -n 4 | jq -R -s -c 'split("\n")[:-1]')
4848
if [ -z "$sdk_versions" ]; then
4949
echo "No tags found"
5050
exit 1
@@ -58,21 +58,25 @@ jobs:
5858
fail-fast: false
5959
matrix:
6060
include:
61-
- python-version: 3.9
61+
- python-version: "3.9"
6262
api-key: STAGING_LABELBOX_API_KEY_3
6363
da-test-key: DA_GCP_LABELBOX_API_KEY
64-
sdk-version: ${{ fromJson(needs.get_sdk_versions.outputs.sdk_versions)[2] }}
64+
sdk-version: ${{ fromJson(needs.get_sdk_versions.outputs.sdk_versions)[3] }}
6565
- python-version: "3.10"
6666
api-key: STAGING_LABELBOX_API_KEY_4
6767
da-test-key: DA_GCP_LABELBOX_API_KEY
68-
sdk-version: ${{ fromJson(needs.get_sdk_versions.outputs.sdk_versions)[1] }}
69-
- python-version: 3.11
68+
sdk-version: ${{ fromJson(needs.get_sdk_versions.outputs.sdk_versions)[2] }}
69+
- python-version: "3.11"
7070
api-key: STAGING_LABELBOX_API_KEY
7171
da-test-key: DA_GCP_LABELBOX_API_KEY
72-
sdk-version: ${{ fromJson(needs.get_sdk_versions.outputs.sdk_versions)[0] }}
73-
- python-version: 3.12
72+
sdk-version: ${{ fromJson(needs.get_sdk_versions.outputs.sdk_versions)[1] }}
73+
- python-version: "3.12"
7474
api-key: STAGING_LABELBOX_API_KEY_5
7575
da-test-key: DA_GCP_LABELBOX_API_KEY
76+
sdk-version: ${{ fromJson(needs.get_sdk_versions.outputs.sdk_versions)[0] }}
77+
- python-version: "3.13"
78+
api-key: STAGING_LABELBOX_API_KEY_2
79+
da-test-key: DA_GCP_LABELBOX_API_KEY
7680
uses: ./.github/workflows/python-package-shared.yml
7781
with:
7882
python-version: ${{ matrix.python-version }}

‎docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
project = 'Python SDK reference'
1717
copyright = '2024, Labelbox'
1818
author = 'Labelbox'
19-
release = '6.5.0'
19+
release = '6.6.0'
2020

2121
# -- General configuration ---------------------------------------------------
2222

‎libs/labelbox/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
# Changelog
2+
# Version 6.6.0 (2025-01-14)
3+
## Added
4+
* Support for python 3.13([#1940](https://github.com/Labelbox/labelbox-python/pull/1940))
5+
* Note minimum numpy version that supports python 3.13 is 2.1
6+
* Include predictions in slice export([#1939](https://github.com/Labelbox/labelbox-python/pull/1939))
7+
8+
## Fixed
9+
* GraphQL upload SSL configuration([#1937](https://github.com/Labelbox/labelbox-python/pull/1937))
10+
211
# Version 6.5.0 (2025-01-03)
312
## Added
413
* Support include predictions in catalog exports([#1935](https://github.com/Labelbox/labelbox-python/pull/1935))

‎libs/labelbox/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ENV LANG="C.UTF-8" \
55
LC_ALL="C.UTF-8" \
66
PATH="/home/python/.local/bin:/home/python/.rye/shims:$PATH" \
77
PIP_NO_CACHE_DIR="false" \
8-
RYE_VERSION="0.36.0" \
8+
RYE_VERSION="0.43.0" \
99
RYE_INSTALL_OPTION="--yes" \
1010
LABELBOX_TEST_ENVIRON="prod"
1111

‎libs/labelbox/pyproject.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "labelbox"
3-
version = "6.5.0"
3+
version = "6.6.0"
44
description = "Labelbox Python API"
55
authors = [{ name = "Labelbox", email = "engineering@labelbox.com" }]
66
dependencies = [
@@ -12,10 +12,10 @@ dependencies = [
1212
"tqdm>=4.66.2",
1313
"geojson>=3.1.0",
1414
"mypy==1.10.1",
15-
"lbox-clients==1.1.1",
15+
"lbox-clients==1.1.2",
1616
]
1717
readme = "README.md"
18-
requires-python = ">=3.9,<3.13"
18+
requires-python = ">=3.9,<3.14"
1919
classifiers = [
2020
# How mature is this project?
2121
"Development Status :: 5 - Production/Stable",
@@ -33,6 +33,7 @@ classifiers = [
3333
"Programming Language :: Python :: 3.10",
3434
"Programming Language :: Python :: 3.11",
3535
"Programming Language :: Python :: 3.12",
36+
"Programming Language :: Python :: 3.13",
3637
]
3738
keywords = ["ml", "ai", "labelbox", "labeling", "llm", "machinelearning", "edu"]
3839

‎libs/labelbox/src/labelbox/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "labelbox"
22

3-
__version__ = "6.5.0"
3+
__version__ = "6.6.0"
44

55
from labelbox.client import Client
66
from labelbox.schema.annotation_import import (

‎libs/labelbox/src/labelbox/schema/slice.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ def _export(
202202
"modelRunIds": _params.get("model_run_ids", None),
203203
"allProjects": _params.get("all_projects", False),
204204
"allModelRuns": _params.get("all_model_runs", False),
205+
"includePredictions": _params.get("predictions", False),
205206
},
206207
"streamable": streamable,
207208
}

‎libs/lbox-clients/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ENV LANG="C.UTF-8" \
55
LC_ALL="C.UTF-8" \
66
PATH="/home/python/.local/bin:/home/python/.rye/shims:$PATH" \
77
PIP_NO_CACHE_DIR="false" \
8-
RYE_VERSION="0.34.0" \
8+
RYE_VERSION="0.43.0" \
99
RYE_INSTALL_OPTION="--yes" \
1010
LABELBOX_TEST_ENVIRON="prod"
1111

‎libs/lbox-clients/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "lbox-clients"
3-
version = "1.1.1"
3+
version = "1.1.2"
44
description = "This module contains client sdk uses to conntect to the Labelbox API and backends"
55
authors = [
66
{ name = "Labelbox", email = "engineering@labelbox.com" }
@@ -29,6 +29,7 @@ classifiers=[
2929
"Programming Language :: Python :: 3.10",
3030
"Programming Language :: Python :: 3.11",
3131
"Programming Language :: Python :: 3.12",
32+
"Programming Language :: Python :: 3.13",
3233
]
3334
keywords = ["ml", "ai", "labelbox", "labeling", "llm", "machinelearning", "edu"]
3435

‎libs/lbox-example/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ENV LANG="C.UTF-8" \
55
LC_ALL="C.UTF-8" \
66
PATH="/home/python/.local/bin:/home/python/.rye/shims:$PATH" \
77
PIP_NO_CACHE_DIR="false" \
8-
RYE_VERSION="0.34.0" \
8+
RYE_VERSION="0.43.0" \
99
RYE_INSTALL_OPTION="--yes" \
1010
LABELBOX_TEST_ENVIRON="prod"
1111

‎libs/lbox-example/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "lbox-example"
3-
version = "0.1.0"
3+
version = "0.1.1"
44
description = "An example module which can be used to develop other modules under the lbox namespace"
55
authors = [
66
{ name = "Labelbox", email = "engineering@labelbox.com" }

‎requirements-dev.lock

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
# features: []
77
# all-features: true
88
# with-sources: false
9+
# generate-hashes: false
10+
# universal: false
911

1012
-e file:libs/labelbox
1113
-e file:libs/lbox-clients
@@ -57,7 +59,7 @@ defusedxml==0.7.1
5759
docutils==0.20.1
5860
# via sphinx
5961
# via sphinx-rtd-theme
60-
exceptiongroup==1.2.1
62+
exceptiongroup==1.2.2
6163
# via pytest
6264
execnet==2.1.1
6365
# via pytest-xdist
@@ -133,7 +135,7 @@ nbconvert==7.16.4
133135
nbformat==5.10.4
134136
# via nbclient
135137
# via nbconvert
136-
numpy==1.24.4
138+
numpy==2.0.2
137139
# via labelbox
138140
# via opencv-python-headless
139141
# via pandas
@@ -147,7 +149,7 @@ packaging==24.1
147149
# via pytest-cases
148150
# via pytest-rerunfailures
149151
# via sphinx
150-
pandas==2.0.3
152+
pandas==2.2.3
151153
pandocfilters==1.5.1
152154
# via nbconvert
153155
parso==0.8.4
@@ -196,7 +198,7 @@ pygments==2.18.0
196198
# via rich
197199
# via sphinx
198200
pyjwt==2.9.0
199-
pyproj==3.5.0
201+
pyproj==3.6.1
200202
# via labelbox
201203
pytest==8.2.2
202204
# via pytest-cov
@@ -235,7 +237,7 @@ requests==2.32.3
235237
rich==12.6.0
236238
# via databooks
237239
# via typer
238-
rpds-py==0.19.0
240+
rpds-py==0.22.3
239241
# via jsonschema
240242
# via referencing
241243
rsa==4.9

‎requirements.lock

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
# features: []
77
# all-features: true
88
# with-sources: false
9+
# generate-hashes: false
10+
# universal: false
911

1012
-e file:libs/labelbox
1113
-e file:libs/lbox-clients
@@ -43,7 +45,7 @@ idna==3.7
4345
imagesize==1.4.1
4446
# via labelbox
4547
# via sphinx
46-
importlib-metadata==8.0.0
48+
importlib-metadata==8.5.0
4749
# via sphinx
4850
# via typeguard
4951
jinja2==3.1.4
@@ -54,7 +56,7 @@ mypy==1.10.1
5456
# via labelbox
5557
mypy-extensions==1.0.0
5658
# via mypy
57-
numpy==1.24.4
59+
numpy==2.0.2
5860
# via labelbox
5961
# via opencv-python-headless
6062
# via shapely
@@ -83,7 +85,7 @@ pygeotile==1.0.6
8385
# via labelbox
8486
pygments==2.18.0
8587
# via sphinx
86-
pyproj==3.5.0
88+
pyproj==3.6.1
8789
# via labelbox
8890
python-dateutil==2.9.0.post0
8991
# via labelbox
@@ -121,7 +123,7 @@ sphinxcontrib-serializinghtml==1.1.5
121123
# via sphinx
122124
strenum==0.4.15
123125
# via labelbox
124-
tomli==2.0.1
126+
tomli==2.2.1
125127
# via mypy
126128
tqdm==4.66.4
127129
# via labelbox
@@ -135,5 +137,5 @@ typing-extensions==4.12.2
135137
# via typeguard
136138
urllib3==2.2.2
137139
# via requests
138-
zipp==3.19.2
140+
zipp==3.21.0
139141
# via importlib-metadata

0 commit comments

Comments
 (0)