Merge branch 'master' into dependabot-pip-requirements-datasets-gte-2…

….0.0-and-lte-2.14.3
Lightning-Universe · Sep 1, 2023 · c9f9b1d · c9f9b1d
2 parents eb5b4df + 1e414c3
commit c9f9b1d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.azure/template-examples.yml b/.azure/template-examples.yml
@@ -57,7 +57,7 @@ jobs:
 
       - script: |
           pip list
-          python -m coverage run --source flash -m pytest tests/examples -vV --durations=30
+          python -m coverage run --source flash -m pytest tests/examples -vV --timeout=300 --durations=30
         displayName: 'Testing'
 
       - bash: |

diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml
@@ -48,7 +48,7 @@ jobs:
           #- { os: 'ubuntu-20.04', python-version: 3.8, topic: 'serve', extra: [], requires: 'oldest' }  # todo
 
     # Timeout: https://stackoverflow.com/a/59076067/4521646
-    timeout-minutes: 50
+    timeout-minutes: 70
     env:
       FREEZE_REQUIREMENTS: 1
       TORCH_URL: https://download.pytorch.org/whl/cpu/torch_stable.html
@@ -152,7 +152,7 @@ jobs:
           tests/examples \
           tests/template \
           tests/${{ matrix.topic }} \
-          -v # --reruns 3 --reruns-delay 2
+          -v --timeout=300 --durations=50 # --reruns 3 --reruns-delay 2
 
     - name: Save HF cache
       if: github.ref == 'refs/heads/master'

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -6,3 +6,4 @@ pytest-doctestplus ==0.13.0
 pytest-rerunfailures ==12.0
 pytest-forked ==1.6.0
 pytest-mock ==3.11.1
+pytest-timeout ==2.1.0
diff --git a/src/flash/core/utilities/imports.py b/src/flash/core/utilities/imports.py
@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import contextlib
 import functools
 import importlib
 import operator
@@ -41,7 +42,8 @@
 _MATPLOTLIB_AVAILABLE = module_available("matplotlib")
 _TRANSFORMERS_AVAILABLE = module_available("transformers")
 _PYSTICHE_AVAILABLE = module_available("pystiche")
-_FIFTYONE_AVAILABLE = module_available("fiftyone")
+with contextlib.suppress(ConnectionError):
+    _FIFTYONE_AVAILABLE = module_available("fiftyone")
 _FASTAPI_AVAILABLE = module_available("fastapi")
 _PYDANTIC_AVAILABLE = module_available("pydantic")
 _GRAPHVIZ_AVAILABLE = module_available("graphviz")