From 6a5f9df108405aaf8033303ea9f3f37c8263e61d Mon Sep 17 00:00:00 2001 From: sronilsson Date: Sun, 11 Feb 2024 15:59:24 -0500 Subject: [PATCH] pypi updates --- requirements.txt | 9 ++++++--- setup.py | 2 +- simba/mixins/geometry_mixin.py | 5 ++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 930f8a0e0..c6383d578 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,7 @@ Pillow pyyaml == 5.3.1 -shapely == 1.8 +shapely == 1.8.0; python_version=="3.6" +shapely == 2.0.2; python_version>="3.9" dtreeviz == 0.8.1 eli5 == 0.10.1 graphviz == 0.11 @@ -9,14 +10,16 @@ imgaug == 0.4.0 imutils == 0.5.2 matplotlib >= 3.0.3 numpy -opencv-python == 3.4.16.59 +opencv-python == 3.4.16.59; python_version=="3.6" +opencv-python == 4.8.1.78; python_version>="3.9" pandas==0.25.3;python_version=="3.6" pandas;python_version>="3.9" scikit-image scipy seaborn == 0.9.0 scikit-learn -tabulate == 0.8.3 +tabulate == 0.8.3; python_version=="3.6" +tabulate == 0.9.0; python_version>="3.9" tqdm == 4.30.0 xgboost == 0.90 yellowbrick diff --git a/setup.py b/setup.py index 1b4fdeead..7c2fd46ec 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ setuptools.setup( name="Simba-UW-tf-dev", - version="1.84.4", + version="1.84.6", author="Simon Nilsson, Jia Jie Choong, Sophia Hwang", author_email="sronilsson@gmail.com", description="Toolkit for computer classification of complex social behaviors in experimental animals", diff --git a/simba/mixins/geometry_mixin.py b/simba/mixins/geometry_mixin.py index 23cdda782..f6193c072 100644 --- a/simba/mixins/geometry_mixin.py +++ b/simba/mixins/geometry_mixin.py @@ -15,7 +15,10 @@ from shapely.geometry import (GeometryCollection, LineString, MultiLineString, MultiPoint, MultiPolygon, Point, Polygon) from shapely.ops import linemerge, split, triangulate, unary_union -from typing_extensions import Literal +try: + from typing_extensions import Literal +except: + from typing import Literal from simba.mixins.image_mixin import ImageMixin from simba.utils.checks import (check_float,