From 11ece1763793a0dc6c28618500790a3211137281 Mon Sep 17 00:00:00 2001 From: David Shrewsbury Date: Tue, 21 May 2024 13:34:51 -0400 Subject: [PATCH 1/2] Fix test for get_role_list (#1361) (cherry picked from commit 877a4f16f6514d23f29b7a0fe2063291c284e027) --- test/integration/test_interface.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/test/integration/test_interface.py b/test/integration/test_interface.py index 457ea719..fecbc618 100644 --- a/test/integration/test_interface.py +++ b/test/integration/test_interface.py @@ -444,11 +444,8 @@ def test_get_role_list(project_fixtures, skipif_pre_ansible211): containing our test role. """ pdir = str(project_fixtures / 'music' / 'project') - expected_role = { - "collection": "", - "entry_points": { - "main": "The main entry point for the Into_The_Mystic role." - } + expected = { + "main": "The main entry point for the Into_The_Mystic role." } resp, _ = get_role_list(playbook_dir=pdir) @@ -457,7 +454,8 @@ def test_get_role_list(project_fixtures, skipif_pre_ansible211): # So that tests can work locally, where multiple roles might be returned, # we check for this single role. assert 'Into_The_Mystic' in resp - assert resp['Into_The_Mystic'] == expected_role + assert 'entry_points' in resp['Into_The_Mystic'] + assert resp['Into_The_Mystic']['entry_points'] == expected @pytest.mark.test_all_runtimes From 5cb10384ade1e8f043082de0d1bded50c3826a5c Mon Sep 17 00:00:00 2001 From: David Shrewsbury Date: Wed, 22 May 2024 10:24:07 -0400 Subject: [PATCH 2/2] Bump setuptools and setuptools_scm (#1365) (cherry picked from commit 97d98ed5cd23f9f9a0f4e31918ca7b4a8fd408f1) --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d7406560..6e698663 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=45, <=69.0.2", "setuptools-scm[toml]>=6.2, <=8.0.4"] # pin max versions of build deps and update as needed +requires = ["setuptools>=45, <=70.0.0", "setuptools-scm[toml]>=6.2, <=8.1.0"] # pin max versions of build deps and update as needed build-backend = "setuptools.build_meta" [tool.setuptools_scm]