python3-matplotlib: Upgrade to 3.6.3

Forward port the disable download patch
Location of license changed inside setup.py

Signed-off-by: Khem Raj <raj.khem@gmail.com>

1 files changed, 20 insertions, 6 deletions

diff --git a/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch b/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch
index 25c49afb97..899cac624a 100644
--- a/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch
+++ b/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch
@@ -6,18 +6,32 @@ Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
 
 --- a/setup.py
 +++ b/setup.py
-@@ -316,8 +316,6 @@ setup(  # Finally, pass this all along t
+@@ -303,7 +303,6 @@ setup(  # Finally, pass this all along t
      setup_requires=[
          "certifi>=2020.06.20",
-         "numpy>=1.17",
--        "setuptools_scm>=4,<7",
--        "setuptools_scm_git_archive",
+         "numpy>=1.19",
+-        "setuptools_scm>=7",
      ],
      install_requires=[
-         "cycler>=0.10",
+         "contourpy>=1.0.1",
+@@ -315,13 +314,7 @@ setup(  # Finally, pass this all along t
+         "pillow>=6.2.0",
+         "pyparsing>=2.2.1",
+         "python-dateutil>=2.7",
+-    ] + (
+-        # Installing from a git checkout that is not producing a wheel.
+-        ["setuptools_scm>=7"] if (
+-            Path(__file__).with_name(".git").exists() and
+-            os.environ.get("CIBUILDWHEEL", "0") != "1"
+-        ) else []
+-    ),
++    ],
+     use_scm_version={
+         "version_scheme": "release-branch-semver",
+         "local_scheme": "node-and-date",
 --- a/setupext.py
 +++ b/setupext.py
-@@ -64,40 +64,7 @@ def get_from_cache_or_download(url, sha)
+@@ -65,40 +65,7 @@ def get_from_cache_or_download(url, sha)
      BytesIO
          The file loaded into memory.
      """