Skip to content

Commit

Permalink
Fix pip dependency solver conflicts, remove numpy np.int deprecation …
Browse files Browse the repository at this point in the history
…warning
  • Loading branch information
cbrxyz committed Aug 23, 2024
1 parent c2b5d22 commit 3ba58fd
Showing 2 changed files with 16 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ def __init__(
self.size = np.array(size, dtype=np.uint)
self.shape = np.array(shape, dtype=np.uint)
self.keep_ratio = keep_ratio
self.pane_size = np.array(self.size / self.shape, dtype=np.int)
self.pane_size = np.array(self.size / self.shape, dtype=int)
self.border_color = border_color
self.border_thickness = border_thickness
self.text_color = text_color
29 changes: 15 additions & 14 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -3,12 +3,12 @@ matplotlib==3.1.2
tqdm==4.66.3

# Algorithms
tsp-solver2==0.4.1
uvloop==0.16.0
tsp-solver2>=0.4.1
uvloop>=0.16.0

# Data Science
pandas==1.4.1
numpy==1.24.4
pandas>=1.4.1
numpy>=1.22,<=1.24.3

# Machine Learning
scipy==1.10.0
@@ -22,8 +22,8 @@ PyYAML==6.0
urdf-parser-py==0.0.4

# Internet
aiohttp==3.9.4
aiohttp-xmlrpc==1.5.0
aiohttp>=3.9.4
aiohttp-xmlrpc>=1.5.0

# Documentation
sphinx==5.0.1
@@ -33,28 +33,29 @@ sphinx-copybutton==0.5.0

# Terminal
PyInquirer==1.0.3
rich==13.7.1
rich>=13.7.1
pygments==2.17.2

# External Devices
pyserial==3.5
pyserial>=3.5

# Drivers
psutil==5.6.6

# Linting
black==24.3.0
modernize==0.8.0 # This can be removed after Noetic Migration is complete.
black>=24.3.0
modernize>=0.8.0 # This can be removed after Noetic Migration is complete.

# Testing
pre-commit==2.20.0
pylint==2.15.5
pre-commit>=2.20.0
pylint>=2.15.5

# YOLOv7
torch>=1.10.0
torchvision>=0.13.1
opencv-python==4.6.0.66
# tensorflow==2.13.1 is the last version with Python 3.8 support
tensorflow==2.13.1
opencv-python>=4.6.0.66
seaborn==0.11.2
thop==0.1.1.post2207130030
requests==2.32.2
tensorflow==2.13.1

0 comments on commit 3ba58fd

Please sign in to comment.