Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-marathon for openSUSE:Factory
checked in at 2022-02-28 19:43:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-marathon (Old)
and /work/SRC/openSUSE:Factory/.python-marathon.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-marathon"
Mon Feb 28 19:43:54 2022 rev:7 rq:958056 version:0.13.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-marathon/python-marathon.changes
2020-09-16 19:41:46.238963304 +0200
+++
/work/SRC/openSUSE:Factory/.python-marathon.new.1958/python-marathon.changes
2022-02-28 19:44:27.269961202 +0100
@@ -1,0 +2,10 @@
+Mon Feb 28 11:36:47 UTC 2022 - [email protected]
+
+- fix build, run tests
+- added patches
+ fix https://github.com/thefactory/marathon-python/issues/284
+ + python-marathon-no-2to3.patch
+ fix
https://github.com/thefactory/marathon-python/commit/1850734b5b916d1455416833f0aed239b308dd9f.diff
+ + python-marathon-use-collections.abc.patch
+
+-------------------------------------------------------------------
New:
----
python-marathon-no-2to3.patch
python-marathon-use-collections.abc.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-marathon.spec ++++++
--- /var/tmp/diff_new_pack.WHYiYu/_old 2022-02-28 19:44:27.817961407 +0100
+++ /var/tmp/diff_new_pack.WHYiYu/_new 2022-02-28 19:44:27.829961411 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-marathon
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,15 @@
License: MIT
Group: Development/Languages/Python
URL: https://github.com/thefactory/marathon-python
-Source:
https://files.pythonhosted.org/packages/source/m/marathon/marathon-%{version}.tar.gz
+Source:
https://github.com/thefactory/marathon-python/archive/refs/tags/%{version}.tar.gz#/marathon-%{version}.tar.gz
+# https://github.com/thefactory/marathon-python/issues/284
+Patch0: python-marathon-no-2to3.patch
+#
https://github.com/thefactory/marathon-python/commit/1850734b5b916d1455416833f0aed239b308dd9f.diff
+Patch1: python-marathon-use-collections.abc.patch
+BuildRequires: %{python_module pytest}
+BuildRequires: %{python_module requests-mock}
+BuildRequires: %{python_module requests-toolbelt}
+BuildRequires: %{python_module requests}
BuildRequires: %{python_module setuptools}
BuildRequires: python-rpm-macros
Requires: python-requests >= 2.4.0
@@ -37,7 +45,9 @@
Python interface to the Mesos Marathon REST API.
%prep
-%setup -q -n marathon-%{version}
+%setup -q -n marathon-python-%{version}
+%patch0 -p1
+%patch1 -p1
%build
%python_build
@@ -46,7 +56,7 @@
%python_install
%check
-# requires Docker and Marathon server installed there
+%pytest
%files %{python_files}
%license LICENSE
++++++ marathon-0.13.0.tar.gz ++++++
++++ 2920 lines of diff (skipped)
++++++ python-marathon-no-2to3.patch ++++++
Index: marathon-0.13.0/setup.py
===================================================================
--- marathon-0.13.0.orig/setup.py 2020-08-21 18:22:30.000000000 +0200
+++ marathon-0.13.0/setup.py 2022-02-28 12:20:53.654551958 +0100
@@ -2,10 +2,6 @@
import sys
from setuptools import setup
-extra = {}
-if sys.version_info >= (3,):
- extra['use_2to3'] = True
-
setup(
name='marathon',
version='0.13.0',
@@ -30,5 +26,4 @@ setup(
'Programming Language :: Python',
'Topic :: Software Development :: Libraries :: Python Modules'
],
- **extra
)
++++++ python-marathon-use-collections.abc.patch ++++++
diff --git a/marathon/util.py b/marathon/util.py
index d9f5664..af2932e 100644
--- a/marathon/util.py
+++ b/marathon/util.py
@@ -1,4 +1,10 @@
-import collections
+# collections.abc new as of 3.3, and collections is deprecated. collections
+# will be unavailable in 3.9
+try:
+ import collections.abc as collections
+except ImportError:
+ import collections
+
import datetime
import logging
