looks like we're moving to latest pandas afterall

kushalkolar · May 25, 2021 · 3c0b521 · 3c0b521
1 parent 5511275
commit 3c0b521
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,7 @@
 ### Fixed
 - fix #55, don't move logfiles to zipfile in windows
 - bugfix 88edbd342ce8e2698ca0087553082e568e7132c2 so custom modules are imported properly
-- `pynwb` v1.5.1 wants newer `pandas`, stay on pandas 0.25.3 for now
+- use latest `pandas` required by latest `pynwb` and latest `hdmf` due to `numpy` 1.20,
 
 # 0.6.1
 ### Fixed

diff --git a/requirements.txt b/requirements.txt
@@ -9,7 +9,7 @@ MarkupSafe>=1.1.1
 matplotlib<=3.2.1
 opencv-contrib-python>=4.2
 opencv-python>=4.2
-pandas~=0.25.3
+pandas
 Pillow>=5.4.1
 psutil
 PyQt5>=5.9.2,<=5.12
@@ -32,7 +32,7 @@ numba>=0.50.0
 bottleneck==1.2.1
 holoviews
 jupyter
-pynwb<=1.5.0
+pynwb
 pyqtgraph
 tk
 tcl

diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@
         "matplotlib<=3.2.1",
         "opencv-contrib-python>=4.2",
         "opencv-python>=4.2",
-        "pandas~=0.25.3",  # do not change
+        "pandas",  # do not change
         "Pillow>=5.4.1",
         "psutil",
         "PyQt5>=5.9.2,<=5.12",
@@ -40,7 +40,7 @@
         #"bottleneck==1.2.1",  # do not change
         "holoviews",
         "jupyter",
-        "pynwb<=1.5.0",  # caiman requirement
+        "pynwb",  # caiman requirement
         "pyqtgraph",
         #"tensorflow~=1.15.0",  # do not change, caiman requirement
         "tk",  # do not change