8000 Merge branch v3.9.x into main by QuLogic · Pull Request #28143 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]

Skip to content

Merge branch v3.9.x into main #28143

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

Merged
merged 44 commits into from
Apr 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
4dcfcf8
Zenodo for v3.8.4
ksunden Apr 4, 2024
4beb1c4
Merge branch 'v3.8.4-doc' into v3.9.x
QuLogic Apr 5, 2024
e3062cb
DOC: Prepare release notes for 3.9.0rc1
QuLogic Apr 5, 2024
3a1bc7d
REL: v3.9.0rc1
QuLogic Apr 5, 2024
3b2522c
BLD: bump branch away from tag
QuLogic Apr 5, 2024
122a58a
Backport PR #28026: [DOC] reshuffle of contributing
timhoffm Apr 6, 2024
5dffb5b
Merge pull request #28035 from meeseeksmachine/auto-backport-of-pr-28…
rcomer Apr 6, 2024
a9e5ee3
Backport PR #28023: ci: Update merge conflict labeler
dstansby Apr 7, 2024
03c94a2
Merge pull request #28038 from meeseeksmachine/auto-backport-of-pr-28…
rcomer Apr 7, 2024
a47be77
Backport PR #28036: BLD: Fetch version from setuptools_scm at build time
QuLogic Apr 9, 2024
5de06ef
Merge pull request #28049 from meeseeksmachine/auto-backport-of-pr-28…
tacaswell Apr 9, 2024
29c15c3
DOC: Prepare release notes for 3.9.0rc2
QuLogic Apr 9, 2024
eb1db59
REL: v3.9.0rc2
QuLogic Apr 9, 2024
ad64904
BLD: bump branch away from tag
QuLogic Apr 9, 2024
28ab92e
Backport PR #28056: Strip trailing spaces from log-formatter cursor o…
timhoffm Apr 12, 2024
8824ac6
Backport PR #28055: DOC: Improve inverted axis example
rcomer Apr 12, 2024
2ae90bd
Merge pull request #28063 from meeseeksmachine/auto-backport-of-pr-28…
rcomer Apr 12, 2024
7120b5a
Merge pull request #28062 from meeseeksmachine/auto-backport-of-pr-28…
rcomer Apr 13, 2024
4c14098
Backport PR #28077: Parent tk StringVar to the canvas widget, not to …
timhoffm Apr 15, 2024
37fbeb8
Backport PR #28078: Clarify that findfont & _find_fonts_by_props retu…
tacaswell Apr 15, 2024
9fadef9
Backport PR #28087: Document Qt5 minimal version.
timhoffm Apr 16, 2024
e72d98a
Merge pull request #28088 from meeseeksmachine/auto-backport-of-pr-28…
tacaswell Apr 16, 2024
87ca287
Backport PR #28032: FIX: ensure images are C order before passing to …
oscargus Apr 17, 2024
f7aafc5
Merge pull request #28092 from meeseeksmachine/auto-backport-of-pr-28…
ksunden Apr 17, 2024
2b58476
Merge pull request #28080 from meeseeksmachine/auto-backport-of-pr-28…
ksunden Apr 17, 2024
3c00570
Merge pull request #28081 from meeseeksmachine/auto-backport-of-pr-28…
ksunden Apr 17, 2024
2ea48d3
Backport PR #28094: DOC: exclude sphinx 7.3.*
jklymak Apr 17, 2024
2410b38
Merge pull request #28095 from meeseeksmachine/auto-backport-of-pr-28…
ksunden Apr 18, 2024
df5ccce
Backport PR #28107: [DOC] Fix description in CapStyle example
timhoffm Apr 19, 2024
877ad96
Merge pull request #28108 from meeseeksmachine/auto-backport-of-pr-28…
timhoffm Apr 19, 2024
077e643
Backport PR #28100: TST: wxcairo sometimes raises OSError on missing …
timhoffm Apr 19, 2024
e92c098
Merge pull request #28109 from meeseeksmachine/auto-backport-of-pr-28…
tacaswell Apr 22, 2024
92fc90d
Backport PR #28102: Fix typo in color mapping documentation in quick_…
tacaswell Apr 19, 2024
282e58a
Backport PR #28085: Clarify that the pgf backend is never actually us…
timhoffm Apr 16, 2024
5f7dbba
Merge pull request #28120 from meeseeksmachine/auto-backport-of-pr-28…
QuLogic Apr 23, 2024
9b88c14
Merge pull request #28121 from meeseeksmachine/auto-backport-of-pr-28…
QuLogic Apr 23, 2024
03b2383
Backport PR #28134: DOC: Minor improvements on quickstart
timhoffm Apr 25, 2024
479ff82
Merge pull request #28135 from meeseeksmachine/auto-backport-of-pr-28…
timhoffm Apr 25, 2024
db8abc2
Backport PR #28068: [TYP] Add possible type hint to `colors` argument…
ksunden Apr 25, 2024
191b339
Backport PR #28136: Appease pycodestyle.
oscargus Apr 25, 2024
3005cd5
Backport PR #27960: Update AppVeyor config
ksunden Apr 25, 2024
b8416d6
Merge pull request #28140 from meeseeksmachine/auto-backport-of-pr-28…
QuLogic Apr 26, 2024
008e327
Merge pull request #28138 from meeseeksmachine/auto-backport-of-pr-28…
QuLogic Apr 26, 2024
8b796c4
Merge pull request #28141 from meeseeksmachine/auto-backport-of-pr-27…
QuLogic Apr 26, 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
10 changes: 4 additions & 6 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,9 @@ environment:
--cov-report= --cov=lib --log-level=DEBUG

matrix:
- PYTHON_VERSION: "3.9"
- PYTHON_VERSION: "3.11"
CONDA_INSTALL_LOCN: "C:\\Miniconda3-x64"
TEST_ALL: "no"
- PYTHON_VERSION: "3.10"
CONDA_INSTALL_LOCN: "C:\\Miniconda3-x64"
TEST_ALL: "no"
TEST_ALL: "yes"

# We always use a 64-bit machine, but can build x86 distributions
# with the PYTHON_ARCH variable
Expand Down Expand Up @@ -77,7 +74,8 @@ test_script:
- '"%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd | findstr freetype.*.dll && exit /b 1 || exit /b 0'

# this are optional dependencies so that we don't skip so many tests...
- if x%TEST_ALL% == xyes conda install -q ffmpeg inkscape miktex
- if x%TEST_ALL% == xyes conda install -q ffmpeg inkscape
# miktex is available on conda, but seems to fail with permission errors.
# missing packages on conda-forge for imagemagick
# This install sometimes failed randomly :-(
# - choco install imagemagick
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ commands:
- run:
name: Install Python dependencies
command: |
python -m pip install --user meson-python pybind11
python -m pip install --user meson-python numpy pybind11 setuptools-scm
python -m pip install --user \
numpy<< parameters.numpy_version >> \
-r requirements/doc/doc-requirements.txt
Expand Down
1 change: 1 addition & 0 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ per-file-ignores =
lib/mpl_toolkits/axisartist/angle_helper.py: E221

doc/conf.py: E402
galleries/users_explain/quick_start.py: E402
galleries/users_explain/artists/paths.py: E402
galleries/users_explain/artists/patheffects_guide.py: E402
galleries/users_explain/artists/transforms_tutorial.py: E402, E501
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conflictcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check if PRs have merge conflicts
uses: eps1lon/actions-label-merge-conflict@releases/2.x
uses: eps1lon/actions-label-merge-conflict@e62d7a53ff8be8b97684bffb6cfbbf3fc1115e2e # v3.0.0
with:
dirtyLabel: "status: needs rebase"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ stages:

- bash: |
python -m pip install --upgrade pip
python -m pip i FB9E nstall --upgrade meson-python pybind11
python -m pip install --upgrade meson-python numpy pybind11 setuptools-scm
python -m pip install -r requirements/testing/all.txt -r requirements/testing/extra.txt
displayName: 'Install dependencies with pip'

Expand Down
13 changes: 9 additions & 4 deletions doc/_static/switcher.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
[
{
"name": "3.8 (stable)",
"version": "stable",
"url": "https://matplotlib.org/stable/"
"name": "3.9 (rc)",
"version": "rc",
"url": "https://matplotlib.org/3.9.0/"
},
{
"name": "3.9 (dev)",
"name": "3.10 (dev)",
"version": "dev",
"url": "https://matplotlib.org/devdocs/"
},
{
"name": "3.8",
"version": "3.8.4",
"url": "https://matplotlib.org/3.8.4/"
},
{
"name": "3.7",
"version": "3.7.5",
Expand Down
35 changes: 35 additions & 0 deletions doc/_static/zenodo_cache/10916799.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading
0