[arch-commits] Commit in buildbot/trunk (3 files)

[Chih-Hsuan Yen]

    Date: Friday, November 13, 2020 @ 06:01:04
  Author: yan12125
Revision: 753826

buildbot: fix check() with Python 3.9

Upstream issue: https://github.com/pypa/setuptools/issues/2086

Added:
  buildbot/trunk/ignore-lib2to3-deprecated.diff
Modified:
  buildbot/trunk/PKGBUILD
Deleted:
  buildbot/trunk/ignore-setuptools-warning.diff

--------------------------------+
 PKGBUILD                       |    9 +++------
 ignore-lib2to3-deprecated.diff |   14 ++++++++++++++
 ignore-setuptools-warning.diff |   12 ------------
 3 files changed, 17 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-13 04:56:54 UTC (rev 753825)
+++ PKGBUILD	2020-11-13 06:01:04 UTC (rev 753826)
@@ -28,13 +28,13 @@
         "git+https://github.com/buildbot/buildbot-contrib.git#commit=$_bb_contrib_commit"
         "reproducible-html.diff"
         "sqlalchemy-1.13.18.diff"
-        "ignore-setuptools-warning.diff")
+        "ignore-lib2to3-deprecated.diff")
 sha256sums=('b8c1d807d89dc220422843d7043831ee35ca03dfd7fd4da5a4f73899dffa1849'
             'SKIP'
             'SKIP'
             'b921d29994eff3af134ca1b37acf291a6a95f5da35a2a4f885557adcca22f864'
             'cd6119e8f8346ad2bcfedb3bfdbfcdcbb9908ea1db9f3ec09d323f6c9d13d9df'
-            'd09f851fb1a50f99d407ea79fa25a90ec0f70b593983108468c87fee8b3cc476')
+            '30a29f954560ce3edf36307a5fa5b54874739330aad04841dbdca8ec8948667f')
 validpgpkeys=(
   '390EB159056ED56F66AB1092AECD456B4D2531FC'  # Pierre Tardy <tardyp at gmail.com> (@tardyp on GitHub)
   'FD0004A26EADFE43A4C3F249C6F7AE200374452D'  # Povilas Kanapickas <povilas at radix.lt> (@p12tic on GitHub)
@@ -44,10 +44,7 @@
   cd buildbot-$pkgver
   patch -Np1 -i ../reproducible-html.diff
   patch -Np1 -i ../sqlalchemy-1.13.18.diff
-  # Setuptools 49.2.0 complains if distutils is imported earlier than setuptools
-  # The warning is still under discussion, so just ignore it for now
-  # https://github.com/pypa/setuptools/issues/2259
-  patch -Np1 -i ../ignore-setuptools-warning.diff
+  patch -Np1 -i ../ignore-lib2to3-deprecated.diff
 
   # HACK: do not use virtualenv
   sed -i -e 's#frontend_deps:.*#frontend_deps:#' Makefile

Added: ignore-lib2to3-deprecated.diff
===================================================================
--- ignore-lib2to3-deprecated.diff	                        (rev 0)
+++ ignore-lib2to3-deprecated.diff	2020-11-13 06:01:04 UTC (rev 753826)
@@ -0,0 +1,14 @@
+diff --git a/master/buildbot/test/__init__.py b/master/buildbot/test/__init__.py
+index 29eb4557a..700517edd 100644
+--- a/master/buildbot/test/__init__.py
++++ b/master/buildbot/test/__init__.py
+@@ -134,3 +134,9 @@ warnings.filterwarnings('ignore', ".*Not importing directory .*/zope: missing __
+                         category=ImportWarning)
+ warnings.filterwarnings('ignore', ".*Not importing directory .*/sphinxcontrib: missing __init__",
+                         category=ImportWarning)
++
++# ignore warnings from importing lib2to3 via buildbot_pkg ->
++# setuptools.command.build_py -> setuptools.lib2to3_ex -> lib2to3
++# https://github.com/pypa/setuptools/issues/2086
++warnings.filterwarnings('ignore', ".*lib2to3 package is deprecated",
++                        category=PendingDeprecationWarning)

Deleted: ignore-setuptools-warning.diff
===================================================================
--- ignore-setuptools-warning.diff	2020-11-13 04:56:54 UTC (rev 753825)
+++ ignore-setuptools-warning.diff	2020-11-13 06:01:04 UTC (rev 753826)
@@ -1,12 +0,0 @@
-diff --git a/master/buildbot/test/__init__.py b/master/buildbot/test/__init__.py
-index f7ba7b1e7..6d4b86eab 100644
---- a/master/buildbot/test/__init__.py
-+++ b/master/buildbot/test/__init__.py
-@@ -131,3 +131,7 @@ warnings.filterwarnings('ignore', ".*Not importing directory .*/zope: missing __
-                         category=ImportWarning)
- warnings.filterwarnings('ignore', ".*Not importing directory .*/sphinxcontrib: missing __init__",
-                         category=ImportWarning)
-+
-+# ignore warnings from setuptools 49.2.0
-+warnings.filterwarnings('ignore', ".*Distutils was imported before Setuptools.*",
-+                        category=UserWarning)