Skip to content

Commit

Permalink
Clean up after getting compatibility with numpy-1.24 (#6187)
Browse files Browse the repository at this point in the history
- remove numpy version pinning, but require major version 1
- remove warning filters not relevant after numpy-1.24

Follow up to #5967
  • Loading branch information
pavoljuhas committed Jul 7, 2023
1 parent 8a41b4a commit 56259e4
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 14 deletions.
2 changes: 1 addition & 1 deletion cirq-core/requirements.txt
Expand Up @@ -3,7 +3,7 @@
duet~=0.2.8
matplotlib~=3.0
networkx>=2.4
numpy>=1.16
numpy~=1.16
pandas
sortedcontainers~=2.0
scipy
Expand Down
2 changes: 0 additions & 2 deletions dev_tools/notebooks/isolated_notebook_test.py
Expand Up @@ -107,8 +107,6 @@
# https://github.com/networkx/networkx/issues/4718 pinned networkx 2.5.1 to 4.4.2
# however, jupyter brings in 5.0.6
'decorator<5',
# TODO(#5967): allow numpy-1.24 when it is supported in Cirq and numba
'numpy>=1.16,<1.24',
]


Expand Down
11 changes: 0 additions & 11 deletions pyproject.toml
Expand Up @@ -7,15 +7,4 @@ skip-magic-trailing-comma = true
[tool.pytest.ini_options]
filterwarnings = [
"ignore:Matplotlib is currently using agg:UserWarning",
# TODO(#5967) - remove after upgrade to NumPy 1.24
# Enforce NumPy 1.20 deprecations.
# Ref: https://numpy.org/devdocs/release/1.20.0-notes.html#deprecations
"error:`np.bool` is a deprecated alias:DeprecationWarning:(cirq|<string>)",
"error:`np.int` is a deprecated alias:DeprecationWarning:(cirq|<string>)",
"error:`np.float` is a deprecated alias:DeprecationWarning:(cirq|<string>)",
"error:`np.complex` is a deprecated alias:DeprecationWarning:(cirq|<string>)",
"error:`np.object` is a deprecated alias:DeprecationWarning:(cirq|<string>)",
"error:`np.str` is a deprecated alias:DeprecationWarning:(cirq|<string>)",
"error:`np.long` is a deprecated alias:DeprecationWarning:(cirq|<string>)",
"error:`np.unicode` is a deprecated alias:DeprecationWarning:(cirq|<string>)",
]

0 comments on commit 56259e4

Please sign in to comment.