Skip to content

Commit

Permalink
Release 4.10.0
Browse files Browse the repository at this point in the history
No-Issue
  • Loading branch information
rochacbruno committed Sep 19, 2024
1 parent 9a404b5 commit 94e563c
Show file tree
Hide file tree
Showing 26 changed files with 97 additions and 47 deletions.
4 changes: 1 addition & 3 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 4.10.0dev
current_version = 4.10.0
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?
Expand All @@ -17,5 +17,3 @@ values =
[bumpversion:file:./galaxy_ng/app/__init__.py]

[bumpversion:file:./setup.py]

# [bumpversion:file:./docs/conf.py]
22 changes: 22 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
## 4.10.0 (2024-09-19) {: #4.10.0 }

#### Bugfixes

- Support SVG avatar image on namespaces
[#2836](https://github.com/ansible/galaxy_ng/issues/2836)
- Fixed issue where group members were also showing up as users in the Namespace owners list.
[#3121](https://github.com/ansible/galaxy_ng/issues/3121)
- Parameterize ansible-test importer resource requirements
[#3190](https://github.com/ansible/galaxy_ng/issues/3190)

#### Improved Documentation

- echo "add skeleton for galaxy_collection docs"
[#2420](https://github.com/ansible/galaxy_ng/issues/2420)

#### Misc

- [#2822](https://github.com/ansible/galaxy_ng/issues/2822), [#3036](https://github.com/ansible/galaxy_ng/issues/3036), [#3064](https://github.com/ansible/galaxy_ng/issues/3064), [#3358](https://github.com/ansible/galaxy_ng/issues/3358), [#18825](https://github.com/ansible/galaxy_ng/issues/18825)

---

=========
Changelog
=========
Expand Down
39 changes: 39 additions & 0 deletions CHANGES/.TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{# TOWNCRIER TEMPLATE #}
{% for section, _ in sections.items() %}
{%- set section_slug = "-" + section|replace(" ", "-")|replace("_", "-")|lower %}
{%- if section %}

### {{section}} {: #{{versiondata.version}}{{section_slug}} }
{% else %}
{%- set section_slug = "" %}
{% endif %}
{% if sections[section] %}
{% for category, val in definitions.items() if category in sections[section]%}

#### {{ definitions[category]['name'] }} {: #{{versiondata.version}}{{section_slug}}-{{category}} }

{% if definitions[category]['showcontent'] %}
{% for text, values in sections[section][category].items() %}
- {{ text }}
{% if values %}
{{ values|join(',\n ') }}
{% endif %}
{% endfor %}
{% else %}
- {{ sections[section][category]['']|join(', ') }}
{% endif %}
{% if sections[section][category]|length == 0 %}

No significant changes.
{% else %}
{% endif %}
{% endfor %}
{% else %}

No significant changes.
{% endif %}
{% endfor %}

---


1 change: 0 additions & 1 deletion CHANGES/18825.misc

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/2420.doc

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/2822.misc

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/2836.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/3036.misc

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/3064.misc

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/3121.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/3190.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/3358.misc

This file was deleted.

2 changes: 1 addition & 1 deletion galaxy_ng/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

sys.modules.setdefault("automated_logging", automated_logging)

__version__ = "4.10.0dev"
__version__ = "4.10.0"

default_app_config = "galaxy_ng.app.PulpGalaxyPluginAppConfig"
2 changes: 1 addition & 1 deletion galaxy_ng/app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class PulpGalaxyPluginAppConfig(PulpPluginAppConfig):

name = "galaxy_ng.app"
label = "galaxy"
version = "4.10.0dev"
version = "4.10.0"
python_package_name = "galaxy-ng"

def ready(self):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


@pytest.mark.ldap
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
def test_aap_renamed_ldap_user(
ansible_config,
settings,
Expand Down
2 changes: 1 addition & 1 deletion galaxy_ng/tests/integration/api/test_api_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from ..utils.iqe_utils import remove_from_cache


@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
@pytest.mark.deployment_standalone
@pytest.mark.skip_in_gw
def test_galaxy_api_root_standalone_no_auth_access(galaxy_client):
Expand Down
6 changes: 3 additions & 3 deletions galaxy_ng/tests/integration/api/test_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def test_token_auth(profile, galaxy_client, ansible_config):
"""
hub_version = get_hub_version(ansible_config)
expected_status_code = 401
if parse_version(hub_version) < parse_version('4.10.0dev'):
if parse_version(hub_version) < parse_version('4.10.0'):
expected_status_code = 403

gc = galaxy_client(profile)
Expand All @@ -49,7 +49,7 @@ def test_auth_admin(galaxy_client, ansible_config):
"""Test whether admin can not access collections page using invalid token."""
hub_version = get_hub_version(ansible_config)
expected_status_code = 401
if parse_version(hub_version) < parse_version('4.10.0dev'):
if parse_version(hub_version) < parse_version('4.10.0'):
expected_status_code = 403

gc = galaxy_client("admin")
Expand All @@ -67,7 +67,7 @@ def test_auth_exception(galaxy_client, ansible_config):
"""Test whether an HTTP exception when using an invalid token."""
hub_version = get_hub_version(ansible_config)
expected_status_code = 401
if parse_version(hub_version) < parse_version('4.10.0dev'):
if parse_version(hub_version) < parse_version('4.10.0'):
expected_status_code = 403

gc = galaxy_client("basic_user")
Expand Down
2 changes: 1 addition & 1 deletion galaxy_ng/tests/integration/api/test_hubjwt.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import pytest


@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
@pytest.mark.skip(reason='TBD')
def test_hub_jwt_auth():
pass
2 changes: 1 addition & 1 deletion galaxy_ng/tests/integration/api/test_ui_paths.py
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ def test_api_ui_v1_collection_detail_view(ansible_config, published):
# /api/automation-hub/_ui/v1/settings/
@pytest.mark.deployment_standalone
@pytest.mark.api_ui
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
@pytest.mark.skip_in_gw
def test_api_ui_v1_settings(ansible_config):

Expand Down
12 changes: 6 additions & 6 deletions galaxy_ng/tests/integration/dab/test_dab_rbac.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def test_dab_roledefs_match_pulp_roles(galaxy_client):


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
@pytest.mark.skipif(
os.environ.get('JWT_PROXY') is not None,
reason="Skipped because jwt proxy is in use"
Expand Down Expand Up @@ -141,7 +141,7 @@ def test_dab_rbac_repository_owner_by_user_or_team(


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
@pytest.mark.skipif(
os.environ.get('JWT_PROXY') is not None,
reason="Skipped because jwt proxy is in use"
Expand Down Expand Up @@ -292,7 +292,7 @@ def test_dab_rbac_namespace_owner_by_user_or_team(
os.environ.get('JWT_PROXY') is not None,
reason="Skipped because jwt proxy is in use"
)
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
def test_dab_user_platform_auditor_bidirectional_sync(
settings,
galaxy_client,
Expand Down Expand Up @@ -385,7 +385,7 @@ def test_dab_user_platform_auditor_bidirectional_sync(


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
def test_dab_team_platform_auditor_bidirectional_sync(
settings,
galaxy_client,
Expand Down Expand Up @@ -488,7 +488,7 @@ def test_dab_team_platform_auditor_bidirectional_sync(


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
def test_dab_user_assignment_filtering_as_user(
settings,
galaxy_client,
Expand Down Expand Up @@ -551,7 +551,7 @@ def test_dab_user_assignment_filtering_as_user(


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
@pytest.mark.skipif(
os.environ.get('JWT_PROXY') is not None,
reason="Skipped because jwt proxy is in use"
Expand Down
20 changes: 10 additions & 10 deletions galaxy_ng/tests/integration/dab/test_dab_rbac_contract.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

# This tests the basic DAB RBAC contract using custom roles to do things.
@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
def test_list_namespace_permissions(galaxy_client):
gc = galaxy_client("admin")
r = gc.get("_ui/v2/role_metadata/")
Expand All @@ -33,7 +33,7 @@ def test_list_namespace_permissions(galaxy_client):

# look for the content_type choices
@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
def test_role_definition_options(galaxy_client):
gc = galaxy_client("admin")
# TODO: add support for options in GalaxyClient in galaxykit
Expand Down Expand Up @@ -203,7 +203,7 @@ def check_system_role_user_assignments(client: GalaxyClient, user: dict, role: d


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
@pytest.mark.parametrize("by_api", ["dab", "pulp"])
def test_create_custom_namespace_system_admin_role(custom_role_factory, galaxy_client, by_api):
if by_api == "dab":
Expand All @@ -226,7 +226,7 @@ def test_create_custom_namespace_system_admin_role(custom_role_factory, galaxy_c


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
def test_give_user_custom_role_system(settings, galaxy_client, custom_role_factory, namespace):

if settings.get('ALLOW_LOCAL_RESOURCE_MANAGEMENT', True) is not True:
Expand Down Expand Up @@ -295,7 +295,7 @@ def test_give_user_custom_role_system(settings, galaxy_client, custom_role_facto


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
def test_give_team_custom_role_system(
settings,
galaxy_client,
Expand Down Expand Up @@ -367,7 +367,7 @@ def test_give_team_custom_role_system(

# TODO: We need another version of it for a team
@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
@pytest.mark.parametrize("by_role_api", ["dab", "pulp"])
@pytest.mark.parametrize("by_assignment_api", ["dab", "pulp"])
def test_give_user_custom_role_object(
Expand Down Expand Up @@ -457,7 +457,7 @@ def test_give_user_custom_role_object(
assert_object_role_assignments(admin_client, user, namespace, 0)


@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
@pytest.mark.deployment_standalone
def test_give_team_custom_role_object(
settings,
Expand Down Expand Up @@ -545,7 +545,7 @@ def test_give_team_custom_role_object(
assert ctx.value.response.status_code == HTTPStatus.FORBIDDEN


@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
def test_object_role_permission_validation(galaxy_client, custom_role_factory, namespace):
gc = galaxy_client("admin")

Expand Down Expand Up @@ -625,7 +625,7 @@ def assure_user_not_in_group():
return (user, group)


@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
def test_group_sync_from_pulp_to_dab(galaxy_client, assert_user_in_group, user_and_group):
gc = galaxy_client("admin")
user, group = user_and_group
Expand Down Expand Up @@ -670,7 +670,7 @@ def test_team_member_sync_from_dab_to_pulp(galaxy_client, assert_user_in_group,
assert_user_in_group(user["id"], group["id"], expected=True)


@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
def test_team_members_are_migrated(galaxy_client, assert_user_in_group):
"Make sure any existing team memberships are correct"
gc = galaxy_client("admin")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
def test_dab_rbac_pagination(galaxy_client):
gc = galaxy_client("admin", ignore_cache=True)
roledefs = gc.get('_ui/v2/role_definitions/?page_size=1')
Expand Down
2 changes: 1 addition & 1 deletion galaxy_ng/tests/integration/dab/test_system_auditor.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
@pytest.mark.skipif(
os.getenv("ENABLE_DAB_TESTS"),
reason="Skipping test because ENABLE_DAB_TESTS is set"
Expand Down
12 changes: 6 additions & 6 deletions galaxy_ng/tests/integration/dab/test_ui_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
@pytest.mark.parametrize("user_payload", [
{},
{"email": "[email protected]"},
Expand Down Expand Up @@ -65,7 +65,7 @@ def test_ui_v2_user_create(


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
@pytest.mark.parametrize("invalid_payload", [
({"email": "invalidemail"}, "Enter a valid email address."),
({"email": "@whoops"}, "Enter a valid email address."),
Expand Down Expand Up @@ -107,7 +107,7 @@ def test_ui_v2_user_create_invalid_data(


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
def test_ui_v2_user_edit(
settings,
galaxy_client,
Expand Down Expand Up @@ -150,7 +150,7 @@ def test_ui_v2_user_edit(


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
@pytest.mark.parametrize("invalid_payload", [
({"email": "invalidemail"}, "Enter a valid email address."),
({"email": "@whoops"}, "Enter a valid email address."),
Expand Down Expand Up @@ -205,7 +205,7 @@ def test_ui_v2_user_edit_invalid_data(


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
def test_ui_v2_teams(
settings,
galaxy_client,
Expand Down Expand Up @@ -248,7 +248,7 @@ def test_ui_v2_teams(


@pytest.mark.deployment_standalone
@pytest.mark.min_hub_version("4.10dev")
@pytest.mark.min_hub_version("4.10")
def test_ui_v2_teams_membership_local_and_nonlocal(
settings,
galaxy_client,
Expand Down
Loading

0 comments on commit 94e563c

Please sign in to comment.