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.

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

Bump numpy from 1.19.5 to 1.21.6 #11078

Merged
merged 4 commits into from
Aug 16, 2022
Merged

Bump numpy from 1.19.5 to 1.21.6 #11078

merged 4 commits into from
Aug 16, 2022

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Apr 12, 2022

Bumps numpy from 1.19.5 to 1.21.6.

Release notes

Sourced from numpy's releases.

v1.21.6

NumPy 1.21.6 Release Notes

NumPy 1.21.6 is a very small release that achieves two things:

  • Backs out the mistaken backport of C++ code into 1.21.5.
  • Provides a 32 bit Windows wheel for Python 3.10.

The provision of the 32 bit wheel is intended to make life easier for oldest-supported-numpy.

Checksums

MD5

5a3e5d7298056bcfbc3246597af474d4  numpy-1.21.6-cp310-cp310-macosx_10_9_universal2.whl
d981d2859842e7b62dc93e24808c7bac  numpy-1.21.6-cp310-cp310-macosx_10_9_x86_64.whl
171313893c26529404d09fadb3537ed3  numpy-1.21.6-cp310-cp310-macosx_11_0_arm64.whl
5a7a6dfdd43069f9b29d3fe6b7f3a2ce  numpy-1.21.6-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
a9e25375a72725c5d74442eda53af405  numpy-1.21.6-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
6f9a782477380b2cdb7606f6f7634c00  numpy-1.21.6-cp310-cp310-win32.whl
32a73a348864700a3fa510d2fc4350b7  numpy-1.21.6-cp310-cp310-win_amd64.whl
0db8941ebeb0a02cd839d9cd3c5c20bb  numpy-1.21.6-cp37-cp37m-macosx_10_9_x86_64.whl
67882155be9592850861f4ad8ba36623  numpy-1.21.6-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl
c70e30e1ff9ab49f898c19e7a6492ae6  numpy-1.21.6-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl
e32dbd291032c7554a742f1bb9b2f7a3  numpy-1.21.6-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
689bf804c2cd16cb241fd943e3833ffd  numpy-1.21.6-cp37-cp37m-win32.whl
0062a7b0231a07cb5b9f3d7c495e6fe4  numpy-1.21.6-cp37-cp37m-win_amd64.whl
0d08809980ab497659e7aa0df9ce120e  numpy-1.21.6-cp38-cp38-macosx_10_9_universal2.whl
3c67d14ea2009069844b27bfbf74304d  numpy-1.21.6-cp38-cp38-macosx_10_9_x86_64.whl
5f0e773745cb817313232ac1bf4c7eee  numpy-1.21.6-cp38-cp38-macosx_11_0_arm64.whl
fa8011e065f1964d3eb870bb3926fc99  numpy-1.21.6-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl
486cf9d4daab59aad253aa5b84a5aa83  numpy-1.21.6-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl
88509abab303c076dfb26f00e455180d  numpy-1.21.6-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
f7234e2ef837f5f6ddbde8db246fd05b  numpy-1.21.6-cp38-cp38-win32.whl
e1063e01fb44ea7a49adea0c33548217  numpy-1.21.6-cp38-cp38-win_amd64.whl
61c4caad729e3e0e688accbc1424ed45  numpy-1.21.6-cp39-cp39-macosx_10_9_universal2.whl
67488d8ccaeff798f2e314aae7c4c3d6  numpy-1.21.6-cp39-cp39-macosx_10_9_x86_64.whl
128c3713b5d1de45a0f522562bac5263  numpy-1.21.6-cp39-cp39-macosx_11_0_arm64.whl
50e79cd0610b4ed726b3bf08c3716dab  numpy-1.21.6-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl
bd0c9e3c0e488faac61daf3227fb95af  numpy-1.21.6-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl
aa5e9baf1dec16b15e481c23f8a23214  numpy-1.21.6-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
a2405b0e5d3f775ad30177296a997092  numpy-1.21.6-cp39-cp39-win32.whl
f0d20eda8c78f957ea70c5527954303e  numpy-1.21.6-cp39-cp39-win_amd64.whl
9682abbcc38cccb7f56e48aacca7de23  numpy-1.21.6-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl
6aa3c2e8ea2886bf593bd8e0a1425c64  numpy-1.21.6.tar.gz
04aea95dcb1d256d13a45df42173aa1e  numpy-1.21.6.zip

SHA256

... (truncated)

Commits
  • ef0ec78 Merge pull request #21323 from charris/prepare-1.21.6-release
  • 24a8ec0 REL: Prepare for NumPy 1.21.6 release.
  • 68ff2d3 Merge pull request #21318 from charris/revert-20354
  • 30ba38c REV: Revert pull request #20464 from charris/backport-20354
  • 7cfef93 REL: prepare 1.21.x for further development
  • c3d0a09 Merge pull request #20625 from charris/prepare-for-1.22.5
  • d8dfa93 REL: Prepare for NumPy 1.21.5 release.
  • e559d9a Merge pull request #20618 from charris/backport-20616
  • c2495e3 MAINT: Help boost::python libraries at least not crash
  • 8c04d2a Merge pull request #20613 from charris/backport-20604
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot bot added the type:dependencies Pull requests that update a dependency file label Apr 12, 2022
@dependabot dependabot bot requested review from a team and ancalita and removed request for a team April 12, 2022 15:34
@dependabot dependabot bot force-pushed the dependabot-pip-numpy-1.21.6 branch 2 times, most recently from 5284aca to c4f5724 Compare April 21, 2022 11:47
@ancalita
Copy link
Member

@dependabot rebase

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Apr 22, 2022

Looks like this PR is already up-to-date with main! If you'd still like to recreate it from scratch, overwriting any edits, you can request @dependabot recreate.

@dependabot dependabot bot force-pushed the dependabot-pip-numpy-1.21.6 branch 3 times, most recently from 5a1a9fa to bc2a1df Compare April 22, 2022 12:55
@ancalita
Copy link
Member

@dependabot rebase

@dependabot dependabot bot force-pushed the dependabot-pip-numpy-1.21.6 branch from bc2a1df to 88899b4 Compare April 29, 2022 10:20
@dependabot dependabot bot force-pushed the dependabot-pip-numpy-1.21.6 branch 5 times, most recently from ce96de2 to 1244111 Compare May 19, 2022 06:42
@dependabot dependabot bot force-pushed the dependabot-pip-numpy-1.21.6 branch 3 times, most recently from 452ce4c to 211b2e6 Compare May 27, 2022 09:26
@ancalita ancalita removed their request for review May 27, 2022 09:38
@indam23
Copy link
Contributor

indam23 commented Jun 22, 2022

@dependabot rebase

indam23
indam23 previously approved these changes Jun 22, 2022
@dependabot dependabot bot force-pushed the dependabot-pip-numpy-1.21.6 branch 4 times, most recently from abb7d84 to c147dd2 Compare June 22, 2022 11:03
@dependabot dependabot bot force-pushed the dependabot-pip-numpy-1.21.6 branch from b5b8f1a to d119d8c Compare June 28, 2022 13:14
@virtualroot virtualroot added the release:main Dependabot label for filtering releases label Jun 29, 2022
@aaronbriel
Copy link

Hello @melindaloubser1 , I'm wondering if this is going to be addressed soon, as I believe that it may resolve issues with running on the Mac M1 (see here : Since NumPy 1.21.0 it has released universal2 wheels for Python 3.8 and Python 3.9 on Mac. It becomes installable on Mac M1.).

@twerkmeister
Copy link
Contributor

@dependabot rebase

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Jul 21, 2022

Looks like this PR has been edited by someone other than Dependabot. That means Dependabot can't rebase it - sorry!

If you're happy for Dependabot to recreate it from scratch, overwriting any edits, you can request @dependabot recreate.

@twerkmeister
Copy link
Contributor

@dependabot recreate

@dependabot dependabot bot force-pushed the dependabot-pip-numpy-1.21.6 branch 2 times, most recently from 417e244 to cffb5ed Compare July 21, 2022 16:55
@twerkmeister
Copy link
Contributor

Ok seems it's mostly some type annotations in the code quality that block the checks from passing. Looking through the change logs for 1.20 and 1.21 I didn't find anything worrisome, if anything there should be more safeguards/errors now.

Looking through the training logs I also found some depreciation warnings that we should take care of:

  • VisibleDeprecationWarning: Creating an ndarray from ragged nested sequences (which is a list-or-tuple of lists-or-tuples-or ndarrays with different lengths or shapes) is deprecated. If you meant to do this, you must specify 'dtype=object' when creating the ndarray.
  • DeprecationWarning: np.object is a deprecated alias for the builtin object. To silence this warning, use object by itself. Doing this will not modify any behavior and is safe.

@twerkmeister
Copy link
Contributor

Well actually it's 70 mypy errors... definitely not something to do in an afternoon

@dependabot dependabot bot requested review from a team as code owners July 25, 2022 10:25
dependabot bot and others added 2 commits July 27, 2022 10:01
Bumps [numpy](https://github.com/numpy/numpy) from 1.19.5 to 1.21.6.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst.txt)
- [Commits](numpy/numpy@v1.19.5...v1.21.6)

---
updated-dependencies:
- dependency-name: numpy
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@twerkmeister twerkmeister force-pushed the dependabot-pip-numpy-1.21.6 branch from 6991838 to 98f6e89 Compare July 27, 2022 08:05
"""Computes some statistics over the given numbers."""
return {
"count": len(values) if values else 0,
"mean": np.mean(values) if values else np.nan,
"median": np.median(values) if values else np.nan,
# [numpy-upgrade] type ignore can be removed after upgrading to numpy 1.23
Copy link
Contributor

Choose a reason for hiding this comment

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

There's many of these untyped function call mypy errors in 1.21. I tried 1.23 and they disappeared again, that's why I think it's okay to temporarily ignore them and then once we upgrade we can remove it again. Upgrading to >1.22, however, would also result in losing python 3.7 support

Comment on lines +142 to +143
if isinstance(pickled_state, str):
raise TypeError("np array __reduce__ returned string instead of tuple.")
Copy link
Contributor

Choose a reason for hiding this comment

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

Apparently this can happen according to the type checker - but the documentation is non-existent so I wasn't able to figure out when this might be the case.

batch_output: Dict[Text, Union[np.ndarray, Dict[Text, np.ndarray]]],
) -> Dict[Text, Union[np.ndarray, Dict[Text, np.ndarray]]]:
) -> Dict[Text, Union[np.ndarray, Dict[Text, Any]]]:
Copy link
Contributor

Choose a reason for hiding this comment

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

unfortunately it seems that the nesting isn't really limited - so I picked Any

@@ -441,7 +443,7 @@ def load(

@staticmethod
def batch_to_model_data_format(
batch: Union[Tuple[tf.Tensor, ...], Tuple[np.ndarray, ...]],
batch: MaybeNestedBatchData,
Copy link
Contributor

Choose a reason for hiding this comment

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

The type annotations here were imprecise since they never covered the case that the batch might be yet again nested in a tuple. All the methods leading to this function have still the old annotation, but it was never noticed since they just pass the data along and don't use it. I think these annotations should also be changed, but it's a lot of methods leading back to the batches coming out of the keras data iterator. So fixing those should be a different issue I believe

Copy link
Contributor

Choose a reason for hiding this comment

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

Gotcha. I agree that fixing the entire chain is a separate issue - if you think it is important, could you create a follow up issue for it?

@twerkmeister twerkmeister requested a review from indam23 July 28, 2022 07:50
Copy link
Contributor

@indam23 indam23 left a comment

Choose a reason for hiding this comment

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

Thanks for persevering through the mypy changes!
You may need to rebase your branch then rerun poetry update to resolve the conflicts in the lock file.

@indam23 indam23 enabled auto-merge (squash) August 15, 2022 15:56
@indam23 indam23 merged commit 4cdceaa into main Aug 16, 2022
@indam23 indam23 deleted the dependabot-pip-numpy-1.21.6 branch August 16, 2022 08:43
@ancalita
Copy link
Member

Whoop whoop!! 💯

@twerkmeister
Copy link
Contributor

@melindaloubser1 thanks for going ahead and merging, I was a bit behind on this! 🙌🌟

@twerkmeister twerkmeister mentioned this pull request Aug 29, 2022
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release:main Dependabot label for filtering releases type:dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants