Skip to content

Commit

Permalink
Pin numpy to <2 to avoid breakage upon release (#4808)
Browse files Browse the repository at this point in the history
### What

Numpy 2 is incoming and is a breaking release:
https://pythonspeed.com/articles/numpy-2/

This PR pins numpy to ">=1.23,<2" to avoid an auto-break upon release.

Of course, the end game is to actually be compatible with NumPy 2:
- #4807

### Checklist
* [x] I have read and agree to [Contributor
Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and
the [Code of
Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md)
* [x] I've included a screenshot or gif (if applicable)
* [x] I have tested the web demo (if applicable):
* Using newly built examples:
[app.rerun.io](https://app.rerun.io/pr/4808/index.html)
* Using examples from latest `main` build:
[app.rerun.io](https://app.rerun.io/pr/4808/index.html?manifest_url=https://app.rerun.io/version/main/examples_manifest.json)
* Using full set of examples from `nightly` build:
[app.rerun.io](https://app.rerun.io/pr/4808/index.html?manifest_url=https://app.rerun.io/version/nightly/examples_manifest.json)
* [x] The PR title and labels are set such as to maximize their
usefulness for the next release's CHANGELOG

- [PR Build Summary](https://build.rerun.io/pr/4808)
- [Docs
preview](https://rerun.io/preview/2bf2466860fae9e8080504eb576355b0c62735ef/docs)
<!--DOCS-PREVIEW-->
- [Examples
preview](https://rerun.io/preview/2bf2466860fae9e8080504eb576355b0c62735ef/examples)
<!--EXAMPLES-PREVIEW-->
- [Recent benchmark results](https://build.rerun.io/graphs/crates.html)
- [Wasm size tracking](https://build.rerun.io/graphs/sizes.html)
  • Loading branch information
abey79 authored and emilk committed Jan 17, 2024
1 parent d87cd0f commit 443200c
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/contrib_rerun_py.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
# TODO(jleibs): understand why deps can't be installed in the same step as the wheel
shell: bash
run: |
pip install attrs>=23.1.0 numpy>=1.23 pillow pyarrow==14.0.2 pytest==7.1.2 torch==2.1.0 typing_extensions>=4.5
pip install attrs>=23.1.0 'numpy>=1.23,<2' pillow pyarrow==14.0.2 pytest==7.1.2 torch==2.1.0 typing_extensions>=4.5
- name: Get version
id: get-version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_build_examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
shell: bash
run: |
pixi run pip uninstall rerun-sdk -y
pixi run pip install deprecated numpy>=1.23 pyarrow==14.0.2 pytest==7.1.2
pixi run pip install deprecated '"numpy>=1.23,<2"' pyarrow==14.0.2 pytest==7.1.2
pixi run pip install rerun-sdk --no-index --find-links wheel
- name: Verify built wheel version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_publish_web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
run: |
pixi run pip install -r scripts/ci/requirements.txt
pixi run pip uninstall rerun-sdk -y
pixi run pip install deprecated numpy>=1.23 pyarrow==14.0.2 pytest==7.1.2
pixi run pip install deprecated '"numpy>=1.23,<2"' pyarrow==14.0.2 pytest==7.1.2
pixi run pip install rerun-sdk --no-index --find-links wheel
- name: Installed wheel version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_run_notebook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
# TODO(jleibs): pull these deps from pyproject.toml
shell: bash
run: |
pip install deprecated numpy>=1.23 pillow>=9.5.0 pyarrow==14.0.2 pytest==7.1.2
pip install deprecated 'numpy>=1.23,<2' pillow>=9.5.0 pyarrow==14.0.2 pytest==7.1.2
- name: Install downloaded wheel_artifact
# Now install the wheel using a specific version and --no-index to guarantee we get the version from
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_test_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
# TODO(jleibs): understand why deps can't be installed in the same step as the wheel
shell: bash
run: |
pip install attrs>=23.1.0 numpy>=1.23 pillow pyarrow==14.0.2 pytest==7.1.2 torch==2.1.0 typing_extensions>=4.5
pip install attrs>=23.1.0 'numpy>=1.23,<2' pillow pyarrow==14.0.2 pytest==7.1.2 torch==2.1.0 typing_extensions>=4.5
- name: Get version
id: get-version
Expand Down
1 change: 1 addition & 0 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ gitpython = ">=3.1.40"
just = ">=1.15.0"
maturin = ">=0.14,<0.15"
mypy = "1.4.1"
numpy = ">=1.23,<2"
pip = ">=23"
pyarrow = "14.0.2"
pytest = ">=7"
Expand Down
2 changes: 1 addition & 1 deletion rerun_py/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ classifiers = [
dependencies = [
# Must match list in `.github/workflows/reusable_test_wheels.yml`
"attrs>=23.1.0",
"numpy>=1.23",
"numpy>=1.23,<2",
"pillow", # Used for JPEG encoding
"pyarrow==14.0.2",
"typing_extensions>=4.5", # Used for PEP-702 deprecated decorator
Expand Down
2 changes: 1 addition & 1 deletion rerun_py/requirements-lint.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
attrs>=23.1.0 # for mypy to work
blackdoc==0.3.8
mypy==1.4.1
numpy>=1.24 # For mypy plugin
numpy>=1.23,<2 # For mypy plugin
#TODO(#4704): clean that up when pytorch is available for 3.12
torch>=2.0.1 ; python_version < "3.12"
pip-check-reqs==2.4.4 # Checks for missing deps in requirements.txt files
Expand Down

0 comments on commit 443200c

Please sign in to comment.