Merge branch 'development' into no_config

digitraceslab · Oct 29, 2024 · a5120f3 · a5120f3
2 parents 7203d22 + 75d4bc4
commit a5120f3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,6 +11,8 @@ jobs:
           - '3.10'
           - '3.11'
           - '3.12'
+        pandas-version:
+          - '2.2'
     steps:
       - uses: actions/checkout@v2
       - name: setup python
@@ -19,7 +21,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: install deps
         run: |
-          pip install .[test,sentiment]
+          pip install .[test,sentiment] pandas==${{ matrix.pandas-version }}
       - name: pytest
         run: |
           pytest --run_sentiment
diff --git a/niimpy/_version.py b/niimpy/_version.py
@@ -1 +1 @@
-__version__ = '1.2.0'
+__version__ = '1.2.1'
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,7 +7,7 @@ name = "niimpy"
 
 [project]
 name = "niimpy"
-version = "1.2.0"
+version = "1.2.1"
 readme = "README.md"
 description = "Python module for analysis of behavioral data"
 authors = [
@@ -18,7 +18,7 @@ requires-python = ">=3.8"
 dependencies = [
     "python-dateutil",
     "numpy",
-    "pandas",
+    "pandas>=2.2",
     "matplotlib",
     "seaborn",
     "plotly",
@@ -56,7 +56,7 @@ Repository = "https://github.com/digitraceslab/niimpy"
 
 
 [bumpver]
-current_version = "1.2.0"
+current_version = "1.2.1"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true