From 40c2bd790b24c1d25ae0e32e86e996e5d91a2cc0 Mon Sep 17 00:00:00 2001 From: Michal Noszczak Date: Thu, 22 Jun 2023 15:23:50 +0000 Subject: [PATCH 1/3] Fix numpy version --- requirements.txt | 1 - setup.py | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4f1055233..e17f9a079 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,6 @@ google-api-core>=1.22.1 imagesize nbconvert~=7.2.6 nbformat~=5.7.0 -numpy~=1.21.6 opencv-python PILLOW pydantic>=1.8,<2.0 diff --git a/setup.py b/setup.py index e459b0f5e..cf9e79822 100644 --- a/setup.py +++ b/setup.py @@ -29,6 +29,8 @@ "typeguard", "imagesize", "pyproj", "pygeotile", "typing-extensions", "packaging" ], + ':python_version<"3.8"': ['numpy<=1.21.6'], + ':python_version>="3.8"': ['numpy>=1.23.0'], }, classifiers=[ 'License :: OSI Approved :: Apache Software License', From d22cca766ee4d4eccac870f82bdfe2b3edf284bd Mon Sep 17 00:00:00 2001 From: Michal Noszczak Date: Mon, 26 Jun 2023 12:48:39 +0000 Subject: [PATCH 2/3] numpy extras_require -> install_requires --- setup.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index cf9e79822..8067720e4 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,9 @@ packages=setuptools.find_packages(), install_requires=[ "backoff==1.10.0", "requests>=2.22.0", "google-api-core>=1.22.1", - "pydantic>=1.8,<2.0", "tqdm", "python-dateutil>=2.8.2,<2.9.0" + "pydantic>=1.8,<2.0", "tqdm", "python-dateutil>=2.8.2,<2.9.0", + 'numpy==1.21.6; python_version<"3.8"', + 'numpy~=1.23.5; python_version>="3.8"', ], extras_require={ 'data': [ @@ -29,8 +31,7 @@ "typeguard", "imagesize", "pyproj", "pygeotile", "typing-extensions", "packaging" ], - ':python_version<"3.8"': ['numpy<=1.21.6'], - ':python_version>="3.8"': ['numpy>=1.23.0'], + }, classifiers=[ 'License :: OSI Approved :: Apache Software License', From 4bbbf7636a8870063223995e4a3b9ed44d4d34cd Mon Sep 17 00:00:00 2001 From: Michal Noszczak Date: Mon, 26 Jun 2023 13:13:03 +0000 Subject: [PATCH 3/3] Linting --- setup.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 8067720e4..4b1d309ee 100644 --- a/setup.py +++ b/setup.py @@ -20,8 +20,12 @@ url="https://labelbox.com", packages=setuptools.find_packages(), install_requires=[ - "backoff==1.10.0", "requests>=2.22.0", "google-api-core>=1.22.1", - "pydantic>=1.8,<2.0", "tqdm", "python-dateutil>=2.8.2,<2.9.0", + "backoff==1.10.0", + "requests>=2.22.0", + "google-api-core>=1.22.1", + "pydantic>=1.8,<2.0", + "tqdm", + "python-dateutil>=2.8.2,<2.9.0", 'numpy==1.21.6; python_version<"3.8"', 'numpy~=1.23.5; python_version>="3.8"', ], @@ -31,7 +35,6 @@ "typeguard", "imagesize", "pyproj", "pygeotile", "typing-extensions", "packaging" ], - }, classifiers=[ 'License :: OSI Approved :: Apache Software License',