diff --git a/add-missing-format-calls.patch b/add-missing-format-calls.patch deleted file mode 100644 index 842fe5c..0000000 --- a/add-missing-format-calls.patch +++ /dev/null @@ -1,86 +0,0 @@ -Index: grimoirelab-sortinghat-1.2.1/tests/test_schema.py -=================================================================== ---- grimoirelab-sortinghat-1.2.1.orig/tests/test_schema.py -+++ grimoirelab-sortinghat-1.2.1/tests/test_schema.py -@@ -22,6 +22,7 @@ - # - - import datetime -+import unittest - import unittest.mock - import json - import httpretty -@@ -1408,6 +1409,7 @@ class TestQueryPagination(django.test.Te - self.assertEqual(pag_data['endIndex'], 6) - self.assertEqual(pag_data['totalResults'], 6) - -+ @unittest.skip("Broken") - def test_page_size_negative(self): - """Check if it fails when `pageSize` is a negative number""" - -@@ -6399,7 +6401,8 @@ class TestAddIdentityMutation(django.tes - variables=params) - - msg = executed['errors'][0]['message'] -- self.assertEqual(msg, INDIVIDUAL_DOES_NOT_EXIST_ERROR) -+ self.assertEqual( -+ msg, INDIVIDUAL_DOES_NOT_EXIST_ERROR.format(uuid=params['uuid'])) - - def test_add_identity_name_none(self): - """Check if the username is set to the profile when no name is provided""" -@@ -8195,7 +8198,8 @@ class TestWithdrawMutation(django.test.T - variables=params) - - msg = executed['errors'][0]['message'] -- self.assertEqual(msg, INDIVIDUAL_DOES_NOT_EXIST_ERROR) -+ self.assertEqual( -+ msg, INDIVIDUAL_DOES_NOT_EXIST_ERROR.format(uuid=params['uuid'])) - - def test_non_existing_organization(self): - """Check if it fails when the organization does not exist""" -@@ -9882,6 +9886,7 @@ class TestUnifyMutation(django.test.Test - source='scm', - uuid=self.jrae.uuid) - -+ @unittest.skip("Broken") - @unittest.mock.patch('sortinghat.core.jobs.rq.job.uuid4') - def test_unify(self, mock_job_id_gen): - """Check if unify is applied for the specified individuals""" -@@ -9954,6 +9959,7 @@ class TestUnifyMutation(django.test.Test - id5 = identities[4] - self.assertEqual(id5, self.jr2) - -+ @unittest.skip("Broken") - @unittest.mock.patch('sortinghat.core.jobs.rq.job.uuid4') - def test_unify_last_modified(self, mock_job_id_gen): - """Check if unify is applied only for the individuals modified after a date""" -Index: grimoirelab-sortinghat-1.2.1/tests/cli/test_cmd_config.py -=================================================================== ---- grimoirelab-sortinghat-1.2.1.orig/tests/cli/test_cmd_config.py -+++ grimoirelab-sortinghat-1.2.1/tests/cli/test_cmd_config.py -@@ -41,10 +41,10 @@ MOCK_CONFIG_FILEPATH = os.path.join(os.p - - - CONFIG_FILE_EXISTS_ERROR = "Error: Configuration file {} already exists. Use '--overwrite' to replace it.\n" --INVALID_CONFIG_FILE = "Error: Could not open file {}: [Errno 21] Is a directory: '{}'\n" -+INVALID_CONFIG_FILE = "Error: Could not open file '{}': [Errno 21] Is a directory: '{}'\n" - SET_KEY_CONFIG_ERROR = "Error: {} config parameter is not supported\n" - GET_KEY_CONFIG_ERROR = "Error: {} config parameter is not supported\n" --NOT_FOUND_FILE_ERROR = "Error: Could not open file {}: file does not exist\n" -+NOT_FOUND_FILE_ERROR = "Error: Could not open file '{}': file does not exist\n" - - - class TestInitConfig(unittest.TestCase): -Index: grimoirelab-sortinghat-1.2.1/sortinghat/core/decorators.py -=================================================================== ---- grimoirelab-sortinghat-1.2.1.orig/sortinghat/core/decorators.py -+++ grimoirelab-sortinghat-1.2.1/sortinghat/core/decorators.py -@@ -68,6 +68,8 @@ check_auth = user_passes_test(lambda u: - - - def check_permissions(perms): -+ if isinstance(perms, str): -+ perms = (perms,) - return user_passes_test(lambda u: u.has_perms(perms)) - - diff --git a/python-sortinghat.changes b/python-sortinghat.changes index 7e3fba0..cc5ae6f 100644 --- a/python-sortinghat.changes +++ b/python-sortinghat.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Oct 7 20:49:57 UTC 2024 - Dirk Müller + +- update to 1.4.0: + * Less distracting main identity indicator + * Redirect to the original URL after log in + * Merge organizations when adding an alias + * Customizable trusted sources for username matching + * Users permissions migrated (#849) + * Update workspace when identities are split (#919) +- update to 1.3.0: + * Remove merge recommendations (#883) + * Merge organizations when adding an alias (#913) + * User permissions per tenant + * The link to an individual's GitHub profile no longer + appears several times when there is more than one GitHub + identity. + * Connection closed when job is executed +- drop add-missing-format-calls.patch (obsolete) + ------------------------------------------------------------------- Wed Aug 28 03:30:10 UTC 2024 - Steve Kowalik @@ -104,16 +124,16 @@ Thu Jul 20 05:47:36 UTC 2023 - Steve Kowalik ------------------------------------------------------------------- Sat Dec 3 00:58:41 UTC 2022 - Yogalakshmi Arunachalam -- Update to version 0.7.23 +- Update to version 0.7.23 * Update Poetry's package dependencies -- Update to version 0.7.22 +- Update to version 0.7.22 * Update Poetry's package dependencies ------------------------------------------------------------------- Sat Oct 29 01:20:39 UTC 2022 - Yogalakshmi Arunachalam -- Update to version 0.7.21 +- Update to version 0.7.21 * Update package dependencies * Update jinja2 package and dev-dependencies. * Update Poetry's package dependencies @@ -122,7 +142,7 @@ Sat Oct 29 01:20:39 UTC 2022 - Yogalakshmi Arunachalam ------------------------------------------------------------------- Fri Oct 7 16:13:30 UTC 2022 - Yogalakshmi Arunachalam -- Update to version 0.7.20 +- Update to version 0.7.20 Bug fixes: * [gitdm] Skip invalid format lines * Gitdm parser won't fail reading files with an invalid format. Instead, diff --git a/python-sortinghat.spec b/python-sortinghat.spec index 4ac6bd0..893d9a5 100644 --- a/python-sortinghat.spec +++ b/python-sortinghat.spec @@ -17,7 +17,7 @@ Name: python-sortinghat -Version: 1.2.1 +Version: 1.4.0 Release: 0 Summary: A tool to manage identities License: GPL-3.0-only @@ -25,7 +25,6 @@ URL: https://github.com/grimoirelab/sortinghat Source: https://github.com/chaoss/grimoirelab-sortinghat/archive/refs/tags/%{version}.tar.gz#/sortinghat-%{version}.tar.gz # PATCH-FIX-OPENSUSE Allow overridding the database config Patch0: allow-database-config-overrides.patch -Patch1: add-missing-format-calls.patch BuildRequires: %{python_module base >= 3.9} BuildRequires: %{python_module pip} BuildRequires: %{python_module poetry-core} diff --git a/sortinghat-1.2.1.tar.gz b/sortinghat-1.2.1.tar.gz deleted file mode 100644 index 5b8b538..0000000 --- a/sortinghat-1.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e524a0ff1dccca14decfa9231a6e531fa94225ad1ffa7d491f3f9c728b223ffe -size 2255793 diff --git a/sortinghat-1.4.0.tar.gz b/sortinghat-1.4.0.tar.gz new file mode 100644 index 0000000..ec91337 --- /dev/null +++ b/sortinghat-1.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f05891207a8bad8e2c8b5d11b007e29ad3a12fea43cbb9d5b62cd736f481319 +size 2270815