diff --git a/fix-assertion-method.patch b/fix-assertion-method.patch new file mode 100644 index 0000000..d9f0e6b --- /dev/null +++ b/fix-assertion-method.patch @@ -0,0 +1,25 @@ +Index: marathon-python-0.13.0/tests/test_model_app.py +=================================================================== +--- marathon-python-0.13.0.orig/tests/test_model_app.py ++++ marathon-python-0.13.0/tests/test_model_app.py +@@ -9,7 +9,7 @@ class MarathonAppTest(unittest.TestCase) + é testé + """ + app = MarathonApp() +- self.assertEquals(app.env, {}) ++ self.assertEqual(app.env, {}) + + def test_add_env_empty_dict(self): + app = MarathonApp() +Index: marathon-python-0.13.0/tests/test_model_deployment.py +=================================================================== +--- marathon-python-0.13.0.orig/tests/test_model_deployment.py ++++ marathon-python-0.13.0/tests/test_model_deployment.py +@@ -29,5 +29,5 @@ class MarathonDeploymentTest(unittest.Te + } + + deployment = MarathonDeployment.from_json(deployment_json) +- self.assertEquals(deployment.id, "ID") +- self.assertEquals(deployment.current_actions[0].app, "/app") ++ self.assertEqual(deployment.id, "ID") ++ self.assertEqual(deployment.current_actions[0].app, "/app") diff --git a/python-marathon.changes b/python-marathon.changes index 748eb26..ff3a1bf 100644 --- a/python-marathon.changes +++ b/python-marathon.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Jan 24 04:31:51 UTC 2024 - Steve Kowalik + +- Switch to autosetup and pyproject macros. +- Stop using greedy globs in %files. +- Actually run fdupes. +- Add patch fix-assertion-method.patch: + * Use assertEqual, not assertEquals. + ------------------------------------------------------------------- Mon Feb 28 11:36:47 UTC 2022 - pgajdos@suse.com diff --git a/python-marathon.spec b/python-marathon.spec index 8853499..de7931a 100644 --- a/python-marathon.spec +++ b/python-marathon.spec @@ -1,7 +1,7 @@ # # spec file for package python-marathon # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,26 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 Name: python-marathon Version: 0.13.0 Release: 0 Summary: Marathon Client Library License: MIT -Group: Development/Languages/Python URL: https://github.com/thefactory/marathon-python 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 +Patch2: fix-assertion-method.patch +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: %{python_module requests-mock} BuildRequires: %{python_module requests-toolbelt} BuildRequires: %{python_module requests} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} +BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-requests >= 2.4.0 Requires: python-requests-toolbelt >= 0.4.0 @@ -45,21 +46,21 @@ BuildArch: noarch Python interface to the Mesos Marathon REST API. %prep -%setup -q -n marathon-python-%{version} -%patch0 -p1 -%patch1 -p1 +%autosetup -p1 -n marathon-python-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} %check %pytest %files %{python_files} %license LICENSE -%{python_sitelib}/* +%{python_sitelib}/marathon +%{python_sitelib}/marathon-%{version}.dist-info %changelog