From cc450cf145984efa18dd496857be72eb2113f0c1 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Sat, 28 Mar 2026 10:09:25 +0100 Subject: [PATCH 1/4] sharing/bday/doc: remove legacy --- DOCUMENTATION.md | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index e86c72ec..e09a5a0b 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -2127,14 +2127,6 @@ Share collection by map Default: `false` -##### collection_by_bday - -_(>= 3.7.0)_ - -Share collection by bday (conversion on-the-fly) - -Default: `false` - ##### permit_create_token _(>= 3.7.0)_ @@ -2157,17 +2149,6 @@ Default: `false` * If `False` it can be explicitly granted by *rights* permissions: `M` * If `True` it can be explicitly forbidden by *rights* permissions: `m` -##### permit_create_bday - -_(>= 3.7.0)_ - -Permit create of bday-based sharing - -Default: `false` - -* If `False` it can be explicitly granted by *rights* permissions: `B` -* If `True` it can be explicitly forbidden by *rights* permissions: `b` - ##### permit_properties_overlay _(>= 3.7.0)_ @@ -2434,8 +2415,6 @@ The following `permissions` are recognized: * **t:** deny create of token-based sharing of collection in case `permit_create_token=True` _(>= 3.7.0)_ * **M:** permit create of map-based sharing of collection in case `permit_create_map= False` _(>= 3.7.0)_ * **m:** deny create of map-based sharing of collection in case `permit_create_map=True` _(>= 3.7.0)_ -* **B:** permit create of bday-based sharing of addressbook collection in case `permit_create_bday= False` _(>= 3.7.0)_ -* **b:** deny create of bday-based sharing of addressbook collection in case `permit_create_bday=True` _(>= 3.7.0)_ ### Storage From 1b633a45516e93b457c3e888bbf2ffdfda2483b4 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Sat, 28 Mar 2026 10:09:47 +0100 Subject: [PATCH 2/4] sharing/bday/config: remove legacy --- radicale/config.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/radicale/config.py b/radicale/config.py index b223ff3c..0d50dc7b 100644 --- a/radicale/config.py +++ b/radicale/config.py @@ -487,10 +487,6 @@ DEFAULT_CONFIG_SCHEMA: types.CONFIG_SCHEMA = OrderedDict([ "value": "false", "help": "enable sharing of collection by map", "type": bool}), - ("collection_by_bday", { # TODO: remove/3.7.0-final - "value": "false", # TODO: remove/3.7.0-final - "help": "enable sharing of collection by bday (conversion on-the-fly)", # TODO: remove/3.7.0-final - "type": bool}), # TODO: remove/3.7.0-final ("permit_create_token", { "value": "false", "help": "permit create of token-based sharing", @@ -499,10 +495,6 @@ DEFAULT_CONFIG_SCHEMA: types.CONFIG_SCHEMA = OrderedDict([ "value": "false", "help": "permit create of map-based sharing", "type": bool}), - ("permit_create_bday", { # TODO: remove/3.7.0-final - "value": "false", # TODO: remove/3.7.0-final - "help": "permit create of bday-based sharing", # TODO: remove/3.7.0-final - "type": bool}), # TODO: remove/3.7.0-final ("permit_properties_overlay", { "value": "false", "help": "permit properties overlay", From 9069626f1a09379d300cfb6cfcf1db188b9fa94e Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Sat, 28 Mar 2026 10:10:04 +0100 Subject: [PATCH 3/4] sharing/bday/config-option: remove use of legacy --- integ_tests/common.py | 2 -- radicale/tests/test_sharing.py | 8 ++------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/integ_tests/common.py b/integ_tests/common.py index eabbaf00..45a089f9 100644 --- a/integ_tests/common.py +++ b/integ_tests/common.py @@ -114,8 +114,6 @@ collection_by_token = true permit_create_token = true permit_create_map = true permit_properties_overlay = true -collection_by_bday = true -permit_create_bday = true database_path = {sharing_path} """ ) diff --git a/radicale/tests/test_sharing.py b/radicale/tests/test_sharing.py index 52ebddb7..f337a080 100644 --- a/radicale/tests/test_sharing.py +++ b/radicale/tests/test_sharing.py @@ -4796,12 +4796,10 @@ permissions: RrWw""") "htpasswd_encryption": "plain"}, "sharing": { "type": "csv", - "permit_create_bday": True, "permit_create_token": True, "permit_properties_overlay": "True", "enforce_properties_overlay": "True", - "collection_by_token": "True", - "collection_by_bday": "True"}, + "collection_by_token": "True"}, "logging": {"request_header_on_debug": "False", "response_header_on_debug": "True", "response_content_on_debug": "True", @@ -4908,12 +4906,10 @@ permissions: RrWw""") "htpasswd_encryption": "plain"}, "sharing": { "type": "csv", - "permit_create_bday": True, "permit_create_token": True, "permit_properties_overlay": "True", "enforce_properties_overlay": "True", - "collection_by_token": "True", - "collection_by_bday": "True"}, + "collection_by_token": "True"}, "logging": {"request_header_on_debug": "False", "response_header_on_debug": "True", "response_content_on_debug": "True", From a8daae6b20477a8c0bcebbb42ad789f7319cedc5 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Sat, 28 Mar 2026 10:12:01 +0100 Subject: [PATCH 4/4] test workflow: add integ-test to chain to stop early preventing resource consumtion --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 740ba86c..9566d06d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: test-python-32bit: name: Test Ubuntu:latest Python:32-bit - needs: [lint, test-ubuntu-python-newest] + needs: [lint, test-ubuntu-python-newest, integ-test] strategy: matrix: os: [ubuntu-latest]