Support for py312

staircase-dev · Jun 25, 2024 · 0c8e3fd · 0c8e3fd
1 parent 3578be8
commit 0c8e3fd
Show file tree

Hide file tree

Showing 7 changed files with 1,894 additions and 1,431 deletions.
diff --git a/docs/release_notes/index.rst b/docs/release_notes/index.rst
@@ -4,6 +4,9 @@
 Release notes
 ========================
 
+- support for Python 3.12 added
+- support for Python 3.7 removed
+
 ADD UNRELEASED CHANGES ABOVE THIS LINE
 
 **v1.0.0 2023-07-05**

diff --git a/piso/ndframe.py b/piso/ndframe.py
@@ -57,7 +57,7 @@ def _get_indexers(*dfs):
 
 
 def _handle_overlapping_columns(frames, suffixes):
-    col_counts = pd.Series.value_counts(list(itertools.chain.from_iterable(frames)))
+    col_counts = pd.Series(list(itertools.chain.from_iterable(frames))).value_counts()
     common_columns = col_counts[col_counts > 1].index
     if len(common_columns) > 0:
         if len(suffixes) != len(frames):

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -55,7 +55,7 @@ version = ">=1.3.4,<3"
 
 [[tool.poetry.dependencies.numpy]]
 python = ">=3.8,<3.10"
-version = "^1.15"
+version = "^1.17"
 
 [[tool.poetry.dependencies.numpy]]
 python = "^3.10"
@@ -64,7 +64,7 @@ version = "^1.21.2"
 
 [tool.poetry.dev-dependencies]
 ipykernel = "^6"
-pytest = "^6"
+pytest = "^8"
 pytest-cov = "*"
 sphinx = "*"
 nbsphinx = ">=0.8.5"

diff --git a/setup.cfg b/setup.cfg
@@ -1,4 +1,4 @@
 [flake8]
 max-line-length = 88
-ignore = E203, E231, E402, E501, F401, W503
+ignore = E203, E231, E402, E501, F401, W503, W604
 exclude = docs
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tox.ini b/tox.ini
@@ -1,19 +1,23 @@
 [tox]
 isolated_build=true
 envlist = 
-    py{37}-pandas{10,11}-numpy{115,116,117,118,119,120,121}
-	py{37}-pandas{12}-numpy{116,117,118,119,120,121}
-	py{37}-pandas{13}-numpy{117,118,119,120,121}
-	py{38}-pandas{10,11,12,13}-numpy{117,118,119,120,121,122,123}
-	py{38}-pandas{14}-numpy{118,119,120,121,122,123}
-	py{38}-pandas{15}-numpy{120,121,122,123}
-	py{39}-pandas{11,12,13,14}-numpy{119,120,121,122,123}
-	py{39}-pandas{15}-numpy{120,121,122,123}
-	py{310}-pandas{13,14,15}-numpy{121,122,123}
-
+	py{38}-pandas{11,12,13}-numpy{118,119,120,121,122,123,124}
+	py{38}-pandas{14}-numpy{118,119,120,121,122,123,124}
+	py{38}-pandas{15}-numpy{120,121,122,123,124}
+	py{39}-pandas{11,12,13}-numpy{120,121,122,123,124,125,126}
+	py{39}-pandas{14}-numpy{120,121,122,123,124,125,126}
+	py{39}-pandas{15}-numpy{120,121,122,123,124,125,126}
+	py{310}-pandas{13,14,15}-numpy{122,123,124,125,126}
+	py{310}-pandas{20}-numpy{122,123,124,125,126}
+	py{310}-pandas{21,22}-numpy{122,123,124,125,126}
+	py{311}-pandas{20}-numpy{124,125,126}
+	py{311}-pandas{21,22}-numpy{124,125,126}
+	py{312}-pandas{21,22}-numpy{126}
+skipdist = true
 
 [testenv]
 deps =
+    staircase
 	pytest
 	pytest-cov
 	pandas10: pandas>=1.0,<1.1
@@ -22,15 +26,19 @@ deps =
 	pandas13: pandas>=1.3,<1.4
 	pandas14: pandas>=1.4,<1.5
 	pandas15: pandas>=1.5,<1.6
-	numpy115: numpy>=1.15,<1.16
-	numpy116: numpy>=1.16,<1.17
+	pandas20: pandas>=2.0,<2.1
+	pandas21: pandas>=2.1,<2.2
+	pandas22: pandas>=2.2,<2.3
 	numpy117: numpy>=1.17,<1.18
 	numpy118: numpy>=1.18,<1.19
 	numpy119: numpy>=1.19,<1.20
 	numpy120: numpy>=1.20,<1.21
 	numpy121: numpy>=1.21,<1.22
 	numpy122: numpy>=1.22,<1.23
 	numpy123: numpy>=1.23,<1.24
-skip_install = false
+	numpy124: numpy>=1.24,<1.25
+	numpy125: numpy>=1.25,<1.26
+	numpy126: numpy>=1.26,<1.27
+skip_install = true
 commands =
-    pytest tests/
+    pytest tests/