Merge branch 'master' into primitive-option-fix

alteryx · Nov 19, 2019 · 7ac2493 · 7ac2493
2 parents 561af60 + 853091d
commit 7ac2493
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -16,7 +16,7 @@ Changelog
         * Fix release title formatting in changelog (:pr:`806`)
     * Testing Changes
         * Use multiple CPUS to run tests on CI (:pr:`811`)
-        * Refactor test entityset creation to avoid saving to disk (:pr:`813`)
+        * Refactor test entityset creation to avoid saving to disk (:pr:`813`,:pr:`821`)
 
     Thanks to the following people for contributing to this release:
     :user:`rwedge`, :user:`systemshift`, :user:`frances-h`, :user:`jeff-hernandez`

diff --git a/featuretools/tests/testing_utils/mock_ds.py b/featuretools/tests/testing_utils/mock_ds.py
@@ -114,13 +114,13 @@ def make_ecommerce_dataframes(with_integer_time_index=False):
         'cancel_reason': ["reason_1", "reason_2", "reason_1"],
         'engagement_level': [1, 3, 2],
         'full_name': ['Mr. John Doe', 'Doe, Mrs. Jane', 'James Brown'],
-        'email': ['john.smith@example.com', '', 'team@featuretools.com'],
+        'email': ['john.smith@example.com', np.nan, 'team@featuretools.com'],
         'phone_number': ['5555555555', '555-555-5555', '1-(555)-555-5555'],
         'date_of_birth': customer_times['date_of_birth'],
     })
 
     ips = ['192.168.0.1', '2001:4860:4860::8888', '0.0.0.0',
-           '192.168.1.1:2869', np.nan, '']
+           '192.168.1.1:2869', np.nan, np.nan]
     filepaths = ['/home/user/docs/Letter.txt', './inthisdir', 'C:\\user\\docs\\Letter.txt',
                  '~/.rcinfo', '../../greatgrandparent', 'data.json']
 
@@ -169,18 +169,15 @@ def make_ecommerce_dataframes(with_integer_time_index=False):
                     ['0'] +
                     ['1234567890'] * 2 +
                     ['12345-6789'] * 2 +
-                    [np.nan] +
-                    [''] * 2)
+                    [np.nan] * 3)
     countrycodes = list(['US'] * 5 +
                         ['AL'] * 4 +
-                        [np.nan] * 2 +
-                        [''] * 3 +
+                        [np.nan] * 5 +
                         ['ALB'] * 2 +
                         ['USA'])
     subregioncodes = list(['US-AZ'] * 5 +
                           ['US-MT'] * 4 +
-                          [np.nan] * 2 +
-                          [''] +
+                          [np.nan] * 3 +
                           ['UG-219'] * 2 +
                           ['ZM-06'] * 3)
     log_df = pd.DataFrame({