Skip to content

[PLT-0] Update depdenencies + add support for rye 0.34 #1625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 4 additions & 9 deletions .github/workflows/python-package-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,16 @@ jobs:
with:
token: ${{ secrets.ACTIONS_ACCESS_TOKEN }}
ref: ${{ github.head_ref }}
- name: Install the latest version of rye
uses: eifinger/setup-rye@v2
- uses: ./.github/actions/python-package-shared-setup
with:
version: '0.32.0'
enable-cache: true
- name: Rye Setup
run: |
rye config --set-bool behavior.use-uv=true
rye-version: ${{ vars.RYE_VERSION }}
python-version: '3.8'
- name: Create build
id: create-build
working-directory: libs/labelbox
run: |
VERSION=$(date +"%Y.%m.%d.%H.%M")
echo "pip install --index-url https://test.pypi.org/simple/ --extra-index-url=https://pypi.org/simple/ labelbox-test@$VERSION" >> "$GITHUB_STEP_SUMMARY"
rye sync
rye version "$VERSION"
rye run toml set --toml-path pyproject.toml project.name labelbox-test
rye build
Expand Down Expand Up @@ -138,4 +133,4 @@ jobs:
linux/arm64

tags: |
${{ env.CONTAINER_IMAGE }}:${{ github.sha }}
${{ env.CONTAINER_IMAGE }}:${{ github.sha }}
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.8.18
3.8.19
6 changes: 3 additions & 3 deletions libs/labelbox/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV LANG="C.UTF-8" \
LC_ALL="C.UTF-8" \
PATH="/home/python/.local/bin:/home/python/.rye/shims:$PATH" \
PIP_NO_CACHE_DIR="false" \
RYE_VERSION="0.32.0" \
RYE_VERSION="0.34.0" \
RYE_INSTALL_OPTION="--yes" \
LABELBOX_TEST_ENVIRON="prod"

Expand All @@ -31,7 +31,7 @@ RUN groupadd --gid 1000 python && \
USER 1000
WORKDIR /home/python/

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

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

CMD cd libs/labelbox && rye run integration && rye sync -f --features labelbox/data && rye run unit && rye run data
CMD cd libs/labelbox && rye run integration && rye sync -f --features labelbox/data && rye run unit && rye run data
100 changes: 57 additions & 43 deletions requirements-dev.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,17 @@
# features: []
# all-features: false
# with-sources: false
# generate-hashes: false

-e file:libs/labelbox
alabaster==0.7.13
# via sphinx
annotated-types==0.6.0
annotated-types==0.7.0
# via pydantic
attrs==23.2.0
# via jsonschema
# via referencing
babel==2.14.0
babel==2.15.0
# via sphinx
beautifulsoup4==4.12.3
# via nbconvert
Expand All @@ -29,7 +30,7 @@ charset-normalizer==3.3.2
# via requests
click==8.1.7
# via typer
coverage==7.4.4
coverage==7.5.1
# via pytest-cov
decopatch==1.4.10
# via pytest-cases
Expand All @@ -38,42 +39,42 @@ defusedxml==0.7.1
docutils==0.20.1
# via sphinx
# via sphinx-rtd-theme
exceptiongroup==1.2.0
exceptiongroup==1.2.1
# via pytest
execnet==2.0.2
execnet==2.1.1
# via pytest-xdist
fastjsonschema==2.19.1
# via nbformat
geojson==3.1.0
# via labelbox
google-api-core==2.17.1
google-api-core==2.19.0
# via labelbox
google-auth==2.28.2
google-auth==2.29.0
# via google-api-core
googleapis-common-protos==1.63.0
# via google-api-core
idna==3.6
idna==3.7
# via requests
imagesize==1.4.1
# via sphinx
importlib-metadata==7.0.2
importlib-metadata==7.1.0
# via jupyter-client
# via nbconvert
# via sphinx
# via yapf
importlib-resources==6.3.1
importlib-resources==6.4.0
# via jsonschema
# via jsonschema-specifications
iniconfig==2.0.0
# via pytest
jinja2==3.1.3
jinja2==3.1.4
# via nbconvert
# via sphinx
jsonschema==4.21.1
jsonschema==4.22.0
# via nbformat
jsonschema-specifications==2023.12.1
# via jsonschema
jupyter-client==8.6.1
jupyter-client==8.6.2
# via nbclient
jupyter-core==5.7.2
# via jupyter-client
Expand All @@ -85,18 +86,22 @@ jupyterlab-pygments==0.3.0
makefun==1.15.2
# via decopatch
# via pytest-cases
markdown-it-py==3.0.0
# via rich
markupsafe==2.1.5
# via jinja2
# via nbconvert
mdurl==0.1.2
# via markdown-it-py
mistune==3.0.2
# via nbconvert
mypy==1.9.0
mypy==1.10.0
mypy-extensions==1.0.0
# via mypy
nbclient==0.10.0
# via nbconvert
nbconvert==7.16.2
nbformat==5.10.3
nbconvert==7.16.4
nbformat==5.10.4
# via nbclient
# via nbconvert
packaging==24.0
Expand All @@ -109,57 +114,65 @@ pandocfilters==1.5.1
# via nbconvert
pkgutil-resolve-name==1.3.10
# via jsonschema
platformdirs==4.2.0
platformdirs==4.2.2
# via jupyter-core
# via yapf
pluggy==1.4.0
pluggy==1.5.0
# via pytest
proto-plus==1.23.0
# via google-api-core
protobuf==4.25.3
# via google-api-core
# via googleapis-common-protos
pyasn1==0.5.1
# via proto-plus
pyasn1==0.6.0
# via pyasn1-modules
# via rsa
pyasn1-modules==0.3.0
pyasn1-modules==0.4.0
# via google-auth
pydantic==2.6.4
pydantic==2.7.1
# via labelbox
pydantic-core==2.16.3
pydantic-core==2.18.2
# via pydantic
pygments==2.17.2
pygments==2.18.0
# via nbconvert
# via rich
# via sphinx
pytest==8.1.1
pytest==8.2.1
# via pytest-cov
# via pytest-rerunfailures
# via pytest-snapshot
# via pytest-xdist
pytest-cases==3.8.4
pytest-cov==4.1.0
pytest-cases==3.8.5
pytest-cov==5.0.0
pytest-rerunfailures==14.0
pytest-snapshot==0.9.0
pytest-xdist==3.5.0
pytest-xdist==3.6.1
python-dateutil==2.8.2
# via jupyter-client
# via labelbox
pytz==2024.1
# via babel
pyzmq==25.1.2
pyzmq==26.0.3
# via jupyter-client
referencing==0.34.0
referencing==0.35.1
# via jsonschema
# via jsonschema-specifications
regex==2023.12.25
regex==2024.5.15
# via toml-cli
requests==2.31.0
requests==2.32.2
# via google-api-core
# via labelbox
# via sphinx
rpds-py==0.18.0
rich==13.7.1
# via typer
rpds-py==0.18.1
# via jsonschema
# via referencing
rsa==4.9
# via google-auth
shellingham==1.5.4
# via typer
six==1.16.0
# via bleach
# via python-dateutil
Expand Down Expand Up @@ -188,37 +201,38 @@ sphinxcontrib-serializinghtml==1.1.5
# via sphinx
strenum==0.4.15
# via labelbox
tinycss2==1.2.1
tinycss2==1.3.0
# via nbconvert
toml-cli==0.6.0
toml-cli==0.6.1
tomli==2.0.1
# via coverage
# via mypy
# via pytest
# via yapf
tomlkit==0.12.4
tomlkit==0.12.5
# via toml-cli
tornado==6.4
# via jupyter-client
tqdm==4.66.2
tqdm==4.66.4
# via labelbox
traitlets==5.14.2
traitlets==5.14.3
# via jupyter-client
# via jupyter-core
# via nbclient
# via nbconvert
# via nbformat
typer==0.9.0
typer==0.12.3
# via toml-cli
types-pillow==10.2.0.20240311
types-pillow==10.2.0.20240520
types-python-dateutil==2.9.0.20240316
types-requests==2.31.0.20240311
types-tqdm==4.66.0.20240106
typing-extensions==4.10.0
types-requests==2.32.0.20240523
types-tqdm==4.66.0.20240417
typing-extensions==4.11.0
# via annotated-types
# via mypy
# via pydantic
# via pydantic-core
# via rich
# via typer
urllib3==2.2.1
# via requests
Expand All @@ -227,6 +241,6 @@ webencodings==0.5.1
# via bleach
# via tinycss2
yapf==0.40.2
zipp==3.18.1
zipp==3.18.2
# via importlib-metadata
# via importlib-resources
34 changes: 19 additions & 15 deletions requirements.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
# features: []
# all-features: false
# with-sources: false
# generate-hashes: false

-e file:libs/labelbox
alabaster==0.7.13
# via sphinx
annotated-types==0.6.0
annotated-types==0.7.0
# via pydantic
babel==2.14.0
babel==2.15.0
# via sphinx
cachetools==5.3.3
# via google-auth
Expand All @@ -25,43 +26,46 @@ docutils==0.20.1
# via sphinx-rtd-theme
geojson==3.1.0
# via labelbox
google-api-core==2.17.1
google-api-core==2.19.0
# via labelbox
google-auth==2.28.2
google-auth==2.29.0
# via google-api-core
googleapis-common-protos==1.63.0
# via google-api-core
idna==3.6
idna==3.7
# via requests
imagesize==1.4.1
# via sphinx
importlib-metadata==7.1.0
# via sphinx
jinja2==3.1.3
jinja2==3.1.4
# via sphinx
markupsafe==2.1.5
# via jinja2
packaging==24.0
# via sphinx
proto-plus==1.23.0
# via google-api-core
protobuf==4.25.3
# via google-api-core
# via googleapis-common-protos
pyasn1==0.5.1
# via proto-plus
pyasn1==0.6.0
# via pyasn1-modules
# via rsa
pyasn1-modules==0.3.0
pyasn1-modules==0.4.0
# via google-auth
pydantic==2.6.4
pydantic==2.7.1
# via labelbox
pydantic-core==2.16.3
pydantic-core==2.18.2
# via pydantic
pygments==2.17.2
pygments==2.18.0
# via sphinx
python-dateutil==2.8.2
# via labelbox
pytz==2024.1
# via babel
requests==2.31.0
requests==2.32.2
# via google-api-core
# via labelbox
# via sphinx
Expand Down Expand Up @@ -92,13 +96,13 @@ sphinxcontrib-serializinghtml==1.1.5
# via sphinx
strenum==0.4.15
# via labelbox
tqdm==4.66.2
tqdm==4.66.4
# via labelbox
typing-extensions==4.10.0
typing-extensions==4.11.0
# via annotated-types
# via pydantic
# via pydantic-core
urllib3==2.2.1
# via requests
zipp==3.18.1
zipp==3.18.2
# via importlib-metadata