From e39a7ca7ac7dad592c73b9d270c464b076a8d8bb Mon Sep 17 00:00:00 2001 From: Gabefire <33893811+Gabefire@users.noreply.github.com> Date: Mon, 17 Jun 2024 08:52:55 -0500 Subject: [PATCH 1/5] specified numpy version --- libs/labelbox/pyproject.toml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libs/labelbox/pyproject.toml b/libs/labelbox/pyproject.toml index f34155151..d846fb3c7 100644 --- a/libs/labelbox/pyproject.toml +++ b/libs/labelbox/pyproject.toml @@ -2,9 +2,7 @@ name = "labelbox" version = "3.72.2" description = "Labelbox Python API" -authors = [ - { name = "Labelbox", email = "engineering@labelbox.com" } -] +authors = [{ name = "Labelbox", email = "engineering@labelbox.com" }] dependencies = [ "google-api-core>=1.22.1", "pydantic>=1.8", @@ -16,7 +14,7 @@ dependencies = [ ] readme = "README.md" requires-python = ">=3.8" -classifiers=[ +classifiers = [ # How mature is this project? "Development Status :: 5 - Production/Stable", # Indicate who your project is intended for @@ -27,7 +25,7 @@ classifiers=[ "Intended Audience :: Education", # Pick your license as you wish "License :: OSI Approved :: Apache Software License", - # Specify the Python versions you support here. + # Specify the Python versions you support here. "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", @@ -47,7 +45,8 @@ Changelog = "https://github.com/Labelbox/labelbox-python/blob/develop/libs/label [project.optional-dependencies] data = [ "shapely>=2.0.3", - "numpy>=1.24.4", + # numpy v2 breaks package since it only supports python >3.9 + "numpy>=1.24.4, <2.0.0", "pillow>=10.2.0", "typeguard>=4.1.5", "imagesize>=1.4.1", @@ -85,12 +84,12 @@ unit = "pytest tests/unit" # LABELBOX_TEST_ENVIRON="ephemeral" \ # SERVICE_API_KEY=${SERVICE_API_KEY} \ # LABELBOX_TEST_BASE_URL="http://host.docker.internal:8080" \ -integration = { cmd = "pytest tests/integration" } +integration = { cmd = "pytest tests/integration" } data = { cmd = "pytest tests/data" } yapf-lint = "yapf tests src -i --verbose --recursive --parallel --style \"google\"" mypy-lint = "mypy src --pretty --show-error-codes --non-interactive --install-types" lint = { chain = ["yapf-lint", "mypy-lint"] } -test = { chain = ["lint", "unit", "integration" ] } +test = { chain = ["lint", "unit", "integration"] } [tool.hatch.metadata] allow-direct-references = true From 81424144b40eeb340cdcabfe9170cae630846b15 Mon Sep 17 00:00:00 2001 From: Gabefire <33893811+Gabefire@users.noreply.github.com> Date: Mon, 17 Jun 2024 14:01:23 -0500 Subject: [PATCH 2/5] pinned pillow --- libs/labelbox/pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/labelbox/pyproject.toml b/libs/labelbox/pyproject.toml index d846fb3c7..825655d01 100644 --- a/libs/labelbox/pyproject.toml +++ b/libs/labelbox/pyproject.toml @@ -47,7 +47,8 @@ data = [ "shapely>=2.0.3", # numpy v2 breaks package since it only supports python >3.9 "numpy>=1.24.4, <2.0.0", - "pillow>=10.2.0", + # pinned pillow to under 10.1.0 for imageio 2.31.6 support + "pillow<=10.1.0", "typeguard>=4.1.5", "imagesize>=1.4.1", "pyproj>=3.5.0", From 7edc8765626c3f0e8473400789972696386c1028 Mon Sep 17 00:00:00 2001 From: Gabe <33893811+Gabefire@users.noreply.github.com> Date: Mon, 17 Jun 2024 14:57:07 -0500 Subject: [PATCH 3/5] Update pyproject.toml --- libs/labelbox/pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/labelbox/pyproject.toml b/libs/labelbox/pyproject.toml index 825655d01..799407322 100644 --- a/libs/labelbox/pyproject.toml +++ b/libs/labelbox/pyproject.toml @@ -47,8 +47,8 @@ data = [ "shapely>=2.0.3", # numpy v2 breaks package since it only supports python >3.9 "numpy>=1.24.4, <2.0.0", - # pinned pillow to under 10.1.0 for imageio 2.31.6 support - "pillow<=10.1.0", + # pinned pillow to 10.1.0 for imageio 2.31.6 support + "pillow==10.1.0", "typeguard>=4.1.5", "imagesize>=1.4.1", "pyproj>=3.5.0", From 3b32fdf108873dbe507f685de0ad369c04d5f9ed Mon Sep 17 00:00:00 2001 From: Gabe <33893811+Gabefire@users.noreply.github.com> Date: Mon, 17 Jun 2024 16:41:15 -0500 Subject: [PATCH 4/5] Revert pillow change --- libs/labelbox/pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/labelbox/pyproject.toml b/libs/labelbox/pyproject.toml index 799407322..d846fb3c7 100644 --- a/libs/labelbox/pyproject.toml +++ b/libs/labelbox/pyproject.toml @@ -47,8 +47,7 @@ data = [ "shapely>=2.0.3", # numpy v2 breaks package since it only supports python >3.9 "numpy>=1.24.4, <2.0.0", - # pinned pillow to 10.1.0 for imageio 2.31.6 support - "pillow==10.1.0", + "pillow>=10.2.0", "typeguard>=4.1.5", "imagesize>=1.4.1", "pyproj>=3.5.0", From 839a35b59e7b41442862abe13b7e4b5a9ceb7f3a Mon Sep 17 00:00:00 2001 From: Adrian Chang Date: Thu, 20 Jun 2024 15:38:47 -0700 Subject: [PATCH 5/5] lock all features --- requirements-dev.lock | 22 +++++++++++++++++++++- requirements.lock | 23 ++++++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/requirements-dev.lock b/requirements-dev.lock index 95aec6d86..288f35a94 100644 --- a/requirements-dev.lock +++ b/requirements-dev.lock @@ -4,7 +4,7 @@ # last locked with the following flags: # pre: false # features: [] -# all-features: false +# all-features: true # with-sources: false # generate-hashes: false @@ -32,6 +32,7 @@ bleach==6.1.0 cachetools==5.3.3 # via google-auth certifi==2024.2.2 + # via pyproj # via requests charset-normalizer==3.3.2 # via requests @@ -75,11 +76,13 @@ googleapis-common-protos==1.63.0 idna==3.7 # via requests imagesize==1.4.1 + # via labelbox # via sphinx importlib-metadata==7.1.0 # via jupyter-client # via nbconvert # via sphinx + # via typeguard # via yapf importlib-resources==6.4.0 # via jsonschema @@ -127,7 +130,12 @@ nbformat==5.10.4 # via nbclient # via nbconvert numpy==1.24.4 + # via labelbox + # via opencv-python-headless # via pandas + # via shapely +opencv-python-headless==4.10.0.84 + # via labelbox packaging==24.0 # via black # via nbconvert @@ -146,6 +154,8 @@ pexpect==4.9.0 # via ipython pickleshare==0.7.5 # via ipython +pillow==10.3.0 + # via labelbox pkgutil-resolve-name==1.3.10 # via jsonschema platformdirs==4.2.2 @@ -176,11 +186,15 @@ pydantic==2.7.2 # via labelbox pydantic-core==2.18.3 # via pydantic +pygeotile==1.0.6 + # via labelbox pygments==2.18.0 # via ipython # via nbconvert # via rich # via sphinx +pyproj==3.5.0 + # via labelbox pytest==8.2.1 # via pytest-cov # via pytest-rerunfailures @@ -217,6 +231,8 @@ rpds-py==0.18.1 # via referencing rsa==4.9 # via google-auth +shapely==2.0.4 + # via labelbox shellingham==1.5.4 # via typer six==1.16.0 @@ -278,6 +294,8 @@ traitlets==5.14.3 # via nbclient # via nbconvert # via nbformat +typeguard==4.3.0 + # via labelbox typer==0.12.3 # via databooks # via toml-cli @@ -290,10 +308,12 @@ typing-extensions==4.12.0 # via black # via databooks # via ipython + # via labelbox # via mypy # via pydantic # via pydantic-core # via rich + # via typeguard # via typer tzdata==2024.1 # via pandas diff --git a/requirements.lock b/requirements.lock index ebed9ee7a..a1b09c201 100644 --- a/requirements.lock +++ b/requirements.lock @@ -4,7 +4,7 @@ # last locked with the following flags: # pre: false # features: [] -# all-features: false +# all-features: true # with-sources: false # generate-hashes: false @@ -18,6 +18,7 @@ babel==2.15.0 cachetools==5.3.3 # via google-auth certifi==2024.2.2 + # via pyproj # via requests charset-normalizer==3.3.2 # via requests @@ -35,15 +36,25 @@ googleapis-common-protos==1.63.0 idna==3.7 # via requests imagesize==1.4.1 + # via labelbox # via sphinx importlib-metadata==7.1.0 # via sphinx + # via typeguard jinja2==3.1.4 # via sphinx markupsafe==2.1.5 # via jinja2 +numpy==1.24.4 + # via labelbox + # via opencv-python-headless + # via shapely +opencv-python-headless==4.10.0.84 + # via labelbox packaging==24.0 # via sphinx +pillow==10.3.0 + # via labelbox proto-plus==1.23.0 # via google-api-core protobuf==4.25.3 @@ -59,8 +70,12 @@ pydantic==2.7.2 # via labelbox pydantic-core==2.18.3 # via pydantic +pygeotile==1.0.6 + # via labelbox pygments==2.18.0 # via sphinx +pyproj==3.5.0 + # via labelbox python-dateutil==2.8.2 # via labelbox pytz==2024.1 @@ -71,6 +86,8 @@ requests==2.32.2 # via sphinx rsa==4.9 # via google-auth +shapely==2.0.4 + # via labelbox six==1.16.0 # via python-dateutil snowballstemmer==2.2.0 @@ -98,10 +115,14 @@ strenum==0.4.15 # via labelbox tqdm==4.66.4 # via labelbox +typeguard==4.3.0 + # via labelbox typing-extensions==4.12.0 # via annotated-types + # via labelbox # via pydantic # via pydantic-core + # via typeguard urllib3==2.2.1 # via requests zipp==3.19.0