From 13fe1cfe16b0dae49956ff59dd7c34d7f41613ab Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 16 Nov 2023 20:12:47 -0500 Subject: [PATCH 1/3] Upgrade setuptools on Azure The pre-installed one causes conflicts for setuptools_scm. --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a9b080ed7efc..ad23b7cc9d25 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -124,7 +124,7 @@ stages: displayName: 'Install dependencies' - bash: | - python -m pip install --upgrade pip + python -m pip install --upgrade pip setuptools python -m pip install -r requirements/testing/all.txt -r requirements/testing/extra.txt || [[ "$PYTHON_VERSION" = 'Pre' ]] displayName: 'Install dependencies with pip' From b349cbee84db30cf0a13b720ef3b390fa7fa29c6 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 16 Nov 2023 20:14:43 -0500 Subject: [PATCH 2/3] Pin NumPy on PyPy builds --- .github/workflows/cibuildwheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index 83b79f327ce8..6bdbb826f429 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -163,7 +163,7 @@ jobs: CIBW_SKIP: "*-musllinux*" CIBW_BEFORE_BUILD: >- pip install certifi "Cython>=0.29.34,<3.0" "pybind11>=2.6" "setuptools>=42" "setuptools_scm>=7" && - pip install "numpy>=1.25" && + pip install "numpy~=1.25.0" && git clean -fxd build CIBW_BEFORE_BUILD_WINDOWS: >- pip install certifi delvewheel "pybind11>=2.6" "setuptools>=42" "setuptools_scm>=7" && From 0506a5cb932284e5222bc62ec7b45244082be063 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 16 Nov 2023 20:21:11 -0500 Subject: [PATCH 3/3] Trim some trailing whitespace --- doc/users/github_stats.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/users/github_stats.rst b/doc/users/github_stats.rst index 97cef8185592..1be1fc76f15f 100644 --- a/doc/users/github_stats.rst +++ b/doc/users/github_stats.rst @@ -88,7 +88,7 @@ Issues (14): * :ghissue:`26732`: [ENH]: Parser errors should mention that commands do not exist * :ghissue:`26497`: [Bug]: AttributeError: 'Path3DCollection' object has no attribute '_offset_zordered' (possible regression) * :ghissue:`26588`: [Bug]: Tick class instantiation returns an error when labelcolor is a tuple -* :ghissue:`26421`: [Doc]: demo testing comparison decorator +* :ghissue:`26421`: [Doc]: demo testing comparison decorator * :ghissue:`26486`: [Doc]: match 3D plot types listings titles to other titles * :ghissue:`26560`: [Doc]: ncols parameter hard-coded * :ghissue:`26553`: [TST] Upcoming dependency test failures @@ -97,7 +97,7 @@ Issues (14): * :ghissue:`26152`: [Bug]: Pyparsing 3.1 breaks tests * :ghissue:`26336`: [Doc]: GPL compatibility * :ghissue:`19721`: head size of FancyArrowPatch is "invisibly small" by default -* :ghissue:`26290`: [Bug]: calling fig.tight_layout multiple times +* :ghissue:`26290`: [Bug]: calling fig.tight_layout multiple times * :ghissue:`26287`: [Bug]: Error while creating inset axes using ``mpl_toolkits.axes_grid1.inset_locator.inset_axes``