Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade pandas to 1.1.0 and update .week usage #1094

Merged
merged 16 commits into from Jul 31, 2020
Merged

Upgrade pandas to 1.1.0 and update .week usage #1094

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c5f1985
Upgrade pandas to >1.1.0
wsankey Jul 31, 2020
815a1bf
Use dt.isocalendar().week per pandas docs
wsankey Jul 31, 2020
62d223f
Update changelog
wsankey Jul 31, 2020
4930736
Greater than or equal to 1.1.0
wsankey Jul 31, 2020
fa250b7
Import warnings
wsankey Jul 31, 2020
5db0036
Lint the file
wsankey Jul 31, 2020
4c405f8
Set pandas pandas>=0.24.1,<2.0.0
wsankey Jul 31, 2020
0ef9dcb
Update changelog to reflect pandas version difference and filtering
wsankey Jul 31, 2020
d78950d
Import warnings, filter .week deprecation message
wsankey Jul 31, 2020
2f97f21
Ignore the FutureWarning here resolves the issue in ipython terminal …
wsankey Jul 31, 2020
20ab46f
Ignore the specific deprecation warning
wsankey Jul 31, 2020
4ab73e3
Add test checking no warning is thrown
wsankey Jul 31, 2020
0fa92b6
lint test
wsankey Jul 31, 2020
f82a432
Break lines
wsankey Jul 31, 2020
b508c51
Update name per review
wsankey Jul 31, 2020
27dd733
Update changelog per review
wsankey Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/source/changelog.rst
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@ Changelog
* Change default branch to ``main`` (:pr:`1038`)
* Raise TypeError if improper input is supplied to ``Entity.delete_variables()`` (:pr:`1064`)
* Updates for compatibility with pandas 1.1.0 (:pr:`1079`, :pr:`1089`)
* Upgrade pandas to >=1.1.0 (:pr: `1094`)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, remove the space between :pr: and 1094

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah that's what it was, thank you!

* Documentation Changes
* Remove benchmarks folder (:pr:`1049`)
* Add custom variables types section to variables page (:pr:`1066`)
Expand Down
2 changes: 1 addition & 1 deletion featuretools/primitives/standard/transform_primitive.py
View file
Open in desktop
Expand Up @@ -212,7 +212,7 @@ class Week(TransformPrimitive):

def get_function(self):
def week(vals):
return vals.dt.week
return vals.dt.isocalendar().week
return week


Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
@@ -1,6 +1,6 @@
scipy>=0.13.3
numpy>=1.13.3
pandas>=0.24.1
pandas>=1.1.0
tqdm>=4.32.0
pyyaml>=3.12
cloudpickle>=0.4.0
Expand Down