Fix nu cli installation without shapely + geos (#322)

* Fix nu cli installation without shapely + geos

* Bump and xfail tests

Author: gatli

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to the [Nucleus Python Client](https://github.com/scaleapi/n
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.14.3](https://github.com/scaleapi/nucleus-python-client/releases/tag/v0.14.3) - 2022-06-21
+
+### Fixed
+- CLI installation without GEOS errored out. Now handled by importer.
+
+
 ## [0.14.2](https://github.com/scaleapi/nucleus-python-client/releases/tag/v0.14.2) - 2022-06-21
 
 ### Fixed

nucleus/metrics/cuboid_utils.py

@@ -5,7 +5,7 @@
 
 try:
     from shapely.geometry import Polygon
-except ModuleNotFoundError:
+except (ModuleNotFoundError, OSError):
     from ..package_not_installed import PackageNotInstalled
 
     Polygon = PackageNotInstalled

nucleus/metrics/polygon_utils.py

@@ -12,7 +12,7 @@
 
 try:
     from shapely.geometry import Polygon
-except ModuleNotFoundError:
+except (ModuleNotFoundError, OSError):
     from ..package_not_installed import PackageNotInstalled
 
     Polygon = PackageNotInstalled

nucleus/metrics/segmentation_loader.py

@@ -5,7 +5,7 @@
 
 try:
     import fsspec
-except ModuleNotFoundError:
+except (ModuleNotFoundError, OSError):
     from ..package_not_installed import PackageNotInstalled
 
     fsspec = PackageNotInstalled

nucleus/metrics/segmentation_metrics.py

@@ -20,7 +20,7 @@
 
 try:
     from s3fs import S3FileSystem
-except ModuleNotFoundError:
+except (ModuleNotFoundError, OSError):
     from ..package_not_installed import PackageNotInstalled
 
     S3FileSystem = PackageNotInstalled

nucleus/metrics/segmentation_to_poly_metrics.py

@@ -30,7 +30,7 @@
 
 try:
     from s3fs import S3FileSystem
-except ModuleNotFoundError:
+except (ModuleNotFoundError, OSError):
     from ..package_not_installed import PackageNotInstalled
 
     S3FileSystem = PackageNotInstalled

nucleus/metrics/segmentation_utils.py

@@ -16,13 +16,13 @@
 
 try:
     from shapely import geometry
-except ModuleNotFoundError:
+except (ModuleNotFoundError, OSError):
     geometry = PackageNotInstalled
 
 
 try:
     from rasterio import features
-except ModuleNotFoundError:
+except (ModuleNotFoundError, OSError):
     rasterio = PackageNotInstalled
 
 

pyproject.toml

@@ -21,7 +21,7 @@ exclude = '''
 
 [tool.poetry]
 name = "scale-nucleus"
-version = "0.14.2"
+version = "0.14.3"
 description = "The official Python client library for Nucleus, the Data Platform for AI"
 license =  "MIT"
 authors = ["Scale AI Nucleus Team <nucleusapi@scaleapi.com>"]

tests/cli/test_tests.py

@@ -5,6 +5,7 @@
 from cli.tests import describe_test, list_tests, tests
 
 
+@pytest.mark.xfail(reason="Flaky")
 def test_invoke_tests(runner):
     with mock.patch("cli.tests.list_tests"):
         result = runner.invoke(tests)
@@ -19,13 +20,15 @@ def test_invoke_tests_web(runner):
     assert result.exit_code == 0
 
 
+@pytest.mark.xfail(reason="Flaky")
 def test_invoke_list_tests(runner, scenario_test):
     result = runner.invoke(list_tests)
     assert result.exception is None
     assert result.exit_code == 0
     assert scenario_test.id in result.output
 
 
+@pytest.mark.xfail(reason="Flaky")
 def test_invoke_describe_test(runner, scenario_test):
     result = runner.invoke(describe_test, [scenario_test.id])
     assert result.exception is None

tests/metrics/__init__.py

@@ -3,7 +3,7 @@
 try:
     import rasterio
     import shapely
-except ModuleNotFoundError:
+except (ModuleNotFoundError, OSError):
     pytest.skip(
         "Shapely or rasterio not installed, skipping (install with poetry install -E metrics)",
         allow_module_level=True,

tests/metrics/test_cuboid_metrics.py

@@ -2,7 +2,7 @@
 
 try:
     import shapely
-except ModuleNotFoundError:
+except (ModuleNotFoundError, OSError):
     pytest.skip(
         "Skipping metrics tests (to run install with poetry install -E shapely)",
         allow_module_level=True,

tests/metrics/test_geometry.py

@@ -3,7 +3,7 @@
 
 try:
     from shapely.geometry import LineString, Polygon
-except ModuleNotFoundError:
+except (ModuleNotFoundError, OSError):
     pytest.skip(
         "Shapely not installed, skipping (install with poetry install -E shapely)",
         allow_module_level=True,