From afbe99cdf48d98897c3efce3769bc3736d9e0913 Mon Sep 17 00:00:00 2001 From: Rantaharju Jarno Date: Fri, 4 Oct 2024 13:17:30 +0300 Subject: [PATCH 1/5] add pandas version requirement and test versions 2.1 and 2.2 --- .github/workflows/test.yml | 5 ++++- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c02a41a2..782c8983 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,6 +11,9 @@ jobs: - '3.10' - '3.11' - '3.12' + pandas-version: + - '2.1' + - '2.2' steps: - uses: actions/checkout@v2 - name: setup python @@ -19,7 +22,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: install deps run: | - pip install .[test,sentiment] + pip install .[test,sentiment] pandas=={{ matrix.python-version }} - name: pytest run: | pytest --run_sentiment diff --git a/pyproject.toml b/pyproject.toml index 80873688..756bf97e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ requires-python = ">=3.8" dependencies = [ "python-dateutil", "numpy", - "pandas", + "pandas>=2.1", "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 From 6c1ec80fcf5a93cb104913fa54c6be4c8e7ef131 Mon Sep 17 00:00:00 2001 From: Rantaharju Jarno Date: Fri, 4 Oct 2024 13:19:30 +0300 Subject: [PATCH 2/5] Add missing "$" --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 782c8983..d14501f0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: install deps run: | - pip install .[test,sentiment] pandas=={{ matrix.python-version }} + pip install .[test,sentiment] pandas==${{ matrix.python-version }} - name: pytest run: | pytest --run_sentiment From 76de679f996f06ac786f4f01f13d731efd2a3b0a Mon Sep 17 00:00:00 2001 From: Rantaharju Jarno Date: Fri, 4 Oct 2024 13:20:24 +0300 Subject: [PATCH 3/5] And use the pandas-version variable --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d14501f0..a099b00e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: install deps run: | - pip install .[test,sentiment] pandas==${{ matrix.python-version }} + pip install .[test,sentiment] pandas==${{ matrix.pandas-version }} - name: pytest run: | pytest --run_sentiment From 0fa46312ce807da2b7c95430882a343a5ef046a1 Mon Sep 17 00:00:00 2001 From: Rantaharju Jarno Date: Fri, 4 Oct 2024 13:26:51 +0300 Subject: [PATCH 4/5] Only pandas 2.2 is supported --- .github/workflows/test.yml | 1 - pyproject.toml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a099b00e..0a98e402 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,6 @@ jobs: - '3.11' - '3.12' pandas-version: - - '2.1' - '2.2' steps: - uses: actions/checkout@v2 diff --git a/pyproject.toml b/pyproject.toml index 756bf97e..26544ae3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ requires-python = ">=3.8" dependencies = [ "python-dateutil", "numpy", - "pandas>=2.1", + "pandas>=2.2", "matplotlib", "seaborn", "plotly", From cf514b6b13b4b3dbea2895b499c6c8c740bd0ab0 Mon Sep 17 00:00:00 2001 From: Rantaharju Jarno Date: Fri, 4 Oct 2024 13:43:10 +0300 Subject: [PATCH 5/5] Update version --- niimpy/_version.py | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/niimpy/_version.py b/niimpy/_version.py index 58d478ab..3f262a63 100644 --- 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 index 26544ae3..f26accc3 100644 --- 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 = [