Skip to content

Commit 1862a6a

Browse files
adrian-changadrian-chang
authored
[PLT-0] Update depdenencies + add support for rye 0.34 (#1625)
1 parent a0dec02 commit 1862a6a

File tree

5 files changed

+84
-71
lines changed

5 files changed

+84
-71
lines changed

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,16 @@ jobs:
5656
with:
5757
token: ${{ secrets.ACTIONS_ACCESS_TOKEN }}
5858
ref: ${{ github.head_ref }}
59-
- name: Install the latest version of rye
60-
uses: eifinger/setup-rye@v2
59+
- uses: ./.github/actions/python-package-shared-setup
6160
with:
62-
version: '0.32.0'
63-
enable-cache: true
64-
- name: Rye Setup
65-
run: |
66-
rye config --set-bool behavior.use-uv=true
61+
rye-version: ${{ vars.RYE_VERSION }}
62+
python-version: '3.8'
6763
- name: Create build
6864
id: create-build
6965
working-directory: libs/labelbox
7066
run: |
7167
VERSION=$(date +"%Y.%m.%d.%H.%M")
7268
echo "pip install --index-url https://test.pypi.org/simple/ --extra-index-url=https://pypi.org/simple/ labelbox-test@$VERSION" >> "$GITHUB_STEP_SUMMARY"
73-
rye sync
7469
rye version "$VERSION"
7570
rye run toml set --toml-path pyproject.toml project.name labelbox-test
7671
rye build
@@ -138,4 +133,4 @@ jobs:
138133
linux/arm64
139134
140135
tags: |
141-
${{ env.CONTAINER_IMAGE }}:${{ github.sha }}
136+
${{ env.CONTAINER_IMAGE }}:${{ github.sha }}

‎.python-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.8.18
1+
3.8.19

‎libs/labelbox/Dockerfile‎

Lines changed: 3 additions & 3 deletions
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.32.0" \
8+
RYE_VERSION="0.34.0" \
99
RYE_INSTALL_OPTION="--yes" \
1010
LABELBOX_TEST_ENVIRON="prod"
1111

@@ -31,7 +31,7 @@ RUN groupadd --gid 1000 python && \
3131
USER 1000
3232
WORKDIR /home/python/
3333

34-
RUN curl -sSf https://rye-up.com/get | bash -
34+
RUN curl -sSf https://rye.astral.sh/get | bash -
3535

3636
COPY --chown=python:python . /home/python/labelbox-python/
3737
WORKDIR /home/python/labelbox-python
@@ -41,4 +41,4 @@ RUN rye config --set-bool behavior.global-python=true && \
4141
rye pin 3.8 && \
4242
rye sync
4343

44-
CMD cd libs/labelbox && rye run integration && rye sync -f --features labelbox/data && rye run unit && rye run data
44+
CMD cd libs/labelbox && rye run integration && rye sync -f --features labelbox/data && rye run unit && rye run data

‎requirements-dev.lock‎

Lines changed: 57 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@
66
# features: []
77
# all-features: false
88
# with-sources: false
9+
# generate-hashes: false
910

1011
-e file:libs/labelbox
1112
alabaster==0.7.13
1213
# via sphinx
13-
annotated-types==0.6.0
14+
annotated-types==0.7.0
1415
# via pydantic
1516
attrs==23.2.0
1617
# via jsonschema
1718
# via referencing
18-
babel==2.14.0
19+
babel==2.15.0
1920
# via sphinx
2021
beautifulsoup4==4.12.3
2122
# via nbconvert
@@ -29,7 +30,7 @@ charset-normalizer==3.3.2
2930
# via requests
3031
click==8.1.7
3132
# via typer
32-
coverage==7.4.4
33+
coverage==7.5.1
3334
# via pytest-cov
3435
decopatch==1.4.10
3536
# via pytest-cases
@@ -38,42 +39,42 @@ defusedxml==0.7.1
3839
docutils==0.20.1
3940
# via sphinx
4041
# via sphinx-rtd-theme
41-
exceptiongroup==1.2.0
42+
exceptiongroup==1.2.1
4243
# via pytest
43-
execnet==2.0.2
44+
execnet==2.1.1
4445
# via pytest-xdist
4546
fastjsonschema==2.19.1
4647
# via nbformat
4748
geojson==3.1.0
4849
# via labelbox
49-
google-api-core==2.17.1
50+
google-api-core==2.19.0
5051
# via labelbox
51-
google-auth==2.28.2
52+
google-auth==2.29.0
5253
# via google-api-core
5354
googleapis-common-protos==1.63.0
5455
# via google-api-core
55-
idna==3.6
56+
idna==3.7
5657
# via requests
5758
imagesize==1.4.1
5859
# via sphinx
59-
importlib-metadata==7.0.2
60+
importlib-metadata==7.1.0
6061
# via jupyter-client
6162
# via nbconvert
6263
# via sphinx
6364
# via yapf
64-
importlib-resources==6.3.1
65+
importlib-resources==6.4.0
6566
# via jsonschema
6667
# via jsonschema-specifications
6768
iniconfig==2.0.0
6869
# via pytest
69-
jinja2==3.1.3
70+
jinja2==3.1.4
7071
# via nbconvert
7172
# via sphinx
72-
jsonschema==4.21.1
73+
jsonschema==4.22.0
7374
# via nbformat
7475
jsonschema-specifications==2023.12.1
7576
# via jsonschema
76-
jupyter-client==8.6.1
77+
jupyter-client==8.6.2
7778
# via nbclient
7879
jupyter-core==5.7.2
7980
# via jupyter-client
@@ -85,18 +86,22 @@ jupyterlab-pygments==0.3.0
8586
makefun==1.15.2
8687
# via decopatch
8788
# via pytest-cases
89+
markdown-it-py==3.0.0
90+
# via rich
8891
markupsafe==2.1.5
8992
# via jinja2
9093
# via nbconvert
94+
mdurl==0.1.2
95+
# via markdown-it-py
9196
mistune==3.0.2
9297
# via nbconvert
93-
mypy==1.9.0
98+
mypy==1.10.0
9499
mypy-extensions==1.0.0
95100
# via mypy
96101
nbclient==0.10.0
97102
# via nbconvert
98-
nbconvert==7.16.2
99-
nbformat==5.10.3
103+
nbconvert==7.16.4
104+
nbformat==5.10.4
100105
# via nbclient
101106
# via nbconvert
102107
packaging==24.0
@@ -109,57 +114,65 @@ pandocfilters==1.5.1
109114
# via nbconvert
110115
pkgutil-resolve-name==1.3.10
111116
# via jsonschema
112-
platformdirs==4.2.0
117+
platformdirs==4.2.2
113118
# via jupyter-core
114119
# via yapf
115-
pluggy==1.4.0
120+
pluggy==1.5.0
116121
# via pytest
122+
proto-plus==1.23.0
123+
# via google-api-core
117124
protobuf==4.25.3
118125
# via google-api-core
119126
# via googleapis-common-protos
120-
pyasn1==0.5.1
127+
# via proto-plus
128+
pyasn1==0.6.0
121129
# via pyasn1-modules
122130
# via rsa
123-
pyasn1-modules==0.3.0
131+
pyasn1-modules==0.4.0
124132
# via google-auth
125-
pydantic==2.6.4
133+
pydantic==2.7.1
126134
# via labelbox
127-
pydantic-core==2.16.3
135+
pydantic-core==2.18.2
128136
# via pydantic
129-
pygments==2.17.2
137+
pygments==2.18.0
130138
# via nbconvert
139+
# via rich
131140
# via sphinx
132-
pytest==8.1.1
141+
pytest==8.2.1
133142
# via pytest-cov
134143
# via pytest-rerunfailures
135144
# via pytest-snapshot
136145
# via pytest-xdist
137-
pytest-cases==3.8.4
138-
pytest-cov==4.1.0
146+
pytest-cases==3.8.5
147+
pytest-cov==5.0.0
139148
pytest-rerunfailures==14.0
140149
pytest-snapshot==0.9.0
141-
pytest-xdist==3.5.0
150+
pytest-xdist==3.6.1
142151
python-dateutil==2.8.2
143152
# via jupyter-client
144153
# via labelbox
145154
pytz==2024.1
146155
# via babel
147-
pyzmq==25.1.2
156+
pyzmq==26.0.3
148157
# via jupyter-client
149-
referencing==0.34.0
158+
referencing==0.35.1
150159
# via jsonschema
151160
# via jsonschema-specifications
152-
regex==2023.12.25
161+
regex==2024.5.15
153162
# via toml-cli
154-
requests==2.31.0
163+
requests==2.32.2
155164
# via google-api-core
156165
# via labelbox
157166
# via sphinx
158-
rpds-py==0.18.0
167+
rich==13.7.1
168+
# via typer
169+
rpds-py==0.18.1
159170
# via jsonschema
160171
# via referencing
161172
rsa==4.9
162173
# via google-auth
174+
shellingham==1.5.4
175+
# via typer
163176
six==1.16.0
164177
# via bleach
165178
# via python-dateutil
@@ -188,37 +201,38 @@ sphinxcontrib-serializinghtml==1.1.5
188201
# via sphinx
189202
strenum==0.4.15
190203
# via labelbox
191-
tinycss2==1.2.1
204+
tinycss2==1.3.0
192205
# via nbconvert
193-
toml-cli==0.6.0
206+
toml-cli==0.6.1
194207
tomli==2.0.1
195208
# via coverage
196209
# via mypy
197210
# via pytest
198211
# via yapf
199-
tomlkit==0.12.4
212+
tomlkit==0.12.5
200213
# via toml-cli
201214
tornado==6.4
202215
# via jupyter-client
203-
tqdm==4.66.2
216+
tqdm==4.66.4
204217
# via labelbox
205-
traitlets==5.14.2
218+
traitlets==5.14.3
206219
# via jupyter-client
207220
# via jupyter-core
208221
# via nbclient
209222
# via nbconvert
210223
# via nbformat
211-
typer==0.9.0
224+
typer==0.12.3
212225
# via toml-cli
213-
types-pillow==10.2.0.20240311
226+
types-pillow==10.2.0.20240520
214227
types-python-dateutil==2.9.0.20240316
215-
types-requests==2.31.0.20240311
216-
types-tqdm==4.66.0.20240106
217-
typing-extensions==4.10.0
228+
types-requests==2.32.0.20240523
229+
types-tqdm==4.66.0.20240417
230+
typing-extensions==4.11.0
218231
# via annotated-types
219232
# via mypy
220233
# via pydantic
221234
# via pydantic-core
235+
# via rich
222236
# via typer
223237
urllib3==2.2.1
224238
# via requests
@@ -227,6 +241,6 @@ webencodings==0.5.1
227241
# via bleach
228242
# via tinycss2
229243
yapf==0.40.2
230-
zipp==3.18.1
244+
zipp==3.18.2
231245
# via importlib-metadata
232246
# via importlib-resources

‎requirements.lock‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
# features: []
77
# all-features: false
88
# with-sources: false
9+
# generate-hashes: false
910

1011
-e file:libs/labelbox
1112
alabaster==0.7.13
1213
# via sphinx
13-
annotated-types==0.6.0
14+
annotated-types==0.7.0
1415
# via pydantic
15-
babel==2.14.0
16+
babel==2.15.0
1617
# via sphinx
1718
cachetools==5.3.3
1819
# via google-auth
@@ -25,43 +26,46 @@ docutils==0.20.1
2526
# via sphinx-rtd-theme
2627
geojson==3.1.0
2728
# via labelbox
28-
google-api-core==2.17.1
29+
google-api-core==2.19.0
2930
# via labelbox
30-
google-auth==2.28.2
31+
google-auth==2.29.0
3132
# via google-api-core
3233
googleapis-common-protos==1.63.0
3334
# via google-api-core
34-
idna==3.6
35+
idna==3.7
3536
# via requests
3637
imagesize==1.4.1
3738
# via sphinx
3839
importlib-metadata==7.1.0
3940
# via sphinx
40-
jinja2==3.1.3
41+
jinja2==3.1.4
4142
# via sphinx
4243
markupsafe==2.1.5
4344
# via jinja2
4445
packaging==24.0
4546
# via sphinx
47+
proto-plus==1.23.0
48+
# via google-api-core
4649
protobuf==4.25.3
4750
# via google-api-core
4851
# via googleapis-common-protos
49-
pyasn1==0.5.1
52+
# via proto-plus
53+
pyasn1==0.6.0
5054
# via pyasn1-modules
5155
# via rsa
52-
pyasn1-modules==0.3.0
56+
pyasn1-modules==0.4.0
5357
# via google-auth
54-
pydantic==2.6.4
58+
pydantic==2.7.1
5559
# via labelbox
56-
pydantic-core==2.16.3
60+
pydantic-core==2.18.2
5761
# via pydantic
58-
pygments==2.17.2
62+
pygments==2.18.0
5963
# via sphinx
6064
python-dateutil==2.8.2
6165
# via labelbox
6266
pytz==2024.1
6367
# via babel
64-
requests==2.31.0
68+
requests==2.32.2
6569
# via google-api-core
6670
# via labelbox
6771
# via sphinx
@@ -92,13 +96,13 @@ sphinxcontrib-serializinghtml==1.1.5
9296
# via sphinx
9397
strenum==0.4.15
9498
# via labelbox
95-
tqdm==4.66.2
99+
tqdm==4.66.4
96100
# via labelbox
97-
typing-extensions==4.10.0
101+
typing-extensions==4.11.0
98102
# via annotated-types
99103
# via pydantic
100104
# via pydantic-core
101105
urllib3==2.2.1
102106
# via requests
103-
zipp==3.18.1
107+
zipp==3.18.2
104108
# via importlib-metadata

0 commit comments

Comments
 (0)