Permalink
Browse files

rm the long-deprecated scikits.learn package

  • Loading branch information...
1 parent c72600d commit ae82bc7a6020c777a1e8ec6ca56b8a5b9d3cc459 @larsmans larsmans committed with GaelVaroquaux Jun 20, 2012
View
1 MANIFEST.in
@@ -1,6 +1,5 @@
include *.rst
include test.py
-include scikits/__init__.py
recursive-include doc *
recursive-include examples *
recursive-include sklearn *.c *.h *.pyx
View
2 README-py3k.rst
@@ -16,7 +16,7 @@ of these is:
To generate python3 compatible sources for selected modules, run the
2to3 tool on the module::
- 2to3 -wn --no-diffs scikits/learn/$module
+ 2to3 -wn --no-diffs sklearn/$module
If you would like to help with porting to python3, please propose
yourself in the scikit-learn mailing list:
View
2 doc/Makefile
@@ -106,4 +106,4 @@ doctest:
"results in $(BUILDDIR)/doctest/output.txt."
download-data:
- python -c "from scikits.learn.datasets.lfw import check_fetch_lfw; check_fetch_lfw()"
+ python -c "from sklearn.datasets.lfw import check_fetch_lfw; check_fetch_lfw()"
View
2 doc/datasets/twenty_newsgroups_fixture.py
@@ -6,7 +6,7 @@
from os.path import exists
from os.path import join
from nose import SkipTest
-from scikits.learn.datasets import get_data_home
+from sklearn.datasets import get_data_home
def setup_module(module):
View
3 doc/whats_new.rst
@@ -43,6 +43,9 @@ Changelog
API changes summary
-------------------
+ - The old ``scikits.learn`` package has disappeared; all code should import
+ from ``sklearn`` instead, which was introduced in 0.9.
+
- In :class:`metrics.roc_curve`, the `thresholds` array is now returned
with it's order reversed, in order to keep it consistent with the order
of the returned `fpr` and `tpr`.
View
1 scikits/__init__.py
@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)
View
5 scikits/learn/__init__.py
@@ -1,5 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated and will be removed in '
- '0.12, please use sklearn instead')
-from sklearn import *
-from sklearn import __version__
View
3 scikits/learn/ball_tree.py
@@ -1,3 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated, please use sklearn instead')
-from sklearn.neighbors.ball_tree import *
View
3 scikits/learn/base.py
@@ -1,3 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated, please use sklearn instead')
-from sklearn.base import *
View
4 scikits/learn/cluster/__init__.py
@@ -1,4 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated and will be removed in '
- '0.12, please use sklearn instead')
-from sklearn.cluster import *
View
4 scikits/learn/cross_val.py
@@ -1,4 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated and will be removed in '
- '0.12, please use sklearn instead')
-from sklearn.cross_validation import *
View
4 scikits/learn/datasets/__init__.py
@@ -1,4 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated and will be removed in '
- '0.12, please use sklearn instead')
-from sklearn.datasets import *
View
3 scikits/learn/datasets/base.py
@@ -1,3 +0,0 @@
-import warnings
-warnings.warn('scikits.learn is deprecated, please use sklearn')
-from sklearn.datasets.base import *
View
4 scikits/learn/decomposition/__init__.py
@@ -1,4 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated and will be removed in '
- '0.12, please use sklearn instead')
-from sklearn.decomposition import *
View
2 scikits/learn/externals/joblib.py
@@ -1,2 +0,0 @@
-from sklearn.externals.joblib import *
-
View
0 scikits/learn/feature_extraction/__init__.py
No changes.
View
5 scikits/learn/feature_extraction/image.py
@@ -1,5 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated and will be removed in '
- '0.12, please use sklearn instead')
-from sklearn.feature_extraction.image import *
-
View
5 scikits/learn/feature_extraction/text.py
@@ -1,5 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated and will be removed in '
- '0.12, please use sklearn instead')
-from sklearn.feature_extraction.text import *
-
View
3 scikits/learn/grid_search.py
@@ -1,3 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated, please use sklearn instead')
-from sklearn.grid_search import *
View
3 scikits/learn/label_propagation.py
@@ -1,3 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated, please use sklearn instead')
-from sklearn.semi_supervised.label_propagation import *
View
3 scikits/learn/lda.py
@@ -1,3 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated, please use sklearn instead')
-from sklearn.lda import *
View
4 scikits/learn/linear_model/__init__.py
@@ -1,4 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated and will be removed in '
- '0.12, please use sklearn instead')
-from sklearn.linear_model import *
View
4 scikits/learn/metrics/__init__.py
@@ -1,4 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated and will be removed in '
- '0.12, please use sklearn instead')
-from sklearn.metrics import *
View
4 scikits/learn/mixture/__init__.py
@@ -1,4 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated and will be removed in '
- '0.12, please use sklearn instead')
-from sklearn.mixture import *
View
3 scikits/learn/naive_bayes.py
@@ -1,3 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated, please use sklearn instead')
-from sklearn.naive_bayes import *
View
3 scikits/learn/neighbors.py
@@ -1,3 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated, please use sklearn instead')
-from sklearn.neighbors import *
View
3 scikits/learn/pipeline.py
@@ -1,3 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated, please use sklearn instead')
-from sklearn.pipeline import *
View
3 scikits/learn/qda.py
@@ -1,3 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated, please use sklearn instead')
-from sklearn.qda import *
View
4 scikits/learn/svm/__init__.py
@@ -1,4 +0,0 @@
-import warnings
-warnings.warn('scikits.learn namespace is deprecated and will be removed in '
- '0.12, please use sklearn instead')
-from sklearn.svm import *
View
7 setup.py
@@ -28,16 +28,13 @@ def configuration(parent_package='', top_path=None):
os.remove('MANIFEST')
from numpy.distutils.misc_util import Configuration
- config = Configuration(None, parent_package, top_path,
- namespace_packages=['scikits'])
-
- config.add_subpackage('scikits.learn')
- config.add_data_files('scikits/__init__.py')
+ config = Configuration(None, parent_package, top_path)
config.add_subpackage('sklearn')
return config
+
if __name__ == "__main__":
old_path = os.getcwd()

0 comments on commit ae82bc7

Please sign in to comment.