Merge remote-tracking branch 'upstream/main' into roll-angle-units

MischaMegens2 · MischaMegens2 · commit 50a18466d8eb · 2024-05-22T12:02:27.000-07:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -103,7 +103,7 @@ commands:
       - run:
           name: Install Python dependencies
           command: |
-            python -m pip install --user meson-python numpy pybind11 setuptools-scm
+            python -m pip install --user -r requirements/dev/build-requirements.txt
             python -m pip install --user \
                 numpy<< parameters.numpy_version >> \
                 -r requirements/doc/doc-requirements.txt
diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
@@ -105,6 +105,7 @@ jobs:
       CIBW_SKIP: "*-musllinux_aarch64"
       CIBW_TEST_COMMAND: >-
         python {package}/ci/check_version_number.py
+      MACOSX_DEPLOYMENT_TARGET: "10.12"
       MPL_DISABLE_FH4: "yes"
     strategy:
       matrix:
@@ -115,16 +116,10 @@ jobs:
             cibw_archs: "aarch64"
           - os: windows-latest
             cibw_archs: "auto64"
-          - os: macos-11
+          - os: macos-12
             cibw_archs: "x86_64"
-            # NOTE: macos_target can be moved back into global environment after
-            # meson-python 0.16.0 is released.
-            macos_target: "10.12"
           - os: macos-14
             cibw_archs: "arm64"
-            # NOTE: macos_target can be moved back into global environment after
-            # meson-python 0.16.0 is released.
-            macos_target: "11.0"
 
     steps:
       - name: Set up QEMU
@@ -146,7 +141,6 @@ jobs:
         env:
           CIBW_BUILD: "cp312-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-          MACOSX_DEPLOYMENT_TARGET: "${{ matrix.macos_target }}"
 
       - name: Build wheels for CPython 3.11
         uses: pypa/cibuildwheel@711a3d017d0729f3edde18545fee967f03d65f65  # v2.18.0
@@ -155,7 +149,6 @@ jobs:
         env:
           CIBW_BUILD: "cp311-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-          MACOSX_DEPLOYMENT_TARGET: "${{ matrix.macos_target }}"
 
       - name: Build wheels for CPython 3.10
         uses: pypa/cibuildwheel@711a3d017d0729f3edde18545fee967f03d65f65  # v2.18.0
@@ -164,7 +157,6 @@ jobs:
         env:
           CIBW_BUILD: "cp310-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-          MACOSX_DEPLOYMENT_TARGET: "${{ matrix.macos_target }}"
 
       - name: Build wheels for CPython 3.9
         uses: pypa/cibuildwheel@711a3d017d0729f3edde18545fee967f03d65f65  # v2.18.0
@@ -173,7 +165,6 @@ jobs:
         env:
           CIBW_BUILD: "cp39-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-          MACOSX_DEPLOYMENT_TARGET: "${{ matrix.macos_target }}"
 
       - name: Build wheels for PyPy
         uses: pypa/cibuildwheel@711a3d017d0729f3edde18545fee967f03d65f65  # v2.18.0
@@ -182,7 +173,6 @@ jobs:
         env:
           CIBW_BUILD: "pp39-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-          MACOSX_DEPLOYMENT_TARGET: "${{ matrix.macos_target }}"
         if: matrix.cibw_archs != 'aarch64'
 
       - uses: actions/upload-artifact@v4
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -32,7 +32,6 @@ jobs:
         uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
-          setup-python-dependencies: false
 
       - name: Build compiled code
         if: matrix.language == 'c-cpp'
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -135,7 +135,7 @@ stages:
 
           - bash: |
               python -m pip install --upgrade pip
-              python -m pip install --upgrade meson-python numpy pybind11 setuptools-scm
+              python -m pip install --upgrade -r requirements/dev/build-requirements.txt
               python -m pip install -r requirements/testing/all.txt -r requirements/testing/extra.txt
             displayName: 'Install dependencies with pip'
 
diff --git a/doc/api/prev_api_changes/api_changes_3.5.0/development.rst b/doc/api/prev_api_changes/api_changes_3.5.0/development.rst
@@ -77,6 +77,6 @@ In order to avoid conflicting with the use of :file:`setup.cfg` by
 ``setup.cfg`` to ``mplsetup.cfg``.  The :file:`setup.cfg.template` has been
 correspondingly been renamed to :file:`mplsetup.cfg.template`.
 
-Note that the path to this configuration file can still be set via the
-:envvar:`MPLSETUPCFG` environment variable, which allows one to keep using the
-same file before and after this change.
+Note that the path to this configuration file can still be set via the ``MPLSETUPCFG``
+environment variable, which allows one to keep using the same file before and after this
+change.
diff --git a/doc/install/environment_variables_faq.rst b/doc/install/environment_variables_faq.rst
@@ -29,13 +29,6 @@ Environment variables
   used to find a base directory in which the :file:`matplotlib` subdirectory is
   created.
 
-.. envvar:: MPLSETUPCFG
-
-   This optional variable can be set to the full path of a :file:`mplsetup.cfg`
-   configuration file used to customize the Matplotlib build.  By default, a
-   :file:`mplsetup.cfg` file in the root of the Matplotlib source tree will be
-   read.  Supported build options are listed in :file:`mplsetup.cfg.template`.
-
 .. envvar:: PATH
 
   The list of directories searched to find executable programs.
diff --git a/doc/install/index.rst b/doc/install/index.rst
@@ -121,22 +121,20 @@ Before trying to install Matplotlib, please install the :ref:`dependencies`.
 To build from a tarball, download the latest *tar.gz* release
 file from `the PyPI files page <https://pypi.org/project/matplotlib/>`_.
 
-We provide a `mplsetup.cfg`_ file which you can use to customize the build
-process. For example, which default backend to use, whether some of the
-optional libraries that Matplotlib ships with are installed, and so on. This
-file will be particularly useful to those packaging Matplotlib.
-
-.. _mplsetup.cfg: https://raw.githubusercontent.com/matplotlib/matplotlib/main/mplsetup.cfg.template
-
 If you are building your own Matplotlib wheels (or sdists) on Windows, note
 that any DLLs that you copy into the source tree will be packaged too.
 
-
 Configure build and behavior defaults
 =====================================
 
-Aspects of the build and install process and some behaviorial defaults of the
-library can be configured via:
+We provide a `meson.options`_ file containing options with which you can use to
+customize the build process. For example, which default backend to use, whether some of
+the optional libraries that Matplotlib ships with are installed, and so on. These
+options will be particularly useful to those packaging Matplotlib.
+
+.. _meson.options: https://github.com/matplotlib/matplotlib/blob/main/meson.options
+
+Aspects of some behaviorial defaults of the library can be configured via:
 
 .. toctree::
   :maxdepth: 2
diff --git a/lib/matplotlib/backends/_backend_tk.py b/lib/matplotlib/backends/_backend_tk.py
@@ -44,7 +44,7 @@ def _restore_foreground_window_at_end():
     try:
         yield
     finally:
-        if mpl.rcParams['tk.window_focus']:
+        if foreground and mpl.rcParams['tk.window_focus']:
             _c_internal_utils.Win32_SetForegroundWindow(foreground)
 
 
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -983,30 +983,42 @@ def figure(
     `~matplotlib.rcParams` defines the default values, which can be modified
     in the matplotlibrc file.
     """
+    allnums = get_fignums()
+
     if isinstance(num, FigureBase):
         # type narrowed to `Figure | SubFigure` by combination of input and isinstance
         if num.canvas.manager is None:
             raise ValueError("The passed figure is not managed by pyplot")
+        elif any([figsize, dpi, facecolor, edgecolor, not frameon,
+                  kwargs]) and num.canvas.manager.num in allnums:
+            _api.warn_external(
+                "Ignoring specified arguments in this call "
+                f"because figure with num: {num.canvas.manager.num} already exists")
         _pylab_helpers.Gcf.set_active(num.canvas.manager)
         return num.figure
 
-    allnums = get_fignums()
     next_num = max(allnums) + 1 if allnums else 1
     fig_label = ''
     if num is None:
         num = next_num
-    elif isinstance(num, str):
-        fig_label = num
-        all_labels = get_figlabels()
-        if fig_label not in all_labels:
-            if fig_label == 'all':
-                _api.warn_external("close('all') closes all existing figures.")
-            num = next_num
-        else:
-            inum = all_labels.index(fig_label)
-            num = allnums[inum]
     else:
-        num = int(num)  # crude validation of num argument
+        if any([figsize, dpi, facecolor, edgecolor, not frameon,
+                kwargs]) and num in allnums:
+            _api.warn_external(
+                "Ignoring specified arguments in this call "
+                f"because figure with num: {num} already exists")
+        if isinstance(num, str):
+            fig_label = num
+            all_labels = get_figlabels()
+            if fig_label not in all_labels:
+                if fig_label == 'all':
+                    _api.warn_external("close('all') closes all existing figures.")
+                num = next_num
+            else:
+                inum = all_labels.index(fig_label)
+                num = allnums[inum]
+        else:
+            num = int(num)  # crude validation of num argument
 
     # Type of "num" has narrowed to int, but mypy can't quite see it
     manager = _pylab_helpers.Gcf.get_fig_manager(num)  # type: ignore[arg-type]
diff --git a/lib/matplotlib/tests/test_pyplot.py b/lib/matplotlib/tests/test_pyplot.py
@@ -457,3 +457,22 @@ def test_figure_hook():
         fig = plt.figure()
 
     assert fig._test_was_here
+
+
+def test_multiple_same_figure_calls():
+    fig = mpl.pyplot.figure(1, figsize=(1, 2))
+    with pytest.warns(UserWarning, match="Ignoring specified arguments in this call"):
+        fig2 = mpl.pyplot.figure(1, figsize=(3, 4))
+    with pytest.warns(UserWarning, match="Ignoring specified arguments in this call"):
+        mpl.pyplot.figure(fig, figsize=(5, 6))
+    assert fig is fig2
+    fig3 = mpl.pyplot.figure(1)  # Checks for false warnings
+    assert fig is fig3
+
+
+def test_close_all_warning():
+    fig1 = plt.figure()
+
+    # Check that the warning is issued when 'all' is passed to plt.figure
+    with pytest.warns(UserWarning, match="closes all existing figures"):
+        fig2 = plt.figure("all")
diff --git a/pyproject.toml b/pyproject.toml
@@ -95,7 +95,6 @@ install = ['--tags=data,python-runtime,runtime']
 [tool.setuptools_scm]
 version_scheme = "release-branch-semver"
 local_scheme = "node-and-date"
-write_to = "lib/matplotlib/_version.py"
 parentdir_prefix_version = "matplotlib-"
 fallback_version = "0.0+UNKNOWN"
 
diff --git a/requirements/dev/build-requirements.txt b/requirements/dev/build-requirements.txt
@@ -0,0 +1,4 @@
+pybind11
+meson-python
+numpy
+setuptools-scm
diff --git a/requirements/dev/dev-requirements.txt b/requirements/dev/dev-requirements.txt
@@ -1,3 +1,4 @@
+-r build-requirements.txt
 -r ../doc/doc-requirements.txt
 -r ../testing/all.txt
 -r ../testing/extra.txt
diff --git a/src/_c_internal_utils.cpp b/src/_c_internal_utils.cpp
@@ -111,7 +111,11 @@ static py::object
 mpl_GetForegroundWindow(void)
 {
 #ifdef _WIN32
-  return py::capsule(GetForegroundWindow(), "HWND");
+  if (HWND hwnd = GetForegroundWindow()) {
+    return py::capsule(hwnd, "HWND");
+  } else {
+    return py::none();
+  }
 #else
   return py::none();
 #endif
diff --git a/src/checkdep_freetype2.c b/src/checkdep_freetype2.c
@@ -1,7 +1,7 @@
 #ifdef __has_include
   #if !__has_include(<ft2build.h>)
     #error "FreeType version 2.3 or higher is required. \
-You may unset the system_freetype entry in mplsetup.cfg to let Matplotlib download it."
+You may set the system-freetype Meson build option to false to let Matplotlib download it."
   #endif
 #endif
 
@@ -15,5 +15,5 @@ You may unset the system_freetype entry in mplsetup.cfg to let Matplotlib downlo
   XSTR(FREETYPE_MAJOR) "." XSTR(FREETYPE_MINOR) "." XSTR(FREETYPE_PATCH) ".")
 #if FREETYPE_MAJOR << 16 + FREETYPE_MINOR << 8 + FREETYPE_PATCH < 0x020300
   #error "FreeType version 2.3 or higher is required. \
-You may unset the system_freetype entry in mplsetup.cfg to let Matplotlib download it."
+You may set the system-freetype Meson build option to false to let Matplotlib download it."
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+-r build-requirements.txt`
`1`	`2`	`-r ../doc/doc-requirements.txt`
`2`	`3`	`-r ../testing/all.txt`
`3`	`4`	`-r ../testing/extra.txt`