From 3e45bf7f0bbb7824b98124500b2137a449bba850e0798635d32d688861952cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 28 Feb 2019 09:00:11 +0000 Subject: [PATCH] Accepting request 679990 from home:jayvdb:noflake8 - Remove build dependency on pytest-flake8 and pytest-sugar, dropping fix-lint.patch which is now unnecessary modification. - Remove doc dependencies as the docs are not being built, and have limited value beyond information not already present in the rst files. - Remove redundant build dependency on python-jaraco.base, which is a dependency of the other listed 'real' jaraco dependencies. - Remove build dependency on python-six - Add runtime dependencies OBS-URL: https://build.opensuse.org/request/show/679990 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-irc?expand=0&rev=6 --- fix-lint.patch | 12 ------------ python-irc.changes | 12 ++++++++++++ python-irc.spec | 29 +++++++++++++++-------------- 3 files changed, 27 insertions(+), 26 deletions(-) delete mode 100644 fix-lint.patch diff --git a/fix-lint.patch b/fix-lint.patch deleted file mode 100644 index 0dbbb85..0000000 --- a/fix-lint.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: irc-17.0/scripts/irccat2-aio.py -=================================================================== ---- irc-17.0.orig/scripts/irccat2-aio.py -+++ irc-17.0/scripts/irccat2-aio.py -@@ -70,6 +70,7 @@ def main(): - args.server, args.port, args.nickname, password=args.password - ) - except irc.client.ServerConnectionError as x: -+ print(x) - sys.exit(1) - - try: diff --git a/python-irc.changes b/python-irc.changes index 3681b42..4708768 100644 --- a/python-irc.changes +++ b/python-irc.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Feb 27 02:30:05 UTC 2019 - John Vandenberg + +- Remove build dependency on pytest-flake8 and pytest-sugar, dropping + fix-lint.patch which is now unnecessary modification. +- Remove doc dependencies as the docs are not being built, and have limited + value beyond information not already present in the rst files. +- Remove redundant build dependency on python-jaraco.base, which is a + dependency of the other listed 'real' jaraco dependencies. +- Remove build dependency on python-six +- Add runtime dependencies + ------------------------------------------------------------------- Wed Jan 2 10:14:37 UTC 2019 - Tomáš Chvátal diff --git a/python-irc.spec b/python-irc.spec index 8e20b60..6c89456 100644 --- a/python-irc.spec +++ b/python-irc.spec @@ -27,22 +27,16 @@ License: LGPL-2.1-or-later Group: Development/Libraries/Python URL: https://github.com/jaraco/irc Source: https://files.pythonhosted.org/packages/source/i/irc/%{modname}-%{version}.tar.gz -Patch0: fix-lint.patch -BuildRequires: %{python_module Sphinx} -BuildRequires: %{python_module jaraco.base} BuildRequires: %{python_module jaraco.collections} -BuildRequires: %{python_module jaraco.itertools} +BuildRequires: %{python_module jaraco.functools >= 1.10} +BuildRequires: %{python_module jaraco.itertools >= 1.8} BuildRequires: %{python_module jaraco.logging} -BuildRequires: %{python_module jaraco.packaging} BuildRequires: %{python_module jaraco.text} BuildRequires: %{python_module more-itertools} -BuildRequires: %{python_module pygments} -BuildRequires: %{python_module pytest-runner} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module pytz} -BuildRequires: %{python_module rst.linker} BuildRequires: %{python_module setuptools_scm} -BuildRequires: %{python_module six} -BuildRequires: %{python_module tempora} +BuildRequires: %{python_module tempora >= 1.6} BuildRequires: fdupes BuildRequires: python-rpm-macros Provides: python-irclib = %{version} @@ -51,9 +45,16 @@ Obsoletes: python-irclib < %{version} BuildArch: noarch %if 0%{?suse_version} > 1500 BuildRequires: %{python_module jaraco.stream} -BuildRequires: %{python_module pytest-flake8} -BuildRequires: %{python_module pytest-sugar} %endif +Requires: python-jaraco.collections +Requires: python-jaraco.functools >= 1.20 +Requires: python-jaraco.itertools >= 1.8 +Requires: python-jaraco.logging +Requires: python-jaraco.stream +Requires: python-jaraco.text +Requires: python-more-itertools +Requires: python-pytz +Requires: python-tempora >= 1.6 %python_subpackages %description @@ -64,8 +65,8 @@ connections. %prep %setup -q -n %{modname}-%{version} -%patch0 -p1 sed -i -e '1s!/env python!/python!' scripts/testbot.py +sed -i 's/--flake8//' pytest.ini %build %python_build @@ -76,7 +77,7 @@ sed -i -e '1s!/env python!/python!' scripts/testbot.py %if 0%{?suse_version} > 1500 %check -%python_exec setup.py pytest +%python_exec -m pytest %endif %files %{python_files}