Skip to content

remove dependency upper bounds for numpy and matplotlib #3499

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

Merged
C-Achard merged 11 commits into from
Sep 14, 2026
+25 −7
Merged

remove dependency upper bounds for numpy and matplotlib #3499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0d37251
release upper bounds for numpy and matplotlib
deruyter92 Sep 9, 2026
bfef87b
keep np upper bound for tensorflow extras
deruyter92 Sep 9, 2026
a6c8c70
add numpy-1 to canary lane
deruyter92 Sep 9, 2026
dafed18
Fix intelligent testing matrix JSON
C-Achard Sep 11, 2026
33df3dc
Expand intelligent test matrix
C-Achard Sep 11, 2026
1ac630f
Adjust matplotlib and TF numpy constraints
C-Achard Sep 11, 2026
58cb187
Update uv.lock
C-Achard Sep 11, 2026
9391a54
Fix missing ceiling in tf
C-Achard Sep 11, 2026
8163084
Update uv.lock
C-Achard Sep 11, 2026
f010715
update pyproject.toml and uv.lock. Only declare np upperbound when re…
deruyter92 Sep 14, 2026
b6497a9
Restore numba/opencv floors from #3508 after restack
deruyter92 Sep 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/intelligent-testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,16 @@ jobs:
matrix_json: >-
{
"include": [
{"id":"numpy","os":"ubuntu-latest","python-version":"3.12","extras":"","pip_overrides":"numpy>=2"},
{"id":"resolve-py312","os":"ubuntu-latest","python-version":"3.12","extras":"","strict":"true"},
{"id":"resolve-py310","os":"ubuntu-latest","python-version":"3.10","extras":"","strict":"true"},
{"id":"inplace-np2-py312","os":"ubuntu-latest","python-version":"3.12","extras":"","pip_overrides":"numpy>=2"},
{"id":"inplace-np1-py312","os":"ubuntu-latest","python-version":"3.12","extras":"","pip_overrides":"numpy<2"},
{"id":"matplotlib","os":"ubuntu-latest","python-version":"3.12","extras":"","pip_overrides":"matplotlib>=3.9","strict":"true"},
{"id":"pandas","os":"ubuntu-latest","python-version":"3.12","extras":"","pip_overrides":"pandas>=3"},
{"id":"albumentations","os":"ubuntu-latest","python-version":"3.12","extras":"","pip_overrides":"albumentations>=2"},
{"id":"matplotlib","os":"ubuntu-latest","python-version":"3.12","extras":"","pip_overrides":"matplotlib>=3.9"}
{"id":"albumentations","os":"ubuntu-latest","python-version":"3.12","extras":"","pip_overrides":"albumentations>=2"}
]
}

full_suite: false
pytest_paths_json: '["tests"]'
functional_scripts_json: >-
Expand Down
12 changes: 10 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ dependencies = [
"h5py>=3.15.1; platform_system=='Darwin'",
"huggingface-hub>=0.23",
"imageio-ffmpeg",
"matplotlib>=3.3,<3.9,!=3.7,!=3.7.1",
"matplotlib>=3.3,!=3.7,!=3.7.1",
"networkx>=2.6",
"numba>=0.60",
"numpy>=1.22.4,<2",
"numpy>=1.22.4",
"opencv-python-headless>=4.10.0.84",
"packaging>=26",
# Migration to pandas 3.0 is tracked in https://github.com/DeepLabCut/DeepLabCut/issues/3362.
Expand Down Expand Up @@ -82,8 +82,11 @@ docs = [
]
fmpose3d = [ "fmpose3d>=0.0.8" ]
# Use only one of [tf, tf-cu11, tf-cu12, tf-latest]. Do not combine extras.
# NumPy <2 is declared where TF itself does not. TF 2.15–2.18 cap NumPy themselves.
tf = [
"imgaug>=0.4",
# py<3.12 may resolve tensorflow 2.14.0 (no NumPy upper bound on PyPI).
"numpy>=1.22.4,<2; python_version<'3.12'",
"protobuf<7",
"tensorflow>=2.12,<2.16; python_version<'3.12'",
"tensorflow>=2.16.1,<2.18; python_version>='3.12'",
Expand All @@ -97,6 +100,8 @@ tf = [
]
tf-cu11 = [
"imgaug>=0.4",
# tensorflow==2.14 resolves to 2.14.0, which has no NumPy upper bound.
"numpy>=1.22.4,<2",
"protobuf<7",
"tensorflow==2.14",
"tensorflow-io-gcs-filesystem==0.31; platform_system=='Windows'",
Expand All @@ -110,6 +115,7 @@ tf-cu11 = [
tf-cu12 = [
"imgaug>=0.4",
"protobuf<7",
# No numpy cap needed: tensorflow 2.18 declares `numpy<2.1.0,>=1.26.0`
"tensorflow==2.18",
"tensorflow-metal==1.2; platform_system=='Darwin'",
"tensorpack==0.11",
Comment thread
deruyter92 marked this conversation as resolved.
Expand All @@ -130,6 +136,8 @@ tf-latest = [
# apple_mchips is kept for older systems, prefer [tf] in new projects.
apple_mchips = [
"imgaug>=0.4; platform_system=='Darwin'",
# Same TF 2.14.0 hole as [tf] on py<3.12.
"numpy>=1.22.4,<2; platform_system=='Darwin' and python_version<'3.12'",
"protobuf<7; platform_system=='Darwin'",
"tensorflow>=2.12,<2.15; platform_system=='Darwin' and python_version<'3.12'",
"tensorflow>=2.15,<2.18; platform_system=='Darwin' and python_version>='3.12'",
Expand Down
10 changes: 8 additions & 2 deletions uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading