Update install requirements and readme

README.md

@@ -29,7 +29,11 @@ provided by PyTorch.
 
 ProtoTorch can be installed using `pip`.
 ```bash
-pip install prototorch
+pip install -U prototorch
+```
+To also install the extras, use
+```bash
+pip install -U prototorch[datasets,examples,tests]
 ```
 
 To install the bleeding-edge features and improvements:

examples/glvq_iris.py

@@ -12,7 +12,7 @@ from prototorch.modules.prototypes import Prototypes1D
 
 # Prepare and preprocess the data
 scaler = StandardScaler()
-x_train, y_train = load_iris(True)
+x_train, y_train = load_iris(return_X_y=True)
 x_train = x_train[:, [0, 2]]
 scaler.fit(x_train)
 x_train = scaler.transform(x_train)

setup.py

@@ -27,7 +27,7 @@ setup(name='prototorch',
           'numpy>=1.9.1',
       ],
       extras_require={
-          'datasets': ['requests'],
+          'datasets': ['requests', 'tqdm'],
           'examples': [
               'sklearn',
               'matplotlib',