Notification time stamped 2023-03-01 01:04:01 UTC
From 2a84a18935b09688e56c5952da6e76473504fd9e Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Mar 01 2023 01:03:09 +0000
Subject: Fix tests with Matplotlib 3.7
---
diff --git a/0001-Remove-some-unavailable-test-dependencies.patch
b/0001-Remove-some-unavailable-test-dependencies.patch
index 22e7178..da91698 100644
--- a/0001-Remove-some-unavailable-test-dependencies.patch
+++ b/0001-Remove-some-unavailable-test-dependencies.patch
@@ -1,7 +1,7 @@
-From aca2bc24fa605ad85060108cd86292f9a607b5f0 Mon Sep 17 00:00:00 2001
+From e796490b4189fa22ba169a820831c99a4e9a2b37 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Sat, 11 Sep 2021 16:16:34 -0400
-Subject: [PATCH] Remove some unavailable test dependencies
+Subject: [PATCH 1/2] Remove some unavailable test dependencies
Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
---
@@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
-index cb83ebf..e8d1ab1 100644
+index cf6bf85..58bea4d 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup
@@ -22,5 +22,5 @@ index cb83ebf..e8d1ab1 100644
test_requires = ['pytest', 'pytest-mpl', 'scipy']
--
-2.35.1
+2.39.2
diff --git a/0002-Fix-tests-with-Matplotlib-3.7.patch
b/0002-Fix-tests-with-Matplotlib-3.7.patch
new file mode 100644
index 0000000..5b60f97
--- /dev/null
+++ b/0002-Fix-tests-with-Matplotlib-3.7.patch
@@ -0,0 +1,26 @@
+From 9708d32df2ff149a6f2110562128325490c97fa0 Mon Sep 17 00:00:00 2001
+From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
+Date: Tue, 28 Feb 2023 19:50:46 -0500
+Subject: [PATCH 2/2] Fix tests with Matplotlib 3.7
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
+---
+ tests/mixin_tests.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/mixin_tests.py b/tests/mixin_tests.py
+index a7b3b90..117b007 100644
+--- a/tests/mixin_tests.py
++++ b/tests/mixin_tests.py
+@@ -6,7 +6,7 @@ import geopandas as gpd
+ import unittest
+ import pytest
+ import matplotlib.pyplot as plt
+-from matplotlib.axes._subplots import SubplotBase
++from matplotlib.axes import SubplotBase
+ from matplotlib.cm import ScalarMappable
+ from matplotlib.colors import LinearSegmentedColormap, Normalize
+ import cartopy.crs as ccrs
+--
+2.39.2
+
diff --git a/python-geoplot.spec b/python-geoplot.spec
index 3f15ee8..c40f423 100644
--- a/python-geoplot.spec
+++ b/python-geoplot.spec
@@ -12,14 +12,16 @@ URL:
https://github.com/ResidentMario/geoplot
# PyPI tarball does not include tests.
Source0:
https://github.com/ResidentMario/%{srcname}/archive/%{version}/%{srcname}...
# Fedora specific
-Patch0001: 0001-Remove-some-unavailable-test-dependencies.patch
+Patch: 0001-Remove-some-unavailable-test-dependencies.patch
+#
https://github.com/ResidentMario/geoplot/pull/286
+Patch: 0002-Fix-tests-with-Matplotlib-3.7.patch
# Accommodate UserWarning not in geopandas 0.11
#
https://github.com/ResidentMario/geoplot/pull/285
# Fixes:
# Tests fail with geopandas 0.11
#
https://github.com/ResidentMario/geoplot/issues/283
#
https://bugzilla.redhat.com/show_bug.cgi?id=2148633
-Patch0002:
https://github.com/ResidentMario/%{srcname}/pull/285.patch
+Patch:
https://github.com/ResidentMario/%{srcname}/pull/285.patch
BuildArch: noarch
https://src.fedoraproject.org/rpms/python-geoplot/c/2a84a18935b09688e56c5...