Skip to content

Commit

Permalink
requirement pins
Browse files Browse the repository at this point in the history
  • Loading branch information
sronilsson committed May 18, 2024
1 parent 51389ed commit b2247f2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
7 changes: 6 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
pip==21.2.2;python_version=="3.6"
pip==24.0;python_version>="3.9"
setuptools==58.0.4;python_version=="3.6"
setuptools==69.5.1;python_version>="3.9"
Pillow
pyyaml == 5.3.1
shapely == 1.8.0; python_version=="3.6"
Expand All @@ -8,7 +12,7 @@ graphviz == 0.11
imblearn == 0.0
imgaug == 0.4.0
imutils == 0.5.2
matplotlib >= 3.0.3
matplotlib == 3.3.4
numpy
opencv-python == 3.4.5.20; python_version=="3.6"
opencv-python == 4.8.1.78; python_version>="3.9"
Expand Down Expand Up @@ -50,3 +54,4 @@ xlrd==1.2.0
trafaret==2.1.1
geos
ffmpeg-python

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

setuptools.setup(
name="Simba-UW-tf-dev",
version="1.92.3",
version="1.92.4",
author="Simon Nilsson, Jia Jie Choong, Sophia Hwang",
author_email="[email protected]",
description="Toolkit for computer classification of behaviors in experimental animals",
Expand Down
8 changes: 2 additions & 6 deletions simba/SimBA.py
Original file line number Diff line number Diff line change
Expand Up @@ -1939,14 +1939,10 @@ def __init__(self):
sys.stdout = StdRedirector(self.txt)

if OS.PYTHON_VER.value != "3.6":
PythonVersionWarning(
msg=f"SimBA is not extensively tested beyond python 3.6. You are using python {OS.PYTHON_VER.value}. If you encounter errors in python>3.6, please report them on GitHub or Gitter and we will fix! (links in the help toolbar)",
source=self.__class__.__name__,
)
PythonVersionWarning(msg=f"SimBA is not extensively tested beyond python 3.6. You are using python {OS.PYTHON_VER.value}. If you encounter errors in python>3.6, please report them on GitHub or Gitter (links in the help toolbar) and we will work together to fix the issues!", source=self.__class__.__name__)

if not check_ffmpeg_available():
FFMpegNotFoundWarning(
msg='SimBA could not find a FFMPEG installation on computer (as evaluated by "ffmpeg" returning None). SimBA works best with FFMPEG and it is recommended to install it on your computer',
FFMpegNotFoundWarning(msg='SimBA could not find a FFMPEG installation on computer (as evaluated by "ffmpeg" returning None). SimBA works best with FFMPEG and it is recommended to install it on your computer',
source=self.__class__.__name__,
)

Expand Down

0 comments on commit b2247f2

Please sign in to comment.