From d38ae34d84f0cea8078a6b096af0392ffb282398 Mon Sep 17 00:00:00 2001 From: Talmo Pereira Date: Fri, 5 Apr 2024 14:59:53 -0700 Subject: [PATCH 1/4] Fix imports in python 3.7 --- sleap_io/io/jabs.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sleap_io/io/jabs.py b/sleap_io/io/jabs.py index 12515ef5..0237a746 100644 --- a/sleap_io/io/jabs.py +++ b/sleap_io/io/jabs.py @@ -1,5 +1,7 @@ """This module handles direct I/O operations for working with JABS files.""" +from __future__ import annotations + import h5py import re import os From f4d2bc1392a3063ec11186c5cb01536a92aa611b Mon Sep 17 00:00:00 2001 From: Talmo Pereira Date: Fri, 5 Apr 2024 15:00:08 -0700 Subject: [PATCH 2/4] Bump version --- sleap_io/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sleap_io/__init__.py b/sleap_io/__init__.py index 147a2dcc..b7f19663 100644 --- a/sleap_io/__init__.py +++ b/sleap_io/__init__.py @@ -2,7 +2,7 @@ # Define package version. # This is read dynamically by setuptools in pyproject.toml to determine the release version. -__version__ = "0.0.13" +__version__ = "0.0.14" from sleap_io.model.skeleton import Node, Edge, Skeleton, Symmetry from sleap_io.model.video import Video From 41ed3fbffcd87ece9b4e5fa8ceb21e649a073af9 Mon Sep 17 00:00:00 2001 From: Talmo Pereira Date: Fri, 5 Apr 2024 16:40:21 -0700 Subject: [PATCH 3/4] Try to fix CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 34486f7b..c61f3ff6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,6 @@ on: - "tests/**" - ".github/workflows/ci.yml" - "environment.yml" - - "setup.cfg" jobs: # Lint with black and docstring check with pydocstyle @@ -99,6 +98,7 @@ jobs: if: ${{ startsWith(matrix.os, 'ubuntu') && matrix.python == 3.9 }} shell: bash -l {0} run: | + apt-get update && apt-get install libglapi-mesa libegl-mesa0 libegl1 libopengl0 libgl1-mesa-glx # https://github.com/conda-forge/opencv-feedstock/issues/401 pytest --cov=sleap_io --cov-report=xml tests/ - name: Upload coverage From fde8ad7367c856a3ae8a415acd5928a9b2fdde6b Mon Sep 17 00:00:00 2001 From: Talmo Pereira Date: Fri, 5 Apr 2024 18:49:48 -0700 Subject: [PATCH 4/4] Try to fix again --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c61f3ff6..f3bc1724 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,6 +88,13 @@ jobs: micromamba list pip freeze + - name: Install graphics dependencies on Ubuntu + # https://github.com/conda-forge/opencv-feedstock/issues/401 + if: ${{ startsWith(matrix.os, 'ubuntu') }} + shell: bash -l {0} + run: | + sudo apt-get update && sudo apt-get install libglapi-mesa libegl-mesa0 libegl1 libopengl0 libgl1-mesa-glx + - name: Test with pytest if: ${{ !(startsWith(matrix.os, 'ubuntu') && matrix.python == 3.9) }} shell: bash -l {0} @@ -98,7 +105,6 @@ jobs: if: ${{ startsWith(matrix.os, 'ubuntu') && matrix.python == 3.9 }} shell: bash -l {0} run: | - apt-get update && apt-get install libglapi-mesa libegl-mesa0 libegl1 libopengl0 libgl1-mesa-glx # https://github.com/conda-forge/opencv-feedstock/issues/401 pytest --cov=sleap_io --cov-report=xml tests/ - name: Upload coverage