Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[work in progress] Dropping Python 2 support #286

Merged
merged 27 commits into from Apr 4, 2019
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e6eaf46
refactored away externals
tommyod Mar 31, 2019
5325e2a
deleted externals
tommyod Mar 31, 2019
4c073f8
removed support for old sklearn
tommyod Mar 31, 2019
6813f48
removed 'base.py', importing from sklearn instead
tommyod Mar 31, 2019
ffb92a7
Revert "flake8 in CI for tests too. verbose output from tests and slo…
tommyod Apr 1, 2019
5d55acf
Revert "deleted externals"
tommyod Apr 1, 2019
d53f165
Revert "Revert "deleted externals""
tommyod Apr 1, 2019
f338929
Revert "Revert "flake8 in CI for tests too. verbose output from tests…
tommyod Apr 1, 2019
46c0187
Revert "removed 'base.py', importing from sklearn instead"
tommyod Apr 1, 2019
61d70d7
Revert "Revert "removed 'base.py', importing from sklearn instead""
tommyod Apr 1, 2019
7c0d7ef
Revert "Revert "Revert "flake8 in CI for tests too. verbose output fr…
tommyod Apr 1, 2019
cad6bcc
Revert "Revert "Revert "deleted externals"""
tommyod Apr 1, 2019
4dc4d31
Revert "Revert "deleted externals""
tommyod Apr 1, 2019
5cb4658
Revert "Revert "flake8 in CI for tests too. verbose output from tests…
tommyod Apr 1, 2019
d74da91
Revert "removed 'base.py', importing from sklearn instead"
tommyod Apr 1, 2019
0f684c9
reverted
tommyod Apr 1, 2019
2ceda46
deleted 'externals' folder for py2 compatibility
tommyod Apr 2, 2019
a97fa20
mentioned python 3.5+ in README and docs
tommyod Apr 2, 2019
6297254
updated urllib to Python 3 compatibility
tommyod Apr 2, 2019
ea8de7e
added forgotten import
tommyod Apr 2, 2019
731f5fd
trying to use python 3 on circleCI
tommyod Apr 2, 2019
1caa192
Revert "trying to use python 3 on circleCI"
tommyod Apr 2, 2019
33c58d0
added some lines to circleCI
tommyod Apr 2, 2019
9868acf
using py3 in circleCI
tommyod Apr 2, 2019
f6c6fba
removed apt get update from circleCI
tommyod Apr 2, 2019
21d7da4
activating env in circleCI
tommyod Apr 2, 2019
0672c6d
quiet installation with pip
tommyod Apr 3, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
@@ -1,6 +1,5 @@
language: python
env:
- PYTHON=2.7
- PYTHON=3.5
- PYTHON=3.6
- PYTHON=3.7
Expand Down
10 changes: 3 additions & 7 deletions pyglmnet/base.py
@@ -1,8 +1,6 @@
import warnings
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please don't remove this. We don't want a dependency on sklearn. It's a conscious choice.

from distutils.version import LooseVersion

from .externals.six import iteritems

##############################################################################
# adapted from scikit-learn

Expand Down Expand Up @@ -61,10 +59,8 @@ class BaseEstimator(object):
@classmethod
def _get_param_names(cls):
"""Get parameter names for the estimator"""
try:
from inspect import signature
except ImportError:
from .externals.funcsigs import signature
from inspect import signature

# fetch the constructor or the original constructor before
# deprecation wrapping if any
init = getattr(cls.__init__, 'deprecated_original', cls.__init__)
Expand Down Expand Up @@ -138,7 +134,7 @@ def set_params(self, **params):
# Simple optimisation to gain speed (inspect is slow)
return self
valid_params = self.get_params(deep=True)
for key, value in iteritems(params):
for key, value in params.items():
split = key.split('__', 1)
if len(split) > 1:
# nested objects case
Expand Down
2 changes: 1 addition & 1 deletion pyglmnet/datasets.py
Expand Up @@ -5,11 +5,11 @@
import sys
import shutil
import tempfile
import urllib
import itertools
import numpy as np
from scipy.misc import comb

from .externals.six.moves import urllib

pbar = None

Expand Down
1 change: 0 additions & 1 deletion pyglmnet/externals/__init__.py
@@ -1,2 +1 @@
from . import six
tommyod marked this conversation as resolved.
Show resolved Hide resolved
from . import funcsigs