Allow installation of additional primitives

.circleci/config.yml

@@ -8,7 +8,7 @@ jobs:
       - checkout
       - run: pyenv local 2.7.15
       - run: make installdeps lint
-      - run: tox -e py27
+      - run: make test
 
   "python-3.5":
     working_directory: ~/featuretools
@@ -18,7 +18,7 @@ jobs:
       - checkout
       - run: pyenv local 3.5.6
       - run: make installdeps lint
-      - run: tox -e py35
+      - run: make test
 
   "python-3.6":
     working_directory: ~/featuretools
@@ -30,7 +30,8 @@ jobs:
       - run: pyenv local 3.6.6
       - run: make installdeps lint
       - run: make -C docs/ -e "SPHINXOPTS=-W" clean html
-      - run: tox -e clean,py36 && codecov
+      - run: make test
+      - run: coverage erase && coverage && codecov
 
   "python-3.7":
     working_directory: ~/featuretools
@@ -40,7 +41,7 @@ jobs:
       - checkout
       - run: pyenv local 3.7.0
       - run: make installdeps lint
-      - run: tox -e py37
+      - run: make test
 
 workflows:
   version: 2

.gitignore

@@ -15,6 +15,7 @@ featuretools/tests/integration_data/products.gzip
 featuretools/tests/integration_data/regions.gzip
 featuretools/tests/integration_data/sessions.gzip
 featuretools/tests/integration_data/stores.gzip
+*.dirlock
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -127,4 +128,4 @@ ENV/
 .pytest_cache
 
 #IDE
-.vscode
+.vscode

Makefile

@@ -1,4 +1,3 @@
-TEST_CMD=setup.py test --addopts --boxed
 clean:
 	find . -name '*.pyo' -delete
 	find . -name '*.pyc' -delete
@@ -9,7 +8,7 @@ lint:
 	flake8 featuretools && isort --check-only --recursive featuretools
 
 test: lint
-	python $(TEST_CMD)
+	pytest featuretools/tests
 
 installdeps:
 	pip install --upgrade pip

dev-requirements.txt

@@ -10,4 +10,3 @@ matplotlib==2.2.3; python_version<'3'
 nbsphinx==0.3.5
 Sphinx==1.8.1
 sphinx_rtd_theme==0.4.2
-tox==3.5.3

featuretools/__init__.py

@@ -5,7 +5,7 @@
 from .entityset.api import *
 from . import primitives
 from .synthesis.api import *
-from .primitives import Feature, list_primitives
+from .primitives import  list_primitives, install_primitives, Feature
 from .computational_backends.api import *
 from . import tests
 from .utils.pickle_utils import *

featuretools/__main__.py

@@ -0,0 +1,39 @@
+import click
+import pandas as pd
+
+import featuretools
+from featuretools.primitives import install_primitives
+from featuretools.primitives.install import get_featuretools_root
+
+
+@click.group()
+def cli():
+    pass
+
+
+@click.command()
+def info():
+    print("Featuretools version: %s" % featuretools.__version__)
+    print("Featuretools installation directory: %s" % get_featuretools_root())
+
+
+@click.command()
+@click.option('--prompt/--no-prompt', default=True, help='Confirm primitives before installing')
+@click.argument('directory')
+def install(prompt, directory):
+    install_primitives(directory, prompt)
+
+
+@click.command()
+def list_primitives():
+    with pd.option_context('display.max_rows', None, 'display.max_columns', None, 'display.max_colwidth', -1, 'display.width', 1000):
+        print(featuretools.list_primitives())
+
+
+cli.add_command(install)
+cli.add_command(list_primitives)
+cli.add_command(info)
+
+
+if __name__ == "__main__":
+    cli()

featuretools/computational_backends/feature_tree.py

@@ -8,7 +8,7 @@
 
 from featuretools import variable_types
 from featuretools.exceptions import UnknownFeature
-from featuretools.primitives import (
+from featuretools.primitives.base import (
     AggregationPrimitive,
     DirectFeature,
     IdentityFeature,

featuretools/computational_backends/pandas_backend.py

@@ -14,7 +14,7 @@
 
 from featuretools import variable_types
 from featuretools.exceptions import UnknownFeature
-from featuretools.primitives import (
+from featuretools.primitives.base import (
     AggregationPrimitive,
     DirectFeature,
     IdentityFeature,

featuretools/computational_backends/utils.py

@@ -10,7 +10,7 @@
 from distributed import Client, LocalCluster
 from pandas.tseries.frequencies import to_offset
 
-from featuretools.primitives import AggregationPrimitive, DirectFeature
+from featuretools.primitives.base import AggregationPrimitive, DirectFeature
 from featuretools.utils.wrangle import _check_timedelta
 
 logger = logging.getLogger('featuretools.computational_backend')

featuretools/primitives/api.py

@@ -1,13 +1,12 @@
 # flake8: noqa
-from .aggregation_primitive_base import *
-from .aggregation_primitives import *
-from .binary_transform import *
-from .cum_transform_feature import *
-from .direct_feature import *
-from .primitive_base import *
-from .transform_primitive import *
+from .base import Feature
+from .install import install_primitives
+from .installed import *
+from .standard.aggregation_primitives import *
+from .standard.binary_transform import *
+from .standard.cum_transform_feature import *
+from .standard.transform_primitive import *
 from .utils import (
-    apply_dual_op_from_feat,
     get_aggregation_primitives,
     get_transform_primitives,
     list_primitives

featuretools/primitives/base/__init__.py

@@ -0,0 +1,2 @@
+# flake8: noqa
+from .api import *

featuretools/primitives/base/api.py

@@ -0,0 +1,12 @@
+# flake8: noqa
+from .aggregation_primitive_base import (
+    AggregationPrimitive,
+    make_agg_primitive
+)
+from .primitive_base import (
+    DirectFeature,
+    Feature,
+    IdentityFeature,
+    PrimitiveBase
+)
+from .transform_primitive_base import TransformPrimitive, make_trans_primitive