Accepting request 860827 from devel:languages:python:Factory

- (bsc#1180125) We really don't Require python-rpm-macros package. Unnecessary dependency. - Make python39-doc building again - Add no-skipif-doctests.patch, because SLE-15 version of Sphinx doesn't know about skipif directive in doctests. OBS-URL: https://build.opensuse.org/request/show/860827 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python39?expand=0&rev=10
2021-01-07 20:23:25 +00:00 · 2021-01-07 20:23:25 +00:00 · 51fd21dcf6
commit 51fd21dcf6
parent 8de6436aa2 976b91d922
3 changed files with 681 additions and 4 deletions
--- a/no-skipif-doctests.patch
+++ b/no-skipif-doctests.patch
@ -0,0 +1,660 @@
+only in patch2:
+unchanged:
+--- a/Doc/conf.py
+++ b/Doc/conf.py
+@@ -46,7 +46,7 @@ today_fmt = '%B %d, %Y'
+ highlight_language = 'python3'
+ 
+ # Minimum version of sphinx required
+-needs_sphinx = '1.8'
+needs_sphinx = '1.7.6'
+ 
+ # Ignore any .rst files in the venv/ directory.
+ exclude_patterns = ['venv/*', 'README.rst']
+--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
+@@ -250,7 +250,6 @@ Turtle motion
+    turtle is headed.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.position()
+       (0.00,0.00)
+@@ -277,7 +276,6 @@ Turtle motion
+       >>> turtle.goto(0, 0)
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.position()
+       (0.00,0.00)
+@@ -296,13 +294,11 @@ Turtle motion
+    orientation depends on the turtle mode, see :func:`mode`.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+       :hide:
+ 
+       >>> turtle.setheading(22)
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.heading()
+       22.0
+@@ -321,13 +317,11 @@ Turtle motion
+    orientation depends on the turtle mode, see :func:`mode`.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+       :hide:
+ 
+       >>> turtle.setheading(22)
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.heading()
+       22.0
+@@ -350,13 +344,11 @@ Turtle motion
+    not change the turtle's orientation.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+       :hide:
+ 
+       >>> turtle.goto(0, 0)
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+        >>> tp = turtle.pos()
+        >>> tp
+@@ -380,13 +372,11 @@ Turtle motion
+    unchanged.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+       :hide:
+ 
+       >>> turtle.goto(0, 240)
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.position()
+       (0.00,240.00)
+@@ -402,13 +392,11 @@ Turtle motion
+    Set the turtle's second coordinate to *y*, leave first coordinate unchanged.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+       :hide:
+ 
+       >>> turtle.goto(0, 40)
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.position()
+       (0.00,40.00)
+@@ -435,7 +423,6 @@ Turtle motion
+    =================== ====================
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.setheading(90)
+       >>> turtle.heading()
+@@ -448,14 +435,12 @@ Turtle motion
+    its start-orientation (which depends on the mode, see :func:`mode`).
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+       :hide:
+ 
+       >>> turtle.setheading(90)
+       >>> turtle.goto(0, -10)
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.heading()
+       90.0
+@@ -487,7 +472,6 @@ Turtle motion
+    calculated automatically.  May be used to draw regular polygons.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.home()
+       >>> turtle.position()
+@@ -516,7 +500,6 @@ Turtle motion
+ 
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.home()
+       >>> turtle.dot()
+@@ -534,7 +517,6 @@ Turtle motion
+    it by calling ``clearstamp(stamp_id)``.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.color("blue")
+       >>> turtle.stamp()
+@@ -550,7 +532,6 @@ Turtle motion
+    Delete stamp with given *stampid*.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.position()
+       (150.00,-0.00)
+@@ -595,7 +576,6 @@ Turtle motion
+    undo actions is determined by the size of the undobuffer.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> for i in range(4):
+       ...     turtle.fd(50); turtle.lt(80)
+@@ -628,7 +608,6 @@ Turtle motion
+    turtle turn instantly.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.speed()
+       3
+@@ -649,7 +628,6 @@ Tell Turtle's state
+    Return the turtle's current location (x,y) (as a :class:`Vec2D` vector).
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.pos()
+       (440.00,-0.00)
+@@ -665,7 +643,6 @@ Tell Turtle's state
+    orientation which depends on the mode - "standard"/"world" or "logo").
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.goto(10, 10)
+       >>> turtle.towards(0,0)
+@@ -677,7 +654,6 @@ Tell Turtle's state
+    Return the turtle's x coordinate.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.home()
+       >>> turtle.left(50)
+@@ -693,7 +669,6 @@ Tell Turtle's state
+    Return the turtle's y coordinate.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.home()
+       >>> turtle.left(60)
+@@ -710,7 +685,6 @@ Tell Turtle's state
+    :func:`mode`).
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.home()
+       >>> turtle.left(67)
+@@ -727,7 +701,6 @@ Tell Turtle's state
+    other turtle, in turtle step units.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.home()
+       >>> turtle.distance(30,40)
+@@ -751,7 +724,6 @@ Settings for measurement
+    Default value is 360 degrees.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.home()
+       >>> turtle.left(90)
+@@ -774,7 +746,6 @@ Settings for measurement
+    ``degrees(2*math.pi)``.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.home()
+       >>> turtle.left(90)
+@@ -785,7 +756,6 @@ Settings for measurement
+       1.5707963267948966
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+       :hide:
+ 
+       >>> turtle.degrees(360)
+@@ -821,7 +791,6 @@ Drawing state
+    thickness.  If no argument is given, the current pensize is returned.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.pensize()
+       1
+@@ -853,7 +822,6 @@ Drawing state
+    attributes in one statement.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+       :options: +NORMALIZE_WHITESPACE
+ 
+       >>> turtle.pen(fillcolor="black", pencolor="red", pensize=10)
+@@ -876,7 +844,6 @@ Drawing state
+    Return ``True`` if pen is down, ``False`` if it's up.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.penup()
+       >>> turtle.isdown()
+@@ -917,7 +884,6 @@ Color control
+     newly set pencolor.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+        >>> colormode()
+        1.0
+@@ -966,7 +932,6 @@ Color control
+     with the newly set fillcolor.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+        >>> turtle.fillcolor("violet")
+        >>> turtle.fillcolor()
+@@ -1005,7 +970,6 @@ Color control
+     with the newly set colors.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+        >>> turtle.color("red", "green")
+        >>> turtle.color()
+@@ -1022,7 +986,6 @@ Filling
+ ~~~~~~~
+ 
+ .. doctest::
+-   :skipif: _tkinter is None
+    :hide:
+ 
+    >>> turtle.home()
+@@ -1032,7 +995,6 @@ Filling
+    Return fillstate (``True`` if filling, ``False`` else).
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+        >>> turtle.begin_fill()
+        >>> if turtle.filling():
+@@ -1057,7 +1019,6 @@ Filling
+    above may be either all yellow or have some white regions.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.color("black", "red")
+       >>> turtle.begin_fill()
+@@ -1075,7 +1036,6 @@ More drawing control
+    variables to the default values.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.goto(0,-22)
+       >>> turtle.left(100)
+@@ -1127,7 +1087,6 @@ Visibility
+    drawing observably.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.hideturtle()
+ 
+@@ -1138,7 +1097,6 @@ Visibility
+    Make the turtle visible.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.showturtle()
+ 
+@@ -1169,7 +1127,6 @@ Appearance
+    deal with shapes see Screen method :func:`register_shape`.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.shape()
+       'classic'
+@@ -1195,7 +1152,6 @@ Appearance
+    resizemode("user") is called by :func:`shapesize` when used with arguments.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.resizemode()
+       'noresize'
+@@ -1219,7 +1175,6 @@ Appearance
+    of the shapes's outline.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.shapesize()
+       (1.0, 1.0, 1)
+@@ -1244,7 +1199,6 @@ Appearance
+    heading of the turtle are sheared.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+        >>> turtle.shape("circle")
+        >>> turtle.shapesize(5,2)
+@@ -1261,7 +1215,6 @@ Appearance
+    change the turtle's heading (direction of movement).
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.reset()
+       >>> turtle.shape("circle")
+@@ -1281,7 +1234,6 @@ Appearance
+    (direction of movement).
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.reset()
+       >>> turtle.shape("circle")
+@@ -1307,7 +1259,6 @@ Appearance
+    turtle (its direction of movement).
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.reset()
+       >>> turtle.shape("circle")
+@@ -1336,7 +1287,6 @@ Appearance
+    given matrix.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle = Turtle()
+       >>> turtle.shape("square")
+@@ -1352,7 +1302,6 @@ Appearance
+    can be used to define a new shape or components of a compound shape.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.shape("square")
+       >>> turtle.shapetransform(4, -1, 0, 2)
+@@ -1377,7 +1326,6 @@ Using events
+    procedural way:
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> def turn(x, y):
+       ...     left(180)
+@@ -1398,7 +1346,6 @@ Using events
+    ``None``, existing bindings are removed.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> class MyTurtle(Turtle):
+       ...     def glow(self,x,y):
+@@ -1426,7 +1373,6 @@ Using events
+    mouse-click event on that turtle.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.ondrag(turtle.goto)
+ 
+@@ -1454,7 +1400,6 @@ Special Turtle methods
+    Return the last recorded polygon.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.home()
+       >>> turtle.begin_poly()
+@@ -1474,7 +1419,6 @@ Special Turtle methods
+    turtle properties.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> mick = Turtle()
+       >>> joe = mick.clone()
+@@ -1487,7 +1431,6 @@ Special Turtle methods
+    return the "anonymous turtle":
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> pet = getturtle()
+       >>> pet.fd(50)
+@@ -1501,7 +1444,6 @@ Special Turtle methods
+    TurtleScreen methods can then be called for that object.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> ts = turtle.getscreen()
+       >>> ts
+@@ -1519,7 +1461,6 @@ Special Turtle methods
+    ``None``, the undobuffer is disabled.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> turtle.setundobuffer(42)
+ 
+@@ -1529,7 +1470,6 @@ Special Turtle methods
+    Return number of entries in the undobuffer.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> while undobufferentries():
+       ...     undo()
+@@ -1552,7 +1492,6 @@ below:
+    For example:
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> s = Shape("compound")
+       >>> poly1 = ((0,0),(10,-5),(0,10),(-10,-5))
+@@ -1563,7 +1502,6 @@ below:
+ 3. Now add the Shape to the Screen's shapelist and use it:
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> register_shape("myshape", s)
+       >>> shape("myshape")
+@@ -1583,7 +1521,6 @@ Most of the examples in this section ref
+ ``screen``.
+ 
+ .. doctest::
+-   :skipif: _tkinter is None
+    :hide:
+ 
+    >>> screen = Screen()
+@@ -1600,7 +1537,6 @@ Window control
+    Set or return background color of the TurtleScreen.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> screen.bgcolor("orange")
+       >>> screen.bgcolor()
+@@ -1686,7 +1622,6 @@ Window control
+    distorted.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> screen.reset()
+       >>> screen.setworldcoordinates(-50,-7.5,50,7.5)
+@@ -1697,7 +1632,6 @@ Window control
+       ...     left(45); fd(2)   # a regular octagon
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+       :hide:
+ 
+       >>> screen.reset()
+@@ -1719,7 +1653,6 @@ Animation control
+    Optional argument:
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> screen.delay()
+       10
+@@ -1741,7 +1674,6 @@ Animation control
+    :func:`delay`).
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> screen.tracer(8, 25)
+       >>> dist = 2
+@@ -1778,7 +1710,6 @@ Using screen events
+    must have the focus. (See method :func:`listen`.)
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> def f():
+       ...     fd(50)
+@@ -1799,7 +1730,6 @@ Using screen events
+    must have focus. (See method :func:`listen`.)
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> def f():
+       ...     fd(50)
+@@ -1824,7 +1754,6 @@ Using screen events
+    named turtle:
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> screen.onclick(turtle.goto) # Subsequently clicking into the TurtleScreen will
+       >>>                             # make the turtle move to the clicked point.
+@@ -1844,7 +1773,6 @@ Using screen events
+    Install a timer that calls *fun* after *t* milliseconds.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> running = True
+       >>> def f():
+@@ -1926,7 +1854,6 @@ Settings and special methods
+    ============ ========================= ===================
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> mode("logo")   # resets turtle heading to north
+       >>> mode()
+@@ -1941,7 +1868,6 @@ Settings and special methods
+    values of color triples have to be in the range 0..\ *cmode*.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> screen.colormode(1)
+       >>> turtle.pencolor(240, 160, 80)
+@@ -1962,7 +1888,6 @@ Settings and special methods
+    do with a Tkinter Canvas.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> cv = screen.getcanvas()
+       >>> cv
+@@ -1974,7 +1899,6 @@ Settings and special methods
+    Return a list of names of all currently available turtle shapes.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> screen.getshapes()
+       ['arrow', 'blank', 'circle', ..., 'turtle']
+@@ -1998,7 +1922,6 @@ Settings and special methods
+        coordinates: Install the corresponding polygon shape.
+ 
+        .. doctest::
+-          :skipif: _tkinter is None
+ 
+           >>> screen.register_shape("triangle", ((5,-3), (0,5), (-5,-3)))
+ 
+@@ -2014,7 +1937,6 @@ Settings and special methods
+    Return the list of turtles on the screen.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> for turtle in screen.turtles():
+       ...     turtle.color("red")
+@@ -2076,7 +1998,6 @@ Methods specific to Screen, not inherite
+                   center window vertically
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> screen.setup (width=200, height=200, startx=0, starty=0)
+       >>>              # sets window to 200x200 pixels, in upper left of screen
+@@ -2092,7 +2013,6 @@ Methods specific to Screen, not inherite
+    Set title of turtle window to *titlestring*.
+ 
+    .. doctest::
+-      :skipif: _tkinter is None
+ 
+       >>> screen.title("Welcome to the turtle zoo!")
+ 
+@@ -2163,7 +2083,6 @@ Public classes
+       Example:
+ 
+       .. doctest::
+-         :skipif: _tkinter is None
+ 
+          >>> poly = ((0,0),(10,-5),(0,10),(-10,-5))
+          >>> s = Shape("compound")
+@@ -2510,7 +2429,6 @@ Changes since Python 3.0
+ 
+ 
+ .. doctest::
+-   :skipif: _tkinter is None
+    :hide:
+ 
+    >>> for turtle in turtles():
--- a/python39.changes
+++ b/python39.changes
@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Jan  5 09:15:36 UTC 2021 - Matej Cepl <mcepl@suse.com>
+
+- (bsc#1180125) We really don't Require python-rpm-macros package.
+  Unnecessary dependency.
+
+-------------------------------------------------------------------
+Wed Dec 16 16:08:42 UTC 2020 - Matej Cepl <mcepl@suse.com>
+
+- Make python39-doc building again
+- Add no-skipif-doctests.patch, because SLE-15 version of Sphinx
+  doesn't know about skipif directive in doctests.
+
 -------------------------------------------------------------------
 Sat Dec 12 14:29:33 UTC 2020 - Matej Cepl <mcepl@suse.com>

--- a/python39.spec
+++ b/python39.spec
@ -1,7 +1,7 @@
 #
 # spec file for package python39
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -142,6 +142,9 @@ Patch29:        bpo-31046_ensurepip_honours_prefix.patch
 Patch31:        bsc1167501-invalid-alignment.patch
 # PATCH-FIX-UPSTREAM stop calling removed Sphinx function gh#python/cpython#13236
 Patch32:        sphinx-update-removed-function.patch
+# PATCH-FIX-SLE no-skipif-doctests.patch jsc#SLE-13738 mcepl@suse.com
+# SLE-15 version of Sphinx doesn't know about skipif directive in doctests.
+Patch33:        no-skipif-doctests.patch
 BuildRequires:  automake
 BuildRequires:  fdupes
 BuildRequires:  gmp-devel
@ -164,9 +167,8 @@ BuildRequires:  pkgconfig(libtirpc)
 # Here we just run sphinx and we can use generic one, we don't need
 # the flavor variant
 BuildRequires:  python3-Sphinx < 3.0
-%if 0%{?suse_version} > 1500
+%if 0%{?suse_version} >= 1500
 BuildRequires:  python3-python-docs-theme
-BuildRequires:  python3-sphinxcontrib-qthelp >= 1.0.2
 %endif
 %endif
 %if %{with general}
@ -278,7 +280,6 @@ Python, and Macintosh Module Reference in format for devhelp.
 %package -n %{python_pkg_name}-base
 Summary:        Python 3 Interpreter and Stdlib Core
 Requires:       libpython%{so_version} = %{version}
-Requires:       python-rpm-macros
 Recommends:     %{python_pkg_name} = %{version}
 #Recommends:     python3-ensurepip
 # python 3.1 didn't have a separate python-base, so it is wrongly
@ -390,6 +391,9 @@ other applications.
 %patch29 -p1
 %patch31 -p1
 %patch32 -p1
+%if 0%{?suse_version} <= 1500
+%patch33 -p1
+%endif

 # drop Autoconf version requirement
 sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac