Accepting request 965081 from devel:languages:python

- update to 1.1.4:
- Switched from Nose to Pytest for testing.
- Fix to Issue #34, in which
  `print_matrix` wasn't handling non-integral values.
- Various changes from `http:` URLs to `https:` URLs
- drop python-munkres-remove-nose.patch (obsolete)

OBS-URL: https://build.opensuse.org/request/show/965081
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-munkres?expand=0&rev=5

python-munkres-remove-nose.patch

@@ -1,90 +0,0 @@
---- munkres-release-1.1.2/test/test_munkres.py.orig	2020-09-14 19:17:32.667531075 +0000
-+++ munkres-release-1.1.2/test/test_munkres.py	2020-09-14 19:24:53.882111837 +0000
-@@ -1,6 +1,6 @@
- from munkres import Munkres, DISALLOWED, UnsolvableMatrix
- import munkres
--from nose.tools import assert_equals, raises
-+import pytest
- 
- m = Munkres()
- 
-@@ -16,7 +16,7 @@ def test_documented_example():
-               [10, 3, 2],
-               [8, 7, 4]]
-     cost = _get_cost(matrix)
--    assert_equals(cost, 12)
-+    assert cost == 12
- 
- def test_5_x_5():
-     matrix = [[12, 9, 27, 10, 23],
-@@ -25,7 +25,7 @@ def test_5_x_5():
-               [9, 28, 26, 23, 13],
-               [16, 16, 24, 6, 9]]
-     cost = _get_cost(matrix)
--    assert_equals(cost, 51)
-+    assert cost == 51
- 
- def test_10_x_10():
-     matrix = [[37, 34, 29, 26, 19, 8, 9, 23, 19, 29],
-@@ -39,7 +39,7 @@ def test_10_x_10():
-               [21, 25, 23, 39, 31, 37, 32, 33, 38, 1],
-               [17, 34, 40, 10, 29, 37, 40, 3, 25, 3]]
-     cost = _get_cost(matrix)
--    assert_equals(cost, 66)
-+    assert cost == 66
- 
- def test_20_x_20():
-     matrix = [[5, 4, 3, 9, 8, 9, 3, 5, 6, 9, 4, 10, 3, 5, 6, 6, 1, 8, 10, 2],
-@@ -63,14 +63,14 @@ def test_20_x_20():
-               [9, 6, 3, 1, 8, 5, 7, 8, 7, 2, 1, 8, 2, 8, 3, 7, 4, 8, 7, 7],
-               [8, 4, 4, 9, 7, 10, 6, 2, 1, 5, 8, 5, 1, 1, 1, 9, 1, 3, 5, 3]]
-     cost = _get_cost(matrix)
--    assert_equals(cost, 22)
-+    assert cost == 22
- 
- def test_disallowed():
-     matrix = [[5, 9, DISALLOWED],
-               [10, DISALLOWED, 2],
-               [8, DISALLOWED, 4]]
-     cost = _get_cost(matrix)
--    assert_equals(cost, 19)
-+    assert cost == 19
- 
- def test_profit():
-     profit_matrix = [[94, 66, 100, 18, 48],
-@@ -84,7 +84,7 @@ def test_profit():
-     )
-     indices = m.compute(cost_matrix)
-     profit = sum([profit_matrix[row][column] for row, column in indices])
--    assert_equals(profit, 392)
-+    assert profit == 392
- 
- def test_irregular():
-     matrix = [[12, 26, 17],
-@@ -94,7 +94,7 @@ def test_irregular():
-               [15, 93, 55, 80]]
- 
-     cost = _get_cost(matrix)
--    assert_equals(cost, 43)
-+    assert cost == 43
- 
- def test_rectangular():
-     matrix = [[34, 26, 17, 12],
-@@ -106,13 +106,13 @@ def test_rectangular():
-     padded_matrix = m.pad_matrix(matrix, 0)
-     padded_cost = _get_cost(padded_matrix)
-     cost = _get_cost(matrix)
--    assert_equals(padded_cost, cost)
--    assert_equals(cost, 70)
-+    assert padded_cost == cost
-+    assert cost == 70
- 
--@raises(UnsolvableMatrix)
- def test_unsolvable():
-     matrix = [[5, 9, DISALLOWED],
-               [10, DISALLOWED, 2],
-               [DISALLOWED, DISALLOWED, DISALLOWED]]
--    m.compute(matrix)
-+    with pytest.raises(UnsolvableMatrix):
-+        m.compute(matrix)
- 

python-munkres.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Mar 26 19:58:13 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- update to 1.1.4:
+- Switched from Nose to Pytest for testing.
+- Fix to Issue #34, in which
+  `print_matrix` wasn't handling non-integral values.
+- Various changes from `http:` URLs to `https:` URLs
+- drop python-munkres-remove-nose.patch (obsolete)
+
 -------------------------------------------------------------------
 Mon Sep 14 19:32:25 UTC 2020 - pgajdos@suse.com
 

python-munkres.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-munkres
 #
-# 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
@@ -19,15 +19,13 @@
 %define skip_python2 1
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-munkres
-Version:        1.1.2
+Version:        1.1.4
 Release:        0
 Summary:        Munkres implementation for Python
 License:        Apache-2.0
 Group:          Development/Languages/Python
-URL:            http://software.clapper.org/munkres/
+URL:            https://software.clapper.org/munkres/
 Source:         https://github.com/bmc/munkres/archive/release-%{version}.tar.gz
-# https://github.com/bmc/munkres/pull/32
-Patch0:         python-munkres-remove-nose.patch
 BuildRequires:  %{python_module setuptools}
 # SECTION test requirements
 BuildRequires:  %{python_module pytest}
@@ -50,7 +48,6 @@ http://csclab.murraystate.edu/~bob.pilgrim/445/munkres.html.
 
 %prep
 %setup -q -n munkres-release-%{version}
-%patch0 -p1
 
 %build
 %python_build

release-1.1.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a25570d1498d4ce86b6ed151f3afa1da7318deac56db25100ccbdb9b12625c3
-size 11186