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

Matplotlib 3.9.1 #390

Merged
merged 104 commits into from
Jul 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
6b68058
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration Conda…
conda-forge-curator[bot] Mar 15, 2024
e8e6237
Merge branch 'main' into bump-rc
dopplershift Apr 12, 2024
46fc73e
Bump to 3.9.0rc2
dopplershift Apr 12, 2024
cc8e33b
Update for new meson-based builds
dopplershift Apr 25, 2024
016be80
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration Conda…
conda-forge-curator[bot] May 12, 2024
5c853e8
MNT: attempt to fix build
tacaswell Jun 26, 2024
3121712
bump to 3.9.0
tacaswell Jun 26, 2024
ec6fd6b
win: use system freetype
tacaswell Jun 26, 2024
009edaf
MNT: try to fix windows compliers
tacaswell Jun 26, 2024
668b151
Update recipe/meta.yaml
tacaswell Jun 26, 2024
b8dc91a
undo change
tacaswell Jun 26, 2024
2182d92
MNT: use pkgconfig on windows?
tacaswell Jun 26, 2024
7895d7d
MNT: try to modernize stdlib pinning
tacaswell Jun 26, 2024
a3a0cb9
OSX: to the future!
tacaswell Jun 26, 2024
7e3ca27
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
Jun 26, 2024
e66405c
Include fixes for Meson builds
jakirkham Jun 26, 2024
8c88075
Drop now unneeded `conda_mpl_config.cfg`
jakirkham Jun 26, 2024
0580bdb
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
Jun 26, 2024
f12d0b6
Drop unneeded `conda_build_config.yaml`
jakirkham Jun 26, 2024
8af3958
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
Jun 26, 2024
43c268a
Use `pkg-config` on Unix only
jakirkham Jun 26, 2024
bb2b24d
Align `libtool` selector
jakirkham Jun 26, 2024
133837c
Group build tools together after `compiler`s
jakirkham Jun 26, 2024
975712f
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
Jun 26, 2024
2035011
Merge conda-forge/rc into dopplershift/bump-rc
jakirkham Jun 26, 2024
b48fd45
Adjust dependency constraints
jakirkham Jun 26, 2024
61595a6
Add `qhull` to dependencies
jakirkham Jun 26, 2024
8aefa59
Include NumPy 2 migration
jakirkham Jun 26, 2024
11842a7
Update NumPy dependency for NumPy 2
jakirkham Jun 26, 2024
1f1f629
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
Jun 26, 2024
6988a6a
Include additional Meson build steps
jakirkham Jun 26, 2024
676cfef
Use `python-build`
jakirkham Jun 26, 2024
51495f1
Refresh PyPy migrator
jakirkham Jun 27, 2024
7ae5e35
Refresh Python 3.12 migrator
jakirkham Jun 27, 2024
1d35c7c
Fix Windows `pip install` command
jakirkham Jun 27, 2024
4167134
Add `ninja` to `requirements/build`
jakirkham Jun 27, 2024
05b48bd
Workaround `conda-build` `outputs` `pip` conf bug
jakirkham Jun 27, 2024
6028fbb
Drop Windows env var workarounds
jakirkham Jun 27, 2024
d0bfec4
Bump NumPy minimum to 1.23
jakirkham Jun 27, 2024
bd94ebd
Configure release build
jakirkham Jun 27, 2024
9ba8c86
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
Jun 27, 2024
f28d21d
Append to `MESON_ARGS` & specify Python
jakirkham Jun 27, 2024
5bc1a4e
Use system Qhull
jakirkham Jun 27, 2024
cb32869
Fix indentation
jakirkham Jun 27, 2024
bde1413
Also use system FreeType
jakirkham Jun 27, 2024
ed6c35c
Drop `python_target`
jakirkham Jun 27, 2024
d27d848
Push more args into `MESON_ARGS`
jakirkham Jun 27, 2024
9df6caf
Put back `builddir` conf in `python-build` line
jakirkham Jun 27, 2024
349e134
Add system library flags on Windows
jakirkham Jun 27, 2024
54a4f6a
Specify prefix
jakirkham Jun 27, 2024
d8db30f
Use `pkg-config` on Windows
jakirkham Jun 27, 2024
251d8ab
Try specifying `libdir` to Meson
jakirkham Jun 27, 2024
aed82a0
Enable overlinking check
jakirkham Jun 27, 2024
6827546
Use `pip`'s `--find-links` to install wheel
jakirkham Jun 27, 2024
d0bd96e
Configure `pkg-config` search paths
jakirkham Jun 27, 2024
14e13a7
Add `--pkg-config-path` to `MESON_ARGS`
jakirkham Jun 27, 2024
24bb7ff
Consolidate instal into recipe `script` field
jakirkham Jun 27, 2024
c835afa
Revert "Consolidate instal into recipe `script` field"
jakirkham Jun 27, 2024
dabeec4
Try `libdir` as `lib` on Windows
jakirkham Jun 27, 2024
97aac0f
Readd Windows path adjustments
jakirkham Jun 27, 2024
55cdc16
Revert "Readd Windows path adjustments"
jakirkham Jun 27, 2024
b5a125c
Use verbose build on Windows
jakirkham Jun 27, 2024
ccb75bb
Also on error print Meson logs
jakirkham Jun 27, 2024
9d8b89b
Output Meson logs after `setup`
jakirkham Jun 27, 2024
93097b8
Show Windows env vars
jakirkham Jun 27, 2024
72f157a
Hackily remove problematic Python from Azure
jakirkham Jun 27, 2024
7dae470
Always show Meson logs
jakirkham Jun 27, 2024
a3f9915
Fix Unix builds
jakirkham Jun 27, 2024
6bc4c6c
Try PowerShell for removing Azure's Python
jakirkham Jun 27, 2024
55025c4
Use `robocopy` trick to remove Azure Python
jakirkham Jun 28, 2024
d1d8c83
Much quieter `robocopy`
jakirkham Jun 28, 2024
78a1ec4
One more `rmdir`
jakirkham Jun 28, 2024
860a727
Even quieter `robocopy`
jakirkham Jun 28, 2024
71dacbe
Silence `robocopy`
jakirkham Jun 28, 2024
3c1fcd2
Drop env var display
jakirkham Jun 28, 2024
6355da0
Tidy `robocopy` call
jakirkham Jun 28, 2024
6658722
Use `for`-loop with `robocopy`
jakirkham Jun 28, 2024
3d449bb
Quote array assignment
jakirkham Jun 28, 2024
eb4664f
Fix batch array
jakirkham Jun 28, 2024
9171d9e
Fix batch `for`-loop
jakirkham Jun 28, 2024
6ca67fa
Fix batch array again
jakirkham Jun 28, 2024
8889231
Use`;` list
jakirkham Jun 28, 2024
e5224ae
Replace`;` with ` `
jakirkham Jun 28, 2024
e316d55
migration: OSXArm
regro-cf-autotick-bot Jun 28, 2024
9bf778f
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
regro-cf-autotick-bot Jun 28, 2024
7cc8550
migration: ArchRebuild
regro-cf-autotick-bot Jun 28, 2024
0715a00
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
regro-cf-autotick-bot Jun 28, 2024
58f6b81
Rebuild for numpy 2.0
regro-cf-autotick-bot Jun 28, 2024
ee7b12b
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
regro-cf-autotick-bot Jun 28, 2024
939e722
Rebuild for python312
regro-cf-autotick-bot Jun 28, 2024
715f299
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
regro-cf-autotick-bot Jun 28, 2024
9bd1f6c
Rebuild for PyPy3.9
regro-cf-autotick-bot Jun 28, 2024
edcac60
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
regro-cf-autotick-bot Jun 28, 2024
ee34e55
Merge regro-cf-autotick-bot/bot-pr_arm_osx_hf68c09 into dopplershift/…
jakirkham Jun 28, 2024
9b21918
Merge regro-cf-autotick-bot/bot-pr_arch_hc9d5c9 into dopplershift/bum…
jakirkham Jun 28, 2024
ea0110e
Merge regro-cf-autotick-bot/rebuild-numpy2-0-1_ha35afb into dopplersh…
jakirkham Jun 28, 2024
5240fa3
Merge regro-cf-autotick-bot/rebuild-python312-0-1_h80a8d1 into dopple…
jakirkham Jun 28, 2024
11f16e4
Merge regro-cf-autotick-bot/rebuild-pypy38-0-1_h716096 into dopplersh…
jakirkham Jun 28, 2024
19d64de
Refresh Windows cleanup logic
jakirkham Jun 29, 2024
032ac08
Simplify Azure Python cleanup
jakirkham Jun 29, 2024
be67991
Merge pull request #373 from dopplershift/bump-rc
tacaswell Jul 1, 2024
6bfa6b8
Merge remote-tracking branch 'upstream/rc'
tacaswell Jul 1, 2024
1f684b5
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
Jul 1, 2024
a4df2de
REL: bump to 3.9.1
tacaswell Jul 5, 2024
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
6 changes: 4 additions & 2 deletions .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_stdlib_version:
cdt_name:
- cos6
channel_sources:
- conda-forge/label/numpy_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -30,6 +30,8 @@ python:
- 3.8.* *_cpython
python_impl:
- cpython
qhull:
- '2020.2'
target_platform:
- linux-64
tk:
Expand All @@ -43,4 +45,4 @@ zip_keys:
- numpy
- python_impl
zlib:
- '1.2'
- '1'
6 changes: 4 additions & 2 deletions .ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_stdlib_version:
cdt_name:
- cos6
channel_sources:
- conda-forge/label/numpy_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -30,6 +30,8 @@ python:
- 3.9.* *_73_pypy
python_impl:
- pypy
qhull:
- '2020.2'
target_platform:
- linux-64
tk:
Expand All @@ -43,4 +45,4 @@ zip_keys:
- numpy
- python_impl
zlib:
- '1.2'
- '1'
6 changes: 4 additions & 2 deletions .ci_support/linux_64_numpy2.0python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_stdlib_version:
cdt_name:
- cos6
channel_sources:
- conda-forge/label/numpy_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -30,6 +30,8 @@ python:
- 3.10.* *_cpython
python_impl:
- cpython
qhull:
- '2020.2'
target_platform:
- linux-64
tk:
Expand All @@ -43,4 +45,4 @@ zip_keys:
- numpy
- python_impl
zlib:
- '1.2'
- '1'
6 changes: 4 additions & 2 deletions .ci_support/linux_64_numpy2.0python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_stdlib_version:
cdt_name:
- cos6
channel_sources:
- conda-forge/label/numpy_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -30,6 +30,8 @@ python:
- 3.11.* *_cpython
python_impl:
- cpython
qhull:
- '2020.2'
target_platform:
- linux-64
tk:
Expand All @@ -43,4 +45,4 @@ zip_keys:
- numpy
- python_impl
zlib:
- '1.2'
- '1'
6 changes: 4 additions & 2 deletions .ci_support/linux_64_numpy2.0python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_stdlib_version:
cdt_name:
- cos6
channel_sources:
- conda-forge/label/numpy_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -30,6 +30,8 @@ python:
- 3.12.* *_cpython
python_impl:
- cpython
qhull:
- '2020.2'
target_platform:
- linux-64
tk:
Expand All @@ -43,4 +45,4 @@ zip_keys:
- numpy
- python_impl
zlib:
- '1.2'
- '1'
6 changes: 4 additions & 2 deletions .ci_support/linux_64_numpy2.0python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_stdlib_version:
cdt_name:
- cos6
channel_sources:
- conda-forge/label/numpy_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -30,6 +30,8 @@ python:
- 3.9.* *_cpython
python_impl:
- cpython
qhull:
- '2020.2'
target_platform:
- linux-64
tk:
Expand All @@ -43,4 +45,4 @@ zip_keys:
- numpy
- python_impl
zlib:
- '1.2'
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cdt_arch:
cdt_name:
- cos7
channel_sources:
- conda-forge/label/numpy_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -34,6 +34,8 @@ python:
- 3.8.* *_cpython
python_impl:
- cpython
qhull:
- '2020.2'
target_platform:
- linux-aarch64
tk:
Expand All @@ -47,4 +49,4 @@ zip_keys:
- numpy
- python_impl
zlib:
- '1.2'
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cdt_arch:
cdt_name:
- cos7
channel_sources:
- conda-forge/label/numpy_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -34,6 +34,8 @@ python:
- 3.9.* *_73_pypy
python_impl:
- pypy
qhull:
- '2020.2'
target_platform:
- linux-aarch64
tk:
Expand All @@ -47,4 +49,4 @@ zip_keys:
- numpy
- python_impl
zlib:
- '1.2'
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cdt_arch:
cdt_name:
- cos7
channel_sources:
- conda-forge/label/numpy_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -34,6 +34,8 @@ python:
- 3.10.* *_cpython
python_impl:
- cpython
qhull:
- '2020.2'
target_platform:
- linux-aarch64
tk:
Expand All @@ -47,4 +49,4 @@ zip_keys:
- numpy
- python_impl
zlib:
- '1.2'
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cdt_arch:
cdt_name:
- cos7
channel_sources:
- conda-forge/label/numpy_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -34,6 +34,8 @@ python:
- 3.11.* *_cpython
python_impl:
- cpython
qhull:
- '2020.2'
target_platform:
- linux-aarch64
tk:
Expand All @@ -47,4 +49,4 @@ zip_keys:
- numpy
- python_impl
zlib:
- '1.2'
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cdt_arch:
cdt_name:
- cos7
channel_sources:
- conda-forge/label/numpy_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -34,6 +34,8 @@ python:
- 3.12.* *_cpython
python_impl:
- cpython
qhull:
- '2020.2'
target_platform:
- linux-aarch64
tk:
Expand All @@ -47,4 +49,4 @@ zip_keys:
- numpy
- python_impl
zlib:
- '1.2'
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cdt_arch:
cdt_name:
- cos7
channel_sources:
- conda-forge/label/numpy_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -34,6 +34,8 @@ python:
- 3.9.* *_cpython
python_impl:
- cpython
qhull:
- '2020.2'
target_platform:
- linux-aarch64
tk:
Expand All @@ -47,4 +49,4 @@ zip_keys:
- numpy
- python_impl
zlib:
- '1.2'
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_stdlib_version:
cdt_name:
- cos7
channel_sources:
- conda-forge/label/numpy_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -30,6 +30,8 @@ python:
- 3.8.* *_cpython
python_impl:
- cpython
qhull:
- '2020.2'
target_platform:
- linux-ppc64le
zip_keys:
Expand All @@ -41,4 +43,4 @@ zip_keys:
- numpy
- python_impl
zlib:
- '1.2'
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_stdlib_version:
cdt_name:
- cos7
channel_sources:
- conda-forge/label/numpy_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -30,6 +30,8 @@ python:
- 3.9.* *_73_pypy
python_impl:
- pypy
qhull:
- '2020.2'
target_platform:
- linux-ppc64le
zip_keys:
Expand All @@ -41,4 +43,4 @@ zip_keys:
- numpy
- python_impl
zlib:
- '1.2'
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_stdlib_version:
cdt_name:
- cos7
channel_sources:
- conda-forge/label/numpy_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -30,6 +30,8 @@ python:
- 3.10.* *_cpython
python_impl:
- cpython
qhull:
- '2020.2'
target_platform:
- linux-ppc64le
zip_keys:
Expand All @@ -41,4 +43,4 @@ zip_keys:
- numpy
- python_impl
zlib:
- '1.2'
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ c_stdlib_version:
cdt_name:
- cos7
channel_sources:
- conda-forge/label/numpy_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -30,6 +30,8 @@ python:
- 3.11.* *_cpython
python_impl:
- cpython
qhull:
- '2020.2'
target_platform:
- linux-ppc64le
zip_keys:
Expand All @@ -41,4 +43,4 @@ zip_keys:
- numpy
- python_impl
zlib:
- '1.2'
- '1'
Loading