Merge pull request #120 from rodrigo-arenas/0.9.1dev

0.9.1dev
rodrigo-arenas · Feb 10, 2023 · 07f003a · 07f003a
2 parents 5ee26e3 + 30b7902
commit 07f003a
Show file tree

Hide file tree

Showing 13 changed files with 115 additions and 186 deletions.
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [ 3.7, 3.8, 3.9]
+        python-version: [ 3.8, 3.9, '3.10']
         os: [ubuntu-latest, windows-latest, macOS-latest]
         include:
           - os: ubuntu-latest
@@ -19,12 +19,12 @@ jobs:
           - os: windows-latest
             path: ~\AppData\Local\pip\Cache
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ${{ matrix.path }}
           key: ${{ runner.os }}-pip-${{ hashFiles('dev-requirements.txt') }}
@@ -38,6 +38,6 @@ jobs:
         run: |
           pytest sklearn_genetic/ --verbose --color=yes --assert=plain --cov-fail-under=95 --cov-config=.coveragerc --cov=./ -p no:warnings
       - name: "Upload coverage to Codecov"
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true
diff --git a/README.rst b/README.rst
@@ -8,7 +8,7 @@
 .. |Codecov| image:: https://codecov.io/gh/rodrigo-arenas/Sklearn-genetic-opt/branch/master/graphs/badge.svg?branch=master&service=github
 .. _Codecov: https://codecov.io/github/rodrigo-arenas/Sklearn-genetic-opt?branch=master
 
-.. |PythonVersion| image:: https://img.shields.io/badge/python-3.7%20%7C%203.8%20%7C%203.9-blue
+.. |PythonVersion| image:: https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10-blue
 .. _PythonVersion : https://www.python.org/downloads/
 .. |PyPi| image:: https://badge.fury.io/py/sklearn-genetic-opt.svg
 .. _PyPi: https://badge.fury.io/py/sklearn-genetic-opt

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,12 +1,13 @@
-scikit-learn>=0.21.3
-deap>=1.3.1
-numpy>=1.14.5
-pytest==6.2.2
+scikit-learn>=1.1.0
+deap>=1.3.3
+numpy>=1.19.0
+pytest==7.1.1
 codecov==2.1.11
-pytest-cov==2.11.1
+pytest-cov==3.0.0
 twine==3.3.0
-seaborn>=0.11.1
-mlflow>=1.17.0
+seaborn>=0.11.2
+mlflow>=1.30.0
+tcl==0.2
 black==21.5b2
 sphinx
 sphinx_gallery

diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -3,6 +3,17 @@ Release Notes
 
 Some notes on new features in various releases
 
+What's new in 0.9.1dev
+----------------------
+
+^^^^^^^^^^^^
+API Changes:
+^^^^^^^^^^^^
+
+* Dropped support for python 3.7 and add support for python 3.10+
+* Update most important packages from dev-requirements.txt to more recent versions
+* Update deprecated functions in tests
+
 What's new in 0.9.0
 -------------------
 

diff --git a/docs/tutorials/understand_cv.rst b/docs/tutorials/understand_cv.rst
@@ -163,14 +163,14 @@ on the test set for the best set of hyperparameters.
 
     from sklearn_genetic import GASearchCV
     from sklearn_genetic.space import Integer, Categorical, Continuous
-    from sklearn.datasets import load_boston
+    from sklearn.datasets import load_diabetes
     from sklearn.model_selection import train_test_split, KFold
     from sklearn.tree import DecisionTreeRegressor
     from sklearn.metrics import r2_score
     from sklearn.pipeline import Pipeline
     from sklearn.preprocessing import StandardScaler
 
-    data = load_boston()
+    data = load_diabetes()
 
     y = data["target"]
     X = data["data"]
@@ -186,7 +186,7 @@ on the test set for the best set of hyperparameters.
 
     param_grid = {
         "clf__ccp_alpha": Continuous(0, 1),
-        "clf__criterion": Categorical(["mse", "mae"]),
+        "clf__criterion": Categorical(["squared_error", "absolute_error"]),
         "clf__max_depth": Integer(2, 20),
         "clf__min_samples_split": Integer(2, 30),
     }

diff --git a/readthedocs.yml b/readthedocs.yml
@@ -10,6 +10,6 @@ sphinx:
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.7
+  version: 3.8
   install:
     - requirements: dev-requirements.txt
diff --git a/setup.py b/setup.py
@@ -26,9 +26,9 @@
     classifiers=[
         "License :: OSI Approved :: MIT License",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
     ],
     project_urls={
         "Documentation": "https://sklearn-genetic-opt.readthedocs.io/en/stable/",
@@ -39,16 +39,16 @@
         include=["sklearn_genetic", "sklearn_genetic.*"], exclude=["*tests*"]
     ),
     install_requires=[
-        "scikit-learn>=0.21.3",
-        "numpy>=1.14.5",
-        "deap>=1.3.1",
+        "scikit-learn>=1.1.0",
+        "numpy>=1.19.0",
+        "deap>=1.3.3",
         "tqdm>=4.61.1",
     ],
     extras_require={
         "mlflow": ["mlflow>=1.17.0"],
-        "seaborn": ["seaborn>=0.9.0"],
-        "all": ["mlflow>=1.17.0", "seaborn>=0.9.0"],
+        "seaborn": ["seaborn>=0.11.2"],
+        "all": ["mlflow>=1.30.0", "seaborn>=0.11.2"],
     },
-    python_requires=">=3.7",
+    python_requires=">=3.8",
     include_package_data=True,
 )
diff --git a/sklearn_genetic/_version.py b/sklearn_genetic/_version.py
@@ -1 +1 @@
-__version__ = "0.9.0"
+__version__ = "0.9.1dev"