public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Michel Lind <salimma@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/python-zope-testrunner] f43: Revert to 6.6 after accidental rebase
Date: Fri, 11 Sep 2026 15:52:50 GMT	[thread overview]
Message-ID: <178914197066.1.2693481519924747306.rpms-python-zope-testrunner-69999444b583@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/python-zope-testrunner
            Branch : f43
            Commit : 69999444b58376dc424bdc6cdf6910830e4b2578
            Author : Michel Lind <salimma@fedoraproject.org>
            Date   : 2026-09-11T16:52:39+01:00
            Stats  : +33/-54 in 6 file(s)
            URL    : https://src.fedoraproject.org/rpms/python-zope-testrunner/c/69999444b58376dc424bdc6cdf6910830e4b2578?branch=f43

            Log:
            Revert to 6.6 after accidental rebase

Signed-off-by: Michel Lind <salimma@fedoraproject.org>

---
diff --git a/205.patch b/205.patch
deleted file mode 100644
index 589c907..0000000
--- a/205.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7dd2a8305d8c74af0f8b9b209106411b4f2f36cb Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
-Date: Tue, 31 Mar 2026 11:01:36 +0200
-Subject: [PATCH] Skip _SubTest objects which are internal implementation
- details exposed in Python 3.15+
-
----
- src/zope/testrunner/formatter.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/zope/testrunner/formatter.py b/src/zope/testrunner/formatter.py
-index c63b48a..86f362d 100644
---- a/src/zope/testrunner/formatter.py
-+++ b/src/zope/testrunner/formatter.py
-@@ -1457,6 +1457,10 @@ def parse_unittest(test):
-     if testId is None:
-         return None, None, None
-     testClassName = get_test_class_name(test)
-+    # Skip _SubTest objects which are internal implementation details
-+    # exposed in Python 3.15+
-+    if testClassName == 'unittest.case._SubTest':
-+        return None, None, None
-     testSuite = testClassName
-     testName = testId[len(testClassName) + 1:]
-     return testSuite, testName, testClassName

diff --git a/README.packit b/README.packit
deleted file mode 100644
index 09d231a..0000000
--- a/README.packit
+++ /dev/null
@@ -1,3 +0,0 @@
-This repository is maintained by packit.
-https://packit.dev/
-The file was generated using packit 1.16.2.post1.dev12+g819bb7962.

diff --git a/packit.yaml b/packit.yaml
deleted file mode 100644
index fdf84eb..0000000
--- a/packit.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# See the documentation for more information:
-# https://packit.dev/docs/configuration/
-
-copy_upstream_release_description: false
-
-jobs:
-- job: pull_from_upstream
-  trigger: release
-  dist_git_branches:
-    - fedora-rawhide
-
-- job: koji_build
-  trigger: commit
-  allowed_committers: ['packit']
-  dist_git_branches:
-    - fedora-rawhide

diff --git a/python-zope-testrunner.spec b/python-zope-testrunner.spec
index 481f0ee..6f98a49 100644
--- a/python-zope-testrunner.spec
+++ b/python-zope-testrunner.spec
@@ -5,17 +5,15 @@
 %global _docdir_fmt python3-zope-testrunner
 
 Name:           python-zope-testrunner
-Version:        8.3
-Release:        %autorelease
+Version:        6.6
+Release:        %autorelease -b 11
 Summary:        Zope testrunner script
 
 License:        ZPL-2.1
 URL:            https://pypi.python.org/pypi/zope.testrunner
 VCS:            https://github.com/zopefoundation/zope.testrunner
 Source:         %{vcs}/archive/%{version}/zope.testrunner-%{version}.tar.gz
-
-# Fix test failure with python 3.15
-Patch:          https://github.com/zopefoundation/zope.testrunner/pull/205.patch
+Patch:          zope.testrunner-allow-new-setuptools.diff
 
 BuildArch:      noarch
 BuildRequires:  help2man
@@ -49,9 +47,6 @@ Documentation for zope.testrunner.
 %prep
 %autosetup -n zope.testrunner-%{version} -p1
 
-# Allow newer setuptools
-sed -i 's/setuptools == [0-9\.]\+/setuptools/' pyproject.toml tox.ini
-
 # Update the sphinx HTML theme name
 sed -i "s/'default'/'classic'/" docs/conf.py
 
@@ -110,13 +105,16 @@ rm -f docs/_build/html/.buildinfo
 unset PYTHONHOME
 
 %check
-%tox
+# Run one test separately due to https://github.com/zopefoundation/zope.testrunner/issues/189
+%tox -- -- -t '!testrunner-edge-cases' -vc
+%tox -- -- -t  'testrunner-edge-cases' -vc
 
 %files -n python3-zope-testrunner -f %{pyproject_files}
 %doc CHANGES.html README.html
 %license COPYRIGHT LICENSE.md
 %{_bindir}/zope-testrunner
 %{_mandir}/man1/zope-testrunner.1*
+%{python3_sitelib}/zope.testrunner*.pth
 %exclude %{python3_sitelib}/zope/testrunner/tests
 
 %files doc

diff --git a/sources b/sources
index afc86d1..77b4e09 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zope.testrunner-8.3.tar.gz) = 8037ad85931667db47b7a34c9cc3f8a2091211da6e6351104bb9bc6cb704852ef03b066e47021697ff70911716e2973df6ec0fd19ddeb12ed5e797fa1a66dcb8
+SHA512 (zope.testrunner-6.6.tar.gz) = 5c4c16e0185a6eacc54a9f30cc0c5e3bb097d0e138884240a6ad21e6bb516035ed32a4d43bd4f84e67ed2bcba9be631a774246c0031cc949a6bca97c06751fac

diff --git a/zope.testrunner-allow-new-setuptools.diff b/zope.testrunner-allow-new-setuptools.diff
new file mode 100644
index 0000000..7c99f21
--- /dev/null
+++ b/zope.testrunner-allow-new-setuptools.diff
@@ -0,0 +1,25 @@
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,9 +1,9 @@
+-# 
++#
+ # Generated from:
+ # https://github.com/zopefoundation/meta/tree/master/config/pure-python
+ 
+ [build-system]
+-requires = ["setuptools<74"]
++requires = ["setuptools"]
+ build-backend = "setuptools.build_meta"
+ 
+ [tool.coverage.run]
+--- a/tox.ini
++++ b/tox.ini
+@@ -21,7 +21,7 @@ usedevelop = true
+ package = wheel
+ wheel_build_env = .pkg
+ deps =
+-    setuptools  <74
++    setuptools
+ commands =
+     zope-testrunner --test-path=src {posargs:-vc}
+ extras =

                 reply	other threads:[~2026-09-11 15:52 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178914197066.1.2693481519924747306.rpms-python-zope-testrunner-69999444b583@fedoraproject.org \
    --to=salimma@fedoraproject.org \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox