Commit06fca71

authored

Fix file utils and add tests (#68)

* Fix file-utils for gcv* Add file-utils tests* fix ci* fix dep* separately install effdet* Add additional extra_requires

1 parentb4b4fea commit06fca71Copy full SHA for 06fca71

File tree

+38

-11

lines changed

+38

-11

lines changed

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ jobs:`
`21`	`21`	`run:\|`
`22`	`22`	`python -m pip install --upgrade pip`
`23`	`23`	`pip install .`
`24`		`- pip install 'git+https://github.com/facebookresearch/detectron2.git@v0.1.3#egg=detectron2'`
`25`	`24`
`26`	`25`	`-name:Lint with flake8`
`27`	`26`	`run:\|`
`@@ -30,9 +29,16 @@ jobs:`
`30`	`29`	`flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --ignore F821`
`31`	`30`	`# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide`
`32`	`31`	`flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics`
`33`		`-`
	`32`	`+`
	`33`	`+ -name:Test Dependency Support`
	`34`	`+run:\|`
	`35`	`+ # Install additional requirements when running tests`
	`36`	`+ pip install pytest`
	`37`	`+ pytest tests_deps`
	`38`	`+`
`34`	`39`	`-name:Test with pytest`
`35`	`40`	`run:\|`
`36`	`41`	`# Install additional requirements when running tests`
	`42`	`+ pip install .[effdet]`
`37`	`43`	`pip install -r dev-requirements.txt`
`38`		`- pytest`
	`44`	`+ pytest tests`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@`
`24`	`24`	`"pandas",`
`25`	`25`	`"pillow",`
`26`	`26`	`"pyyaml>=5.1",`
`27`		`-"torchvision",`
`28`	`27`	`"iopath",`
`29`	`28`	`],`
`30`	`29`	`extras_require={`
`@@ -34,7 +33,14 @@`
`34`	`33`	`],`
`35`	`34`	`"effdet": [`
`36`	`35`	`"torch",`
	`36`	`+"torchvision",`
`37`	`37`	`"effdet"`
	`38`	`+ ],`
	`39`	`+"detectron2": [`
	`40`	`+"detectron2@git+https://github.com/facebookresearch/detectron2.git@v0.4#egg=detectron2"`
	`41`	`+ ],`
	`42`	`+"paddledetection": [`
	`43`	`+"paddlepaddle==2.1.0"`
`38`	`44`	`]`
`39`	`45`	`},`
`40`	`46`	`include_package_data=True`

Lines changed: 10 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,13 +62,16 @@`
`62`	`62`	`exceptimportlib_metadata.PackageNotFoundError:`
`63`	`63`	`_pytesseract_available=False`
`64`	`64`
`65`		`-_gcv_available=importlib.util.find_spec("google.cloud.vision")isnotNone`
`66`	`65`	`try:`
`67`		`-_gcv_version=importlib_metadata.version(`
`68`		`-"google-cloud-vision"`
`69`		`- )# This is slightly different`
`70`		`-logger.debug(f"Google Cloud Vision Utils version{_gcv_version} available.")`
`71`		`-exceptimportlib_metadata.PackageNotFoundError:`
	`66`	`+_gcv_available=importlib.util.find_spec("google.cloud.vision")isnotNone`
	`67`	`+try:`
	`68`	`+_gcv_version=importlib_metadata.version(`
	`69`	`+"google-cloud-vision"`
	`70`	`+ )# This is slightly different`
	`71`	`+logger.debug(f"Google Cloud Vision Utils version{_gcv_version} available.")`
	`72`	`+exceptimportlib_metadata.PackageNotFoundError:`
	`73`	`+_gcv_available=False`
	`74`	`+exceptModuleNotFoundError:`
`72`	`75`	`_gcv_available=False`
`73`	`76`
`74`	`77`
`@@ -142,7 +145,7 @@ def is_gcv_available():`
`142`	`145`	`("torch", (is_torch_available,PYTORCH_IMPORT_ERROR)),`
`143`	`146`	`("detectron2", (is_detectron2_available,DETECTRON2_IMPORT_ERROR)),`
`144`	`147`	`("paddle", (is_paddle_available,PADDLE_IMPORT_ERROR)),`
`145`		`- ("effdet", (is_effdet_available, )),`
	`148`	`+ ("effdet", (is_effdet_available,EFFDET_IMPORT_ERROR)),`
`146`	`149`	`("pytesseract", (is_pytesseract_available,PYTESSERACT_IMPORT_ERROR)),`
`147`	`150`	`("google-cloud-vision", (is_gcv_available,GCV_IMPORT_ERROR)),`
`148`	`151`	`]`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,12 @@`
	`1`	`+importpytest`
	`2`	`+`
	`3`	`+fromlayoutparserimportrequires_backends`
	`4`	`+`
	`5`	`+deftest_when_backends_are_not_loaded():`
	`6`	`+`
	`7`	`+# When all the backeds are not installed, it should`
	`8`	`+# elicit only ImportErrors`
	`9`	`+`
	`10`	`+forbackend_namein ["torch","detectron2","paddle","effdet","pytesseract","google-cloud-vision"]:`
	`11`	`+withpytest.raises(ImportError):`
	`12`	`+requires_backends("a",backend_name)`

Comments

(0)