Merge pull request #20 from FeatureLabs/misc-cleanup

Various small repo updates

Author: thehomebrewnerd

.circleci/config.yml

@@ -40,7 +40,7 @@ jobs:
           name: Lint Tests
           command: |
             source python/bin/activate
-            make -C package lint-tests --makefile ../Makefile
+            make -C package lint --makefile ../Makefile
 
   Unit Tests:
     parameters:
@@ -59,7 +59,7 @@ jobs:
           name: Unit Tests
           command: |
             source python/bin/activate
-            make -C package unit-tests --makefile ../Makefile
+            pytest autonormalize/
       - when:
           condition: << parameters.codecov >>
           steps:

Makefile

@@ -1,15 +1,22 @@
+.PHONY: entry-point-test
 entry-point-test:
 	cd ~ && python -c "from featuretools import autonormalize"
 
+.PHONY: lint-fix
 lint-fix:
 	select="E225,E303,E302,E203,E128,E231,E251,E271,E127,E126,E301,W291,W293,E226,E306,E221"
 	autopep8 --in-place --recursive --max-line-length=100 --select=${select} autonormalize
 	isort --recursive autonormalize
 
-lint-tests:
+.PHONY: lint
+lint:
 	flake8 autonormalize
 	isort --check-only --recursive autonormalize
 
-unit-tests:
-	coverage erase
-	pytest --cov=autonormalize --cache-clear --show-capture=stderr -vv
+.PHONY: test
+test: lint
+		pytest autonormalize/
+
+.PHONY: testcoverage
+testcoverage: lint
+		pytest autonormalize/ --cov=autonormalize

autonormalize/.DS_Store

@@ -14,7 +14,7 @@ def test_ft_mock_customer():
     entityset = an.auto_entityset(df, name="Customer Transactions", time_index='transaction_time')
 
     assert set(entityset['transaction_id'].df.columns) == set(['transaction_id', 'session_id', 'transaction_time',
-                                                              'product_id', 'amount'])
+                                                               'product_id', 'amount'])
 
     assert set(entityset['product_id'].df.columns) == set(['product_id', 'brand'])
 

autonormalize/demos/.DS_Store

@@ -1,5 +1,5 @@
 import pandas as pd
-from pandas.util.testing import assert_frame_equal
+from pandas.testing import assert_frame_equal
 
 from autonormalize import classes, normalize
 
@@ -123,7 +123,7 @@ def test_normalize_dataframe():
     assert len(new_dfs) == 3
 
     dic_one = {'team': ['Red', 'Red', 'Red', 'Orange', 'Orange', 'Yellow',
-               'Yellow', 'Green', 'Green', 'Blue'],
+                        'Yellow', 'Green', 'Green', 'Blue'],
                'jersey_num': [1, 2, 3, 1, 2, 1, 5, 8, 2, 2],
                'player_name': ['A', 'B', 'C', 'D', 'A', 'E', 'B', 'A', 'G', 'H']}