Update dependencies (#11)

Author: sylwekczmil

.github/workflows/test.yml

@@ -24,13 +24,33 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12"]
     steps:
       - uses: actions/checkout@v2
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: ${{ matrix.python }}
+          python-version: ${{ matrix.python-version }}
+      - name: Install pipx
+        run: python -m pip install --user pipx
+      - name: Install poetry
+        run: pipx install poetry
+      - name: Install dependencies
+        run: poetry install
+      - name: Run pytest
+        run: poetry run pytest -vv tests
+
+  test-windows:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        python-version: ["3.10", "3.11", "3.12"]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
       - name: Install pipx
         run: python -m pip install --user pipx
       - name: Install poetry

README.rst

@@ -154,7 +154,7 @@ https://github.com/sylwekczmil/cacp/tree/main/cacp_examples_incremental.
 .. code:: python3
 
     import river
-    from river.ensemble import AdaptiveRandomForestClassifier
+    from river.forest import ARFClassifier
     from river.naive_bayes import GaussianNB
     from river.neighbors import KNNClassifier
     from river.tree import HoeffdingTreeClassifier
@@ -174,7 +174,7 @@ https://github.com/sylwekczmil/cacp/tree/main/cacp_examples_incremental.
 
         # select incremental classifiers
         experimental_classifiers = [
-            ('ARF', lambda n_inputs, n_classes: AdaptiveRandomForestClassifier()),
+            ('ARF', lambda n_inputs, n_classes: ARFClassifier()),
             ('HAT', lambda n_inputs, n_classes: HoeffdingTreeClassifier()),
             ('KNN', lambda n_inputs, n_classes: KNNClassifier()),
             ('GNB', lambda n_inputs, n_classes: GaussianNB()),

cacp/gui/external/river_library/dataset.py

@@ -21,7 +21,7 @@ def from_river_dataset(cls, river_dataset: Dataset):
 
     def docs_url(self):
         docs_version = river.__version__
-        docs_api_sub_path = "synth" if self == RiverDataSetType.SYNTHETIC else "datasets"
+        docs_api_sub_path = "datasets/synth" if self == RiverDataSetType.SYNTHETIC else "datasets"
         return f"https://riverml.xyz/{docs_version}/api/{docs_api_sub_path}/"
 
 

cacp_examples_incremental/example_result/info/classifiers.csv

@@ -1,5 +1,5 @@
 ,Name,Class Name,Library,Type
-1,ARF,AdaptiveRandomForest,river,incremental
-2,GNB,GaussianNB,river,incremental
-3,HAT,HoeffdingTree,river,incremental
-4,KNN,KNN,river,incremental
+1,ARF,ARFClassifier,river,INCREMENTAL
+2,GNB,GaussianNB,river,INCREMENTAL
+3,HAT,HoeffdingTreeClassifier,river,INCREMENTAL
+4,KNN,KNNClassifier,river,INCREMENTAL

cacp_examples_incremental/example_result/info/classifiers.tex

@@ -6,10 +6,10 @@
 \hline
  & Name & Class Name & Library & Type \\
 \hline
-1 & ARF & AdaptiveRandomForest & river & incremental \\
-2 & GNB & GaussianNB & river & incremental \\
-3 & HAT & HoeffdingTree & river & incremental \\
-4 & KNN & KNN & river & incremental \\
+1 & ARF & ARFClassifier & river & INCREMENTAL \\
+2 & GNB & GaussianNB & river & INCREMENTAL \\
+3 & HAT & HoeffdingTreeClassifier & river & INCREMENTAL \\
+4 & KNN & KNNClassifier & river & INCREMENTAL \\
 \hline
 \end{tabular}
 \end{table}

cacp_examples_incremental/experiment.py

@@ -1,5 +1,5 @@
 import river
-from river.ensemble import AdaptiveRandomForestClassifier
+from river.forest import ARFClassifier
 from river.naive_bayes import GaussianNB
 from river.neighbors import KNNClassifier
 from river.tree import HoeffdingTreeClassifier
@@ -19,7 +19,7 @@
 
     # select incremental classifiers
     experimental_classifiers = [
-        ('ARF', lambda n_inputs, n_classes: AdaptiveRandomForestClassifier()),
+        ('ARF', lambda n_inputs, n_classes: ARFClassifier()),
         ('HAT', lambda n_inputs, n_classes: HoeffdingTreeClassifier()),
         ('KNN', lambda n_inputs, n_classes: KNNClassifier()),
         ('GNB', lambda n_inputs, n_classes: GaussianNB()),

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cacp"
-version = "1.0.3"
+version = "1.0.4"
 description = ""
 authors = [
     "Sylwester Czmil <[email protected]>",
@@ -10,7 +10,7 @@ authors = [
 readme = "README.rst"
 
 [tool.poetry.dependencies]
-python = ">=3.10.0,<4.0"
+python = ">=3.10.0,<3.13"
 dash = {version = "^2.13.0", extras = ["diskcache"]}
 dash-bootstrap-components = "^1.5.0"
 dash-rjsf = "^0.0.4"
@@ -20,9 +20,9 @@ Jinja2 = "^3.1.2"
 joblib = "^1.3.2"
 matplotlib = "^3.8.0"
 numpy = "^1.25.2"
-pandas = "^1.5.3"
+pandas = "^2.2.0"
 pydantic = "^1.10.12"
-river = "^0.19.0"
+river = "^0.21.0"
 scikit-learn = "^1.3.0"
 tinydb = "^4.8.0"
 tqdm = "^4.66.1"

pyproject.toml

@@ -82,4 +82,4 @@ def test_parse_river_dataset():
 
 
 def test_list_keel_datasets():
-    assert len(RiverDatasetModel.all()) == 53
+    assert len(RiverDatasetModel.all()) == 54

tests/gui/external/test_dataset.py

@@ -1,6 +1,6 @@
 [tox]
 skipsdist = true
-envlist = flake8, python3.10, python3.11
+envlist = flake8, python3.10, python3.11, python3.12
 
 [testenv]
 allowlist_externals = poetry