From eb152931a50f89d018c18ce42a97faebf0b4f98c Mon Sep 17 00:00:00 2001 From: ragrawal Date: Mon, 15 Feb 2021 18:54:55 -0800 Subject: [PATCH 1/6] Calling setstate for super --- sklearn_pandas/dataframe_mapper.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sklearn_pandas/dataframe_mapper.py b/sklearn_pandas/dataframe_mapper.py index 471dfd3..d5a22f9 100644 --- a/sklearn_pandas/dataframe_mapper.py +++ b/sklearn_pandas/dataframe_mapper.py @@ -156,6 +156,7 @@ def _unselected_columns(self, X): def __setstate__(self, state): # compatibility for older versions of sklearn-pandas + super().__setstate__(state) self.features = [_build_feature(*feat) for feat in state['features']] self.sparse = state.get('sparse', False) self.default = state.get('default', False) From 48b76c8744d398ed679c01e2a72bf4bd670ff93b Mon Sep 17 00:00:00 2001 From: ragrawal Date: Mon, 15 Feb 2021 23:11:03 -0800 Subject: [PATCH 2/6] added check for 3.9 --- .github/workflows/python-publish.yml | 2 +- noxfile.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 58cafed..6321282 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.6, 3.7, 3.8] + python-version: [3.6, 3.7, 3.8, 3.9] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} diff --git a/noxfile.py b/noxfile.py index 0d391bd..8180f57 100644 --- a/noxfile.py +++ b/noxfile.py @@ -9,9 +9,9 @@ def lint(session): session.run('flake8', 'sklearn_pandas/', 'tests') @nox.session -@nox.parametrize('numpy', ['1.18.1', '1.19.4']) -@nox.parametrize('scipy', ['1.4.1', '1.5.4']) -@nox.parametrize('pandas', ['1.0.5', '1.1.4']) +@nox.parametrize('numpy', ['1.18.1', '1.19.4', '1.20.0']) +@nox.parametrize('scipy', ['1.4.1', '1.5.4', '1.6.0']) +@nox.parametrize('pandas', ['1.0.5', '1.1.4', '1.2.2']) def tests(session, numpy, scipy, pandas): session.install('pytest==5.3.5', 'setuptools==45.2', From 5d32bd3108190d8e8581fc89cbe4d185761c5c18 Mon Sep 17 00:00:00 2001 From: ragrawal Date: Mon, 15 Feb 2021 23:19:50 -0800 Subject: [PATCH 3/6] updated readme --- README.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.rst b/README.rst index bddb192..a0bf1fe 100644 --- a/README.rst +++ b/README.rst @@ -455,6 +455,9 @@ Below example shows how to change logging level. Changelog --------- +* Fix bug with `__setstate__` method. Calling super so that mixin such as baikal can work properly +* adding test for Python 3.9 + 2.0.4 (2020-11-06) ****************** From 27a402edea84ebf2349263157be613494e0937e6 Mon Sep 17 00:00:00 2001 From: ragrawal Date: Mon, 15 Feb 2021 23:32:23 -0800 Subject: [PATCH 4/6] upgraded packages --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 8180f57..f613163 100644 --- a/noxfile.py +++ b/noxfile.py @@ -9,7 +9,7 @@ def lint(session): session.run('flake8', 'sklearn_pandas/', 'tests') @nox.session -@nox.parametrize('numpy', ['1.18.1', '1.19.4', '1.20.0']) +@nox.parametrize('numpy', ['1.18.1', '1.19.4', '1.20.1']) @nox.parametrize('scipy', ['1.4.1', '1.5.4', '1.6.0']) @nox.parametrize('pandas', ['1.0.5', '1.1.4', '1.2.2']) def tests(session, numpy, scipy, pandas): From dc07956b88d4e58a0b5e2fa5331fff470fceb306 Mon Sep 17 00:00:00 2001 From: ragrawal Date: Mon, 15 Feb 2021 23:36:39 -0800 Subject: [PATCH 5/6] removed 3.6 support --- .github/workflows/python-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 6321282..61486fe 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} From c726f5b3f5e771bf8005501684a83ca800bdbb4d Mon Sep 17 00:00:00 2001 From: ragrawal Date: Mon, 15 Feb 2021 23:41:27 -0800 Subject: [PATCH 6/6] added test for 37,38 and 39 --- .circleci/config.yml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6886a50..73ade6a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,15 +1,31 @@ version: 2 jobs: - test: + test37: docker: - - image: circleci/python:3.6 + - image: circleci/python:3.7 steps: - checkout - run: pip install --user nox - run: ~/.local/bin/nox + test38: + docker: + - image: circleci/python:3.8 + steps: + - checkout + - run: pip install --user nox + - run: ~/.local/bin/nox + test39: + docker: + - image: circleci/python:3.9 + steps: + - checkout + - run: pip install --user nox + - run: ~/.local/bin/nox workflows: version: 2 build_and_test: jobs: - - test + - test37 + - test38 + - test39