From 36d9ebc96c9087d8e547849d0b7197cb335bcdde Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Aug 12 2022 21:49:26 +0000 Subject: Allow setuptools-scm 7 --- diff --git a/0001-matplotlibrc-path-search-fix.patch b/0001-matplotlibrc-path-search-fix.patch index 1078d15..b93aea7 100644 --- a/0001-matplotlibrc-path-search-fix.patch +++ b/0001-matplotlibrc-path-search-fix.patch @@ -1,7 +1,7 @@ From a2d7ef7b895d3b0bc9654d31c6cb40935eec0ce9 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 27 Sep 2017 19:35:59 -0400 -Subject: [PATCH 1/3] matplotlibrc path search fix +Subject: [PATCH 1/4] matplotlibrc path search fix Signed-off-by: Elliott Sales de Andrade --- diff --git a/0002-Set-FreeType-version-to-2.12.1-and-update-tolerances.patch b/0002-Set-FreeType-version-to-2.12.1-and-update-tolerances.patch index 2c5688f..7d43b7b 100644 --- a/0002-Set-FreeType-version-to-2.12.1-and-update-tolerances.patch +++ b/0002-Set-FreeType-version-to-2.12.1-and-update-tolerances.patch @@ -1,7 +1,7 @@ From 70e97e4ede29ccc16bad1d329d08b27d753a8f00 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 14 Feb 2020 06:05:42 -0500 -Subject: [PATCH 2/3] Set FreeType version to 2.12.1 and update tolerances. +Subject: [PATCH 2/4] Set FreeType version to 2.12.1 and update tolerances. Signed-off-by: Elliott Sales de Andrade --- diff --git a/0003-Increase-a-few-test-tolerances-on-some-arches.patch b/0003-Increase-a-few-test-tolerances-on-some-arches.patch index 2fdd77a..81ca69a 100644 --- a/0003-Increase-a-few-test-tolerances-on-some-arches.patch +++ b/0003-Increase-a-few-test-tolerances-on-some-arches.patch @@ -1,7 +1,7 @@ From 5fcd96777ede1f29bc3f749d12152879a4d67fdf Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 24 Aug 2021 04:47:50 -0400 -Subject: [PATCH 3/3] Increase a few test tolerances on some arches. +Subject: [PATCH 3/4] Increase a few test tolerances on some arches. Signed-off-by: Elliott Sales de Andrade --- diff --git a/0004-Remove-setuptools_scm_git_archive-dependency.patch b/0004-Remove-setuptools_scm_git_archive-dependency.patch new file mode 100644 index 0000000..7079ddf --- /dev/null +++ b/0004-Remove-setuptools_scm_git_archive-dependency.patch @@ -0,0 +1,36 @@ +From 804a868268056f01ac81906f311b61f4af480d92 Mon Sep 17 00:00:00 2001 +From: Oscar Gustafsson +Date: Mon, 4 Jul 2022 12:38:08 +0200 +Subject: [PATCH 4/4] Remove setuptools_scm_git_archive dependency + +Signed-off-by: Elliott Sales de Andrade +--- + setup.py | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index 17bb7481d2..9840c16601 100644 +--- a/setup.py ++++ b/setup.py +@@ -316,8 +316,7 @@ setup( # Finally, pass this all along to setuptools to do the heavy lifting. + setup_requires=[ + "certifi>=2020.06.20", + "numpy>=1.17", +- "setuptools_scm>=4,<7", +- "setuptools_scm_git_archive", ++ "setuptools_scm>=7", + ], + install_requires=[ + "cycler>=0.10", +@@ -330,7 +329,7 @@ setup( # Finally, pass this all along to setuptools to do the heavy lifting. + "python-dateutil>=2.7", + ] + ( + # Installing from a git checkout that is not producing a wheel. +- ["setuptools_scm>=4,<7"] if ( ++ ["setuptools_scm>=7"] if ( + Path(__file__).with_name(".git").exists() and + os.environ.get("CIBUILDWHEEL", "0") != "1" + ) else [] +-- +2.36.1 + diff --git a/python-matplotlib.spec b/python-matplotlib.spec index 3216333..30dbffc 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -57,6 +57,9 @@ Patch1001: 0001-matplotlibrc-path-search-fix.patch Patch1002: 0002-Set-FreeType-version-to-%{ftver}-and-update-tolerances.patch Patch1003: 0003-Increase-a-few-test-tolerances-on-some-arches.patch +# https://github.com/matplotlib/matplotlib/pull/23387 +Patch0001: 0004-Remove-setuptools_scm_git_archive-dependency.patch + BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: glibc-langpack-en @@ -293,6 +296,9 @@ cp -p %{SOURCE1} mplsetup.cfg %patch1003 -p1 +# Backports +%patch0001 -p1 + %generate_buildrequires %pyproject_buildrequires -r