Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 100ca9b

Browse files
CozyFrogCozyFrog
authored
Merge branch 'matplotlib:main' into tst/dt-unit-test
2 parents c563085 + e394940 commit 100ca9b

File tree

15 files changed

+1000
-246
lines changed

15 files changed

+1000
-246
lines changed

‎.github/workflows/cibuildwheel.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -143,20 +143,6 @@ jobs:
143143
env:
144144
CIBW_BUILD: "cp312-*"
145145
CIBW_ARCHS: ${{ matrix.cibw_archs }}
146-
# Remove this once NumPy with Python 3.12 wheels is not pre-release.
147-
CIBW_BEFORE_BUILD: >-
148-
pip install "meson-python>=0.13.1" ninja "pybind11>=2.6" "setuptools>=42" "setuptools_scm>=7" &&
149-
pip install --pre "numpy>=1.25" &&
150-
rm -rf {package}/build
151-
CIBW_BEFORE_BUILD_WINDOWS: >-
152-
pip install delvewheel "meson-python>=0.13.1" ninja "pybind11>=2.6" "setuptools>=42" "setuptools_scm>=7" &&
153-
pip install --pre "numpy>=1.25" &&
154-
rm -rf {package}/build
155-
CIBW_ENVIRONMENT: PIP_NO_BUILD_ISOLATION=0
156-
# Remove this once contourpy has Python 3.12 wheels.
157-
CIBW_BEFORE_TEST: >-
158-
pip install "meson>=1.2.0" "meson-python>=0.13.1" "ninja" "pybind11>=2.10.4" &&
159-
pip install --pre "numpy>=1.25"
160146

161147
- name: Build wheels for CPython 3.11
162148
uses: pypa/cibuildwheel@fff9ec32ed25a9c576750c91e06b410ed0c15db7 # v2.16.2

‎.github/workflows/reviewdog.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ jobs:
6565
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6666
run: |
6767
set -o pipefail
68-
# The --ignore-missing-imports can be removed when typed cycler is released and used
6968
mypy --config pyproject.toml lib/matplotlib \
70-
--ignore-missing-imports \
7169
--follow-imports silent | \
7270
reviewdog -f=mypy -name=mypy \
7371
-tee -reporter=github-check -filter-mode nofilter

‎.github/workflows/tests.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,8 @@ jobs:
7777
pyside6-ver: '!=6.5.1'
7878
extra-requirements: '-r requirements/testing/extra.txt'
7979
- os: ubuntu-22.04
80-
python-version: '3.12-dev'
80+
python-version: '3.12'
8181
pyside6-ver: '!=6.5.1'
82-
pre: true
8382
- os: macos-latest
8483
python-version: 3.9
8584
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
@@ -196,10 +195,8 @@ jobs:
196195
python -m pip install --upgrade pip setuptools wheel
197196
198197
# Install pre-release versions during our weekly upcoming dependency tests.
199-
# Also install for 3.12 to get working NumPy (remove when 1.26 is released)
200-
if [[ "${{ github.event_name == 'schedule' &&
201-
matrix.name-suffix != '(Minimum Versions)' }}" = "true"
202-
|| "${{ matrix.pre }}" = "true" ]]; then
198+
if [[ "${{ github.event_name }}" == 'schedule'
199+
&& "${{ matrix.name-suffix }}" != '(Minimum Versions)' ]]; then
203200
PRE="--pre"
204201
fi
205202
@@ -241,7 +238,7 @@ jobs:
241238
echo 'PyQt5 is available' ||
242239
echo 'PyQt5 is not available'
243240
if [[ "${{ runner.os }}" != 'macOS'
244-
&& "${{ matrix.python-version != '3.12-dev'}}" = "true" ]]; then
241+
&& "${{ matrix.python-version }}" != '3.12' ]]; then
245242
python -mpip install --upgrade pyside2${{ matrix.pyside2-ver }} &&
246243
python -c 'import PySide2.QtCore' &&
247244
echo 'PySide2 is available' ||
@@ -254,14 +251,14 @@ jobs:
254251
echo 'PyQt6 is not available'
255252
fi
256253
if [[ "${{ runner.os }}" != 'macOS'
257-
&& "${{ matrix.python-version != '3.12-dev'}}" = "true" ]]; then
254+
&& "${{ matrix.python-version }}" != '3.12' ]]; then
258255
python -mpip install --upgrade pyside6${{ matrix.pyside6-ver }} &&
259256
python -c 'import PySide6.QtCore' &&
260257
echo 'PySide6 is available' ||
261258
echo 'PySide6 is not available'
262259
fi
263260
264-
if [[ "${{ matrix.python-version != '3.12-dev'}}" = "true" ]]; then
261+
if [[ "${{ matrix.python-version }}" != '3.12' ]]; then
265262
python -mpip install --upgrade \
266263
-f "https://extras.wxpython.org/wxPython4/extras/linux/gtk3/${{ matrix.os }}" \
267264
wxPython &&

‎.pre-commit-config.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,23 @@ repos:
2626
- id: no-commit-to-branch #default is master and main
2727
- id: trailing-whitespace
2828
exclude_types: [svg]
29+
- repo: https://github.com/pre-commit/mirrors-mypy
30+
rev: v1.1.1
31+
hooks:
32+
- id: mypy
33+
additional_dependencies: [
34+
pandas-stubs,
35+
types-pillow,
36+
types-python-dateutil,
37+
types-psutil,
38+
types-docutils,
39+
types-PyYAML]
40+
args: [
41+
"--config-file=pyproject.toml",
42+
"lib/matplotlib"
43+
]
44+
files: lib/matplotlib #only run when files in lib/matplotlib are changed
45+
pass_filenames: false
2946
- repo: https://github.com/pycqa/flake8
3047
rev: 6.0.0
3148
hooks:

‎doc/api/next_api_changes/removals/26889-GC.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Removing Deprecated API SimpleEvent
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
``matplotlib.patches.ConnectionStyle._Base.SimpleEvent``

‎galleries/examples/ticks/date_concise_formatter.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
"""
2+
.. _date_concise_formatter:
3+
24
================================================
35
Formatting date ticks using ConciseDateFormatter
46
================================================

‎galleries/examples/ticks/date_formatters_locators.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
"""
2+
.. _date_formatters_locators:
3+
24
=================================
35
Date tick locators and formatters
46
=================================

‎galleries/examples/units/basic_units.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
"""
2+
.. _basic_units:
3+
24
===========
35
Basic Units
46
===========

0 commit comments

Comments
 (0)