Skip to content

Commit

Permalink
Updates for numpy v1.19.0 (#1016)
Browse files Browse the repository at this point in the history
* update test for numpy 1.19.0

* changelog
  • Loading branch information
frances-h committed Jun 4, 2020
1 parent d42a52d commit 5f8adb6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions docs/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@

Changelog
---------
.. **Future Release**
**Future Release**
* Enhancements
* Add ``make_index`` when initializing an EntitySet by passing in an ``entities`` dictionary (:pr:`1010`)
* Fixes
* Changes
* Documentation Changes
* Testing Changes
* Update tests for numpy v1.19.0 compatability (:pr:`1016`)

Thanks to the following people for contributing to this release:
:user:`gsheni`
:user:`gsheni`, :user:`frances-h`

**v0.15.0 May 29, 2020**
* Enhancements
Expand Down
4 changes: 2 additions & 2 deletions featuretools/tests/entityset_tests/test_es.py
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ def test_checks_time_type_setting_secondary_time_index(es):
# add secondary index that is non-time type
new_2nd_ti = {'favorite_quote': ['favorite_quote', 'loves_ice_cream']}

error_text = "data type \"All members of the working classes must seize the means of production.\" not understood"
error_text = r"data type (\"|')All members of the working classes must seize the means of production.(\"|') not understood"
with pytest.raises(TypeError, match=error_text):
es["customers"].set_secondary_time_index(new_2nd_ti)
# add mismatched pair of secondary time indexes
Expand Down Expand Up @@ -652,7 +652,7 @@ def test_checks_time_type_setting_secondary_time_index(es):
# add secondary index that is non-time type
new_2nd_ti = {'transaction_city': ['transaction_city', 'fraud']}

error_text = 'data type \"City A\" not understood'
error_text = r"data type ('|\")City A('|\") not understood"
with pytest.raises(TypeError, match=error_text):
card_es['transactions'].set_secondary_time_index(new_2nd_ti)
# add mixed secondary time indexes
Expand Down

0 comments on commit 5f8adb6

Please sign in to comment.