Trac #34796: Upgrade matplotlib to 3.6

Release Manager · Release Manager · commit 325b7c119c0c · 2022-12-04T21:46:47.000+01:00
As matplotlib 3.6 dependency, new standard package `contourpy` is added. URL: https://trac.sagemath.org/34796 Reported by: mkoeppe Ticket author(s): Matthias Koeppe Reviewer(s): Kwankyu Lee
diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=c0c12f353202317c7d9f754366b05c56affe7040
-md5=02625465d51914409ce2a71bf125d38a
-cksum=2602640406
+sha1=2182ab811aa4bbed15ce26d64157e7fc973007cd
+md5=70f8ac127a92d707714053527eb06944
+cksum=2846814243
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-e22dd4276129d5473cc23a8ea2c3753e3213c17a
+4c696a60b4ffefe6e9a198cbb4bd7bf12823ef3a
diff --git a/build/pkgs/contourpy/SPKG.rst b/build/pkgs/contourpy/SPKG.rst
@@ -0,0 +1,18 @@
+contourpy: Python library for calculating contours of 2D quadrilateral grids
+============================================================================
+
+Description
+-----------
+
+Python library for calculating contours of 2D quadrilateral grids
+
+License
+-------
+
+BSD-3-Clause
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/contourpy/
+
diff --git a/build/pkgs/contourpy/checksums.ini b/build/pkgs/contourpy/checksums.ini
@@ -0,0 +1,5 @@
+tarball=contourpy-VERSION.tar.gz
+sha1=f8dac7a79be96e2b8f085f79ba386dba54e99e99
+md5=0ed85863802b1323708b400ae7e7bbd7
+cksum=2680473500
+upstream_url=https://pypi.io/packages/source/c/contourpy/contourpy-VERSION.tar.gz
diff --git a/build/pkgs/contourpy/dependencies b/build/pkgs/contourpy/dependencies
@@ -0,0 +1,4 @@
+$(PYTHON) | $(PYTHON_TOOLCHAIN) pybind11
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/contourpy/install-requires.txt b/build/pkgs/contourpy/install-requires.txt
@@ -0,0 +1 @@
+contourpy
diff --git a/build/pkgs/contourpy/package-version.txt b/build/pkgs/contourpy/package-version.txt
@@ -0,0 +1 @@
+1.0.6
diff --git a/build/pkgs/contourpy/spkg-install.in b/build/pkgs/contourpy/spkg-install.in
@@ -0,0 +1,2 @@
+cd src
+sdh_pip_install .
diff --git a/build/pkgs/contourpy/type b/build/pkgs/contourpy/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/matplotlib/checksums.ini b/build/pkgs/matplotlib/checksums.ini
@@ -1,5 +1,5 @@
 tarball=matplotlib-VERSION.tar.gz
-sha1=8db4a2bb5c5a56b4ff9a33b59d134404774d85d5
-md5=5a77336c6c5549bed5f9631c734dedc5
-cksum=602312637
+sha1=2b78c671f95d52c65154a0dc68372a97582768e5
+md5=77ca9a5b42152c9e2aeca1556f08f5ce
+cksum=3201608
 upstream_url=https://pypi.io/packages/source/m/matplotlib/matplotlib-VERSION.tar.gz
diff --git a/build/pkgs/matplotlib/dependencies b/build/pkgs/matplotlib/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) numpy freetype pillow dateutil pyparsing tornado six cycler qhull fonttools | $(PYTHON_TOOLCHAIN) kiwisolver certifi setuptools_scm_git_archive
+$(PYTHON) numpy freetype pillow dateutil pyparsing tornado six cycler qhull fonttools contourpy | $(PYTHON_TOOLCHAIN) kiwisolver certifi setuptools_scm_git_archive
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/matplotlib/package-version.txt b/build/pkgs/matplotlib/package-version.txt
@@ -1 +1 @@
-3.5.2
+3.6.2
diff --git a/build/pkgs/matplotlib_inline/checksums.ini b/build/pkgs/matplotlib_inline/checksums.ini
@@ -1,5 +1,5 @@
 tarball=matplotlib-inline-VERSION.tar.gz
-sha1=36cf63817e1e3df521c7aa8c2612f890b4ae7990
-md5=7af8f8ae6ea5217134dd7bd115c78ac3
-cksum=3542531131
+sha1=a09347e3f2eaa6f9453c773132bf4bd9d38e2163
+md5=aded9a57e2f526f76b3a4851d5528d4f
+cksum=3152771377
 upstream_url=https://pypi.io/packages/source/m/matplotlib_inline/matplotlib-inline-VERSION.tar.gz
diff --git a/build/pkgs/matplotlib_inline/package-version.txt b/build/pkgs/matplotlib_inline/package-version.txt
@@ -1 +1 @@
-0.1.2
+0.1.6
diff --git a/build/pkgs/setuptools_scm/checksums.ini b/build/pkgs/setuptools_scm/checksums.ini
@@ -1,5 +1,5 @@
 tarball=setuptools_scm-VERSION.tar.gz
-sha1=0f34eba670121f9c41939ca8d805687de359f71c
-md5=b4e02bf8e62ed49142ea7b42a68671d7
-cksum=1975160274
+sha1=b8c9447fe6dfc44107c9cbd2fd82314aad3cb95e
+md5=0df4e7fd923e4983cd65786efaa0e0d0
+cksum=3196930290
 upstream_url=https://pypi.io/packages/source/s/setuptools_scm/setuptools_scm-VERSION.tar.gz
diff --git a/build/pkgs/setuptools_scm/package-version.txt b/build/pkgs/setuptools_scm/package-version.txt
@@ -1 +1 @@
-6.4.2
+7.0.5
diff --git a/build/pkgs/setuptools_scm_git_archive/checksums.ini b/build/pkgs/setuptools_scm_git_archive/checksums.ini
@@ -1,5 +1,5 @@
 tarball=setuptools_scm_git_archive-VERSION.tar.gz
-sha1=eda18924f3917e94cc54227660e3437d47f53bb9
-md5=1c9351fa5cebd12e76488737a7c78f2e
-cksum=188023730
+sha1=5e893fcb35f9633ea1431138c1d90a5f2687b36d
+md5=df3933d33c49c5d9aca06715b4c65370
+cksum=2554004806
 upstream_url=https://pypi.io/packages/source/s/setuptools_scm_git_archive/setuptools_scm_git_archive-VERSION.tar.gz
diff --git a/build/pkgs/setuptools_scm_git_archive/package-version.txt b/build/pkgs/setuptools_scm_git_archive/package-version.txt
@@ -1 +1 @@
-1.1
+1.4
diff --git a/src/sage/plot/plot.py b/src/sage/plot/plot.py
@@ -1741,12 +1741,12 @@ def b(n): return lambda x: bessel_J(n, x) + 0.5*(n-1)
 
     ::
 
-        sage: plot(2*x + 1,(x, 0, 5), ticks=[[0, 1, e, pi, sqrt(20)], [1, 3, 2*e + 1, 2*pi + 1, 2*sqrt(20) + 1]], tick_formatter="latex")
+        sage: plot(2*x + 1, (x, 0, 5), ticks=[[0, 1, e, pi, sqrt(20)], [1, 3, 2*e + 1, 2*pi + 1, 2*sqrt(20) + 1]], tick_formatter="latex")
         Graphics object consisting of 1 graphics primitive
 
     .. PLOT::
 
-        g = plot(2*x + 1,(x, 0, 5), ticks=[[0, 1, e, pi, sqrt(20)], [1, 3, 2*e + 1, 2*pi + 1, 2*sqrt(20) + 1]], tick_formatter="latex")
+        g = plot(2*x + 1, (x, 0, 5), ticks=[[0, 1, e, pi, sqrt(20)], [1, 3, 2*e + 1, 2*pi + 1, 2*sqrt(20) + 1]], tick_formatter="latex")
         sphinx_plot(g)
 
     This is particularly useful when setting custom ticks in multiples of `\pi`.

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-e22dd4276129d5473cc23a8ea2c3753e3213c17a`
	`1`	`+4c696a60b4ffefe6e9a198cbb4bd7bf12823ef3a`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +$(PYTHON) | $(PYTHON_TOOLCHAIN) pybind11
++
 +----------
 +All lines of this file are ignored except the first.