merge main into feature/vote-decrypt (#2405)

* Fix structure level migration test order error (#2274) * Bump actions/github-script from 6 to 7 (#2277) Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](actions/github-script@v6...v7) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Implement readding of interposed questions (#2237) * Implement readding of interposed questions * Remove weight calculation change and restrict more * Update meta * Bump types-pyyaml in /requirements/partial (#2287) Bumps [types-pyyaml](https://github.com/python/typeshed) from 6.0.12.12 to 6.0.12.20240311. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-pyyaml dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pytest from 8.0.2 to 8.1.1 in /requirements/partial (#2288) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.2 to 8.1.1. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](pytest-dev/pytest@8.0.2...8.1.1) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump types-redis in /requirements/partial (#2290) Bumps [types-redis](https://github.com/python/typeshed) from 4.6.0.20240218 to 4.6.0.20240311. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-redis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump types-pygments in /requirements/partial (#2292) Bumps [types-pygments](https://github.com/python/typeshed) from 2.17.0.20240106 to 2.17.0.20240310. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-pygments dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update meta repository (#2294) Co-authored-by: jsangmeister <[email protected]> * Bump types-requests in /requirements/partial (#2286) Bumps [types-requests](https://github.com/python/typeshed) from 2.31.0.20240218 to 2.31.0.20240311. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump types-bleach in /requirements/partial (#2289) Bumps [types-bleach](https://github.com/python/typeshed) from 6.1.0.20240222 to 6.1.0.20240311. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-bleach dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump types-simplejson in /requirements/partial (#2291) Bumps [types-simplejson](https://github.com/python/typeshed) from 3.19.0.20240218 to 3.19.0.20240310. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-simplejson dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump mypy from 1.8.0 to 1.9.0 in /requirements/partial (#2283) * Bump mypy from 1.8.0 to 1.9.0 in /requirements/partial Bumps [mypy](https://github.com/python/mypy) from 1.8.0 to 1.9.0. - [Changelog](https://github.com/python/mypy/blob/master/CHANGELOG.md) - [Commits](python/mypy@v1.8.0...1.9.0) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Fix email typings --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joshua Sangmeister <[email protected]> * Bump autoflake from 2.3.0 to 2.3.1 in /requirements/partial (#2297) Bumps [autoflake](https://github.com/PyCQA/autoflake) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/PyCQA/autoflake/releases) - [Commits](PyCQA/autoflake@v2.3.0...v2.3.1) --- updated-dependencies: - dependency-name: autoflake dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update meta repository (#2298) Co-authored-by: jsangmeister <[email protected]> * Fix \update-meta command (#2299) * Fix \update-meta command (#2300) * Fix \update-meta command (#2301) * Fix \update-meta command (#2302) * Fix \update-meta command (#2303) * Add staging branches to CI (#2255) * Implement cascade delete for amendments (#2253) * Implement certain preventions for changing active speakers state (#2272) * Update all translations (#2282) * Update meta repository (#2304) Co-authored-by: jsangmeister <[email protected]> * Add colgroup and col to allowed html tags (#2305) * Update meta repository (#2308) Co-authored-by: jsangmeister <[email protected]> * Handle zero default time in projector_countdown.create (#2285) * Add remaining_time to SlLoS.update (#2279) * Add remaining_time to SlLoS.update * Expand sllos update test * Make test not internal * Update meta repository (#2310) Co-authored-by: jsangmeister <[email protected]> * Fix participant import re-upload structure_level error (#2313) * Fix KeyError in entitled users calculation (#2314) * Bump black from 24.2.0 to 24.3.0 in /requirements/partial (#2316) Bumps [black](https://github.com/psf/black) from 24.2.0 to 24.3.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](psf/black@24.2.0...24.3.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix fixed list order in tests (#2317) * Fix fixed list order in tests * Fix mypy * Fix test_longer_migration (#2320) * Add migration to remove empty structure level remnants (#2325) * Add migration to remove empty structure level remnants * Fix data file migration indices * Remove consistency check for PoO settings (#2326) * Add new los setting for hiding the secondary contribution count (#2296) * Add new los setting for hiding the secondary contribution count * Rename setting * Update meta repository (#2327) Co-authored-by: luisa-beerboom <[email protected]> * Change perm for user actions (#2322) * Change perm for user actions * Change other actions and write tests * Remove import changes * Fix speaker update KeyError (#2328) * Bump python from 3.10.13-slim-bookworm to 3.10.14-slim-bookworm (#2329) Bumps python from 3.10.13-slim-bookworm to 3.10.14-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pyupgrade from 3.15.1 to 3.15.2 in /requirements/partial (#2334) Bumps [pyupgrade](https://github.com/asottile/pyupgrade) from 3.15.1 to 3.15.2. - [Commits](asottile/pyupgrade@v3.15.1...v3.15.2) --- updated-dependencies: - dependency-name: pyupgrade dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pytest-cov from 4.1.0 to 5.0.0 in /requirements/partial (#2333) Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 4.1.0 to 5.0.0. - [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst) - [Commits](pytest-dev/pytest-cov@v4.1.0...v5.0.0) --- updated-dependencies: - dependency-name: pytest-cov dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update meta repository (#2336) Co-authored-by: jsangmeister <[email protected]> * Stop paused speakers in speaker.speak (#2332) * Update meta repository (#2338) Co-authored-by: jsangmeister <[email protected]> * Fix close-issues workflow (#2339) * Add user to group in case of saml login (#2335) * saml_login with adding group to user * add group-add to saml_id save_saml_account * fix annotations from code review --------- Co-authored-by: Ralf Peschke <[email protected]> * Bump types-bleach in /requirements/partial (#2345) Bumps [types-bleach](https://github.com/python/typeshed) from 6.1.0.20240311 to 6.1.0.20240331. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-bleach dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix readd_last with anonymous interposed questions (#2341) * Bump werkzeug from 3.0.1 to 3.0.2 in /requirements/partial (#2347) Bumps [werkzeug](https://github.com/pallets/werkzeug) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/pallets/werkzeug/releases) - [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst) - [Commits](pallets/werkzeug@3.0.1...3.0.2) --- updated-dependencies: - dependency-name: werkzeug dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump types-requests in /requirements/partial (#2350) Bumps [types-requests](https://github.com/python/typeshed) from 2.31.0.20240311 to 2.31.0.20240403. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update actions to docker compose v2 (#2349) * Bump the opentelemetry-dependencies group in /requirements/partial with 5 updates (#2342) * Bump the opentelemetry-dependencies group Bumps the opentelemetry-dependencies group in /requirements/partial with 5 updates: | Package | From | To | | --- | --- | --- | | [opentelemetry-api](https://github.com/open-telemetry/opentelemetry-python) | `1.23.0` | `1.24.0` | | [opentelemetry-sdk](https://github.com/open-telemetry/opentelemetry-python) | `1.23.0` | `1.24.0` | | [opentelemetry-exporter-otlp](https://github.com/open-telemetry/opentelemetry-python) | `1.23.0` | `1.24.0` | | [opentelemetry-instrumentation-flask](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.44b0` | `0.45b0` | | [opentelemetry-instrumentation-requests](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.44b0` | `0.45b0` | Updates `opentelemetry-api` from 1.23.0 to 1.24.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-python/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-python/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-python@v1.23.0...v1.24.0) Updates `opentelemetry-sdk` from 1.23.0 to 1.24.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-python/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-python/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-python@v1.23.0...v1.24.0) Updates `opentelemetry-exporter-otlp` from 1.23.0 to 1.24.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-python/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-python/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-python@v1.23.0...v1.24.0) Updates `opentelemetry-instrumentation-flask` from 0.44b0 to 0.45b0 - [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits) Updates `opentelemetry-instrumentation-requests` from 0.44b0 to 0.45b0 - [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits) --- updated-dependencies: - dependency-name: opentelemetry-api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-dependencies - dependency-name: opentelemetry-sdk dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-dependencies - dependency-name: opentelemetry-exporter-otlp dependency-type: direct:production update-type: version-update:semver-minor dependency-group: opentelemetry-dependencies - dependency-name: opentelemetry-instrumentation-flask dependency-type: direct:production dependency-group: opentelemetry-dependencies - dependency-name: opentelemetry-instrumentation-requests dependency-type: direct:production dependency-group: opentelemetry-dependencies ... Signed-off-by: dependabot[bot] <[email protected]> * Update datastore * Update auth service --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joshua Sangmeister <[email protected]> Co-authored-by: Joshua Sangmeister <[email protected]> * Replace lxml with existing bs4 methods (#2354) * Update meta repository (#2355) Co-authored-by: bastianjoel <[email protected]> * Bump types-requests in /requirements/partial (#2358) Bumps [types-requests](https://github.com/python/typeshed) from 2.31.0.20240403 to 2.31.0.20240406. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pypdf[crypto] from 4.1.0 to 4.2.0 in /requirements/partial (#2357) Bumps [pypdf[crypto]](https://github.com/py-pdf/pypdf) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/py-pdf/pypdf/releases) - [Changelog](https://github.com/py-pdf/pypdf/blob/main/CHANGELOG.md) - [Commits](py-pdf/pypdf@4.1.0...4.2.0) --- updated-dependencies: - dependency-name: pypdf[crypto] dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * FIx auth service URL in requirements (#2359) * Fix closes-issues action (#2363) * Update meta repository (#2362) Co-authored-by: jsangmeister <[email protected]> * Bump types-redis in /requirements/partial (#2364) Bumps [types-redis](https://github.com/python/typeshed) from 4.6.0.20240311 to 4.6.0.20240409. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-redis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * New delegator restriction settings (#2361) * Start implementing new delegator settings * Implement for support_self * Implement speaker action changes * cleanup * Remove presence stuff * Update meta repository (#2367) Co-authored-by: luisa-beerboom <[email protected]> * add meeting to schema for saml_attribut configuration (#2368) * Bump black from 24.3.0 to 24.4.0 in /requirements/partial (#2371) Bumps [black](https://github.com/psf/black) from 24.3.0 to 24.4.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](psf/black@24.3.0...24.4.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update meta repository (#2372) Co-authored-by: m-schieder <[email protected]> * Bump gunicorn from 21.2.0 to 22.0.0 in /requirements/partial (#2374) * Bump gunicorn from 21.2.0 to 22.0.0 in /requirements/partial Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 21.2.0 to 22.0.0. - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](benoitc/gunicorn@21.2.0...22.0.0) --- updated-dependencies: - dependency-name: gunicorn dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Update datastore --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joshua Sangmeister <[email protected]> * Bump types-redis in /requirements/partial (#2375) Bumps [types-redis](https://github.com/python/typeshed) from 4.6.0.20240409 to 4.6.0.20240417. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-redis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add new meeting setting for topic navigation (#2366) * Update meta repository (#2380) Co-authored-by: jsangmeister <[email protected]> * Add initial data creation (#2295) * Cleanup interface usages & add initial data creation * Fix tests * Fix test_exceptions.py * Extend initial data creation for superadmin password & add tests * Fix tests * Rename env var * Change dependabot assignee (#2383) * Bump types-redis in /requirements/partial (#2384) Bumps [types-redis](https://github.com/python/typeshed) from 4.6.0.20240417 to 4.6.0.20240423. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-redis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump black from 24.4.0 to 24.4.1 in /requirements/partial (#2388) Bumps [black](https://github.com/psf/black) from 24.4.0 to 24.4.1. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](psf/black@24.4.0...24.4.1) --- updated-dependencies: - dependency-name: black dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add get_forwarding_committee presenter (#2385) * Add get_forwarding_committee presenter payload: A committee_id, returns: a list with committee names * Change payload to meeting_id and add permission check * Update meta repository (#2386) Co-authored-by: r-peschke <[email protected]> * Bump mypy from 1.9.0 to 1.10.0 in /requirements/partial (#2387) * Bump mypy from 1.9.0 to 1.10.0 in /requirements/partial Bumps [mypy](https://github.com/python/mypy) from 1.9.0 to 1.10.0. - [Changelog](https://github.com/python/mypy/blob/master/CHANGELOG.md) - [Commits](python/mypy@1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * fix mypy error, IMO a mypy bug * fix flake8 error --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ralf Peschke <[email protected]> * Update meta repository (#2389) Co-authored-by: r-peschke <[email protected]> * Fix return type (#2390) * Bump types-redis in /requirements/partial (#2392) Bumps [types-redis](https://github.com/python/typeshed) from 4.6.0.20240423 to 4.6.0.20240425. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-redis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump roman from 4.1 to 4.2 in /requirements/partial (#2393) Bumps [roman](https://github.com/zopefoundation/roman) from 4.1 to 4.2. - [Changelog](https://github.com/zopefoundation/roman/blob/master/CHANGES.rst) - [Commits](zopefoundation/roman@4.1...4.2) --- updated-dependencies: - dependency-name: roman dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update meta repository (#2394) Co-authored-by: r-peschke <[email protected]> * Update meta repository (#2395) Co-authored-by: Elblinator <[email protected]> * Add setting to forbid delegator from voting (#2396) * Add action for cherry-picking staging changes (#2398) * Update meta repository (#2397) Co-authored-by: rrenkert <[email protected]> * Bump black from 24.4.1 to 24.4.2 in /requirements/partial (#2400) Bumps [black](https://github.com/psf/black) from 24.4.1 to 24.4.2. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](psf/black@24.4.1...24.4.2) --- updated-dependencies: - dependency-name: black dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pytest from 8.1.1 to 8.2.0 in /requirements/partial (#2401) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.1.1 to 8.2.0. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](pytest-dev/pytest@8.1.1...8.2.0) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update meta repository (#2404) Co-authored-by: r-peschke <[email protected]> * Add empty test cryptographic --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Joshua Sangmeister <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: luisa-beerboom <[email protected]> Co-authored-by: openslides-automation[bot] <125256978+openslides-automation[bot]@users.noreply.github.com> Co-authored-by: Joshua Sangmeister <[email protected]> Co-authored-by: Emanuel Schütze <[email protected]> Co-authored-by: Bastian Rihm <[email protected]> Co-authored-by: reiterl <[email protected]> Co-authored-by: Ralf Peschke <[email protected]> Co-authored-by: bastianjoel <[email protected]> Co-authored-by: m-schieder <[email protected]> Co-authored-by: r-peschke <[email protected]> Co-authored-by: Elblinator <[email protected]> Co-authored-by: peb-adr <[email protected]> Co-authored-by: rrenkert <[email protected]>
OpenSlides · May 7, 2024 · 23df269 · 23df269
1 parent c01fb1b
commit 23df269
Show file tree

Hide file tree

Showing 119 changed files with 5,569 additions and 2,020 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,7 +5,7 @@ updates:
     schedule:
       interval: "daily"
     assignees:
-      - "jsangmeister"
+      - "r-peschke"
     groups:
        opentelemetry-dependencies:
           patterns:
@@ -17,7 +17,7 @@ updates:
     schedule:
       interval: "daily"
     assignees:
-      - "jsangmeister"
+      - "r-peschke"
     ignore:
       - dependency-name: "python"
         update-types: ["version-update:semver-minor"]
@@ -27,4 +27,4 @@ updates:
     schedule:
       interval: "daily"
     assignees:
-      - "jsangmeister"
+      - "r-peschke"
diff --git a/.github/workflows/close-issues.yml b/.github/workflows/close-issues.yml
@@ -1,5 +1,5 @@
 on:
-  pull_request:
+  pull_request_target:
     types:
       - closed
     branches:
@@ -38,15 +38,15 @@ jobs:
               }
             }
           variables: |
-            owner: ${{ github.event.repository.owner.name }}
-            repo: ${{ github.event.repository.name }}
+            owner: ${{ github.repository_owner }}
+            name: ${{ github.event.repository.name }}
             number: ${{ github.event.pull_request.number }}
 
       - name: Close issues
         env:
           GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
         run: |
-          issue_data="$(echo "${{ steps.get-issues.outputs.data }}" | jq -r '.data.repository.pullRequest.closingIssuesReferences.nodes[] | [.number,.repository.nameWithOwner] | @tsv')"
-          echo "$issue_data" | while read number nameWithOwner; do
+          issue_data="$(echo '${{ steps.get-issues.outputs.data }}' | jq -r '.repository.pullRequest.closingIssuesReferences.nodes[] | [.number,.repository.nameWithOwner] | @tsv')"
+          echo "$issue_data" | grep -v "^$" | while read number nameWithOwner; do
             gh issue close "$number" -r "$nameWithOwner"
           done
diff --git a/.github/workflows/commands.yml b/.github/workflows/commands.yml
@@ -15,24 +15,25 @@ jobs:
       )
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
       - name: Generate access token
         uses: tibdex/github-app-token@v2
         id: generate-token
         with:
           app_id: ${{ secrets.AUTOMATION_APP_ID }}
           private_key: ${{ secrets.AUTOMATION_APP_PRIVATE_KEY }}
+
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: recursive
+          token: ${{ steps.generate-token.outputs.token }}
 
       - name: Checkout PR
         env:
-          GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
-        run: gh pr checkout ${{ github.event.issue.number }}
-
-      - name: Update submodule
-        run: git submodule update --init --recursive
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
+        run: |
+          git config --global submodule.recurse true
+          gh pr checkout ${{ github.event.issue.number }}
 
       - name: Set git credentials
         run: |
@@ -60,7 +61,7 @@ jobs:
       
       - name: Write failure comment
         if: steps.merge.outputs.result != '' && steps.conflicts.outputs.result != ''
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             github.rest.issues.createComment({
@@ -74,7 +75,7 @@ jobs:
         if: steps.merge.outputs.result != '' && steps.conflicts.outputs.result == ''
         working-directory: ${{ steps.path.outputs.path }}
         env:
-          GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
         run: |
           gh pr checkout $(gh pr list --search $(git rev-parse HEAD) --json number --jq ".[0].number")
           git fetch origin main
@@ -83,4 +84,4 @@ jobs:
       
       - name: Finish merge & push result
         if: steps.merge.outputs.result != '' && steps.conflicts.outputs.result == ''
-        run: git add . && git merge --continue --no-edit && git push
+        run: git commit -a --no-edit && git push
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - 'feature/**'
+      - 'staging/**'
   merge_group:
     types: [checks_requested]
 
@@ -28,17 +29,17 @@ jobs:
       run: mkdir secrets && echo -n "openslides" > secrets/postgres_password
 
     - name: Run docker production image
-      run: docker-compose -f docker-compose.prod.yml up --build -d
+      run: docker compose -f docker-compose.prod.yml up --build -d
 
     - name: Wait for action service
       # we have to execute this inside the container since the port to the outside is opened directly after the
       # container started, while the code itself is not ready yet
-      run: docker-compose -f docker-compose.prod.yml exec -T backend-action scripts/wait.sh backend-action 9002
+      run: docker compose -f docker-compose.prod.yml exec -T backend-action scripts/wait.sh backend-action 9002
 
     - name: Wait for presenter service
       # we have to execute this inside the container since the port to the outside is opened directly after the
       # container started, while the code itself is not ready yet
-      run: docker-compose -f docker-compose.prod.yml exec -T backend-presenter scripts/wait.sh backend-presenter 9003
+      run: docker compose -f docker-compose.prod.yml exec -T backend-presenter scripts/wait.sh backend-presenter 9003
 
     - name: Fire a test request to actions component
       run: curl localhost:9002/system/action/health

diff --git a/.github/workflows/pick-to-staging.yml b/.github/workflows/pick-to-staging.yml
@@ -0,0 +1,66 @@
+name: Cherry pick staging PRs merged into main
+
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - 'main'
+
+
+jobs:
+  create-pr-for-staging:
+    if: |
+      github.event.pull_request.merged == true &&
+      contains(github.event.pull_request.labels.*.name, 'staging')
+    name: Create PR against staging branch
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout main
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          fetch-depth: 2
+
+      - name: Fetch and checkout latest staging branch
+        run: |
+          branch=$(git ls-remote --heads origin 'staging*' | tail -1 | awk 'gsub(".*refs/heads/","")')
+          git fetch origin $branch
+          git checkout $branch
+
+      - name: Set git credentials
+        run: |
+          git config --global user.name openslides-automation
+          git config --global user.email [email protected]
+
+      - name: Cherry-pick new commit
+        id: cherry-pick
+        run: |
+          git fetch origin
+          # -m 1 to also be able to cherry-pick merge commits
+          git cherry-pick -m 1 ${{ github.sha }} || {
+            echo "error=1" >> $GITHUB_OUTPUT
+            git add .
+            git cherry-pick --continue
+          }
+
+      - name: Generate access token
+        uses: tibdex/github-app-token@v2
+        id: generate-token
+        with:
+          app_id: ${{ secrets.AUTOMATION_APP_ID }}
+          private_key: ${{ secrets.AUTOMATION_APP_PRIVATE_KEY }}
+
+      - name: Create or update PR
+        uses: peter-evans/create-pull-request@v6
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          branch: apply/commit-${{ github.sha }}
+          delete-branch: true
+          title: "[Cherry-Pick] ${{ github.event.pull_request.title }}"
+          body: "Triggered by commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }})\n\n${{ steps.cherry-pick.outputs.error && 'There were conflicts during the cherry-pick. These were commited without any resolving. Please resolve them manually and push the result to this branch before merging.' || 'The cherry-pick was successful without any conflicts. You should be able to simply merge this PR.' }}"
+          reviewers: ${{ github.event.pull_request.user.login }}
+          assignees: ${{ github.event.pull_request.user.login }}
+          labels: picked-to-staging
+          milestone: 4
diff --git a/.github/workflows/staging-to-main.yml b/.github/workflows/staging-to-main.yml
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10.13-slim-bookworm
+FROM python:3.10.14-slim-bookworm
 
 RUN apt-get -y update && apt-get -y upgrade && \
     apt-get install --no-install-recommends -y curl ncat git mime-support gcc libc-dev libpq-dev libmagic1

diff --git a/Makefile b/Makefile
@@ -88,16 +88,16 @@ run-prod: | build-prod
 # Build and run development docker container setup with docker compose (not usable inside docker container)
 
 start-dev:
-	USER_ID=$$(id -u $${USER}) GROUP_ID=$$(id -g $${USER}) docker-compose -f dev/docker-compose.dev.yml up --build --detach
+	USER_ID=$$(id -u $${USER}) GROUP_ID=$$(id -g $${USER}) docker compose -f dev/docker-compose.dev.yml up --build --detach
 
 start-dev-attach start-dev-interactive:
-	USER_ID=$$(id -u $${USER}) GROUP_ID=$$(id -g $${USER}) docker-compose -f dev/docker-compose.dev.yml up --build
+	USER_ID=$$(id -u $${USER}) GROUP_ID=$$(id -g $${USER}) docker compose -f dev/docker-compose.dev.yml up --build
 
 stop-dev:
-	docker-compose -f dev/docker-compose.dev.yml down --volumes
+	docker compose -f dev/docker-compose.dev.yml down --volumes
 
 run-dev-attach:
-	docker-compose -f dev/docker-compose.dev.yml exec backend ./entrypoint.sh bash --rcfile .bashrc
+	docker compose -f dev/docker-compose.dev.yml exec backend ./entrypoint.sh bash --rcfile .bashrc
 
 run-dev run-bash: | start-dev run-dev-attach
 
@@ -108,16 +108,16 @@ run-tests:
 # Build and run development container with local datastore in use
 
 start-dev-local:
-	USER_ID=$$(id -u $${USER}) GROUP_ID=$$(id -g $${USER}) docker-compose -f dev/docker-compose.dev.yml -f dev/dc.local.yml up --build --detach
+	USER_ID=$$(id -u $${USER}) GROUP_ID=$$(id -g $${USER}) docker compose -f dev/docker-compose.dev.yml -f dev/dc.local.yml up --build --detach
 
 start-dev-attach-local start-dev-interactive-local:
-	USER_ID=$$(id -u $${USER}) GROUP_ID=$$(id -g $${USER}) docker-compose -f dev/docker-compose.dev.yml -f dev/dc.local.yml up --build
+	USER_ID=$$(id -u $${USER}) GROUP_ID=$$(id -g $${USER}) docker compose -f dev/docker-compose.dev.yml -f dev/dc.local.yml up --build
 
 stop-dev-local:
-	docker-compose -f dev/docker-compose.dev.yml -f dev/dc.local.yml down --volumes
+	docker compose -f dev/docker-compose.dev.yml -f dev/dc.local.yml down --volumes
 
 run-dev-attach-local:
-	docker-compose -f dev/docker-compose.dev.yml -f dev/dc.local.yml exec backend ./entrypoint.sh bash --rcfile .bashrc
+	docker compose -f dev/docker-compose.dev.yml -f dev/dc.local.yml exec backend ./entrypoint.sh bash --rcfile .bashrc
 
 run-dev-local run-bash-local: | start-dev-local run-dev-attach-local
 

diff --git a/README.md b/README.md
@@ -108,6 +108,14 @@ The action component listens to port 9002. The presenter component listens to po
 
   Seconds after which an action is delegated to an action worker. `-1` represents an infinite timeout. `-2` deactivates action workers and local threading alltogether. Default: `1`
 
+* `OPENSLIDES_BACKEND_CREATE_INITIAL_DATA`
+
+  Whether or not to create initial data. Uses the `initial-data.json` in productive mode and the `example-data.json` in dev mode. Can only be set for the action service. Default: `0`
+
+* `SUPERADMIN_PASSWORD_FILE`
+
+  If `OPENSLIDES_BACKEND_CREATE_INITIAL_DATA` is true, use the password in the given file as the password for the user with id `1`. Only applicable in productive mode. Default: `/run/secrets/superadmin`
+
 ### Development
 
 * `OPENSLIDES_DEVELOPMENT`

diff --git a/dev/run-local.sh b/dev/run-local.sh
@@ -2,7 +2,7 @@
 
 export COMPOSE_DOCKER_CLI_BUILD=0
 
-DC="docker-compose -f dev/docker-compose.dev.yml -f dev/dc.local.yml"
+DC="docker compose -f dev/docker-compose.dev.yml -f dev/dc.local.yml"
 
 $DC up --build --detach
 $DC exec -T backend scripts/wait.sh datastore-writer 9011

diff --git a/dev/run-tests.sh b/dev/run-tests.sh
@@ -2,7 +2,7 @@
 
 export COMPOSE_DOCKER_CLI_BUILD=0
 
-DC="docker-compose -f dev/docker-compose.dev.yml"
+DC="docker compose -f dev/docker-compose.dev.yml"
 
 $DC up --build --detach
 $DC exec -T backend scripts/wait.sh datastore-writer 9011

diff --git a/docs/actions/list_of_speakers.re_add_last.md b/docs/actions/list_of_speakers.re_add_last.md
@@ -7,6 +7,7 @@
 Readds the last finished speaker user (the highest `end_time`) to the list of waiting speakers. This fails, if
 - There is no last finished speaker
 - The last finished speaker is already a waiting speaker with the same point-of-order status
+- The speech state of the last speaker is `interposed_question` and there is no unfinished speaker
 
 The new waiting speaker gets the weight of `min-1` of all waiting speakers or 1, if there are no waiting speakers.
 

diff --git a/docs/actions/meeting.update.md b/docs/actions/meeting.update.md
@@ -122,6 +122,10 @@
     users_email_replyto: string;
     users_email_subject: string;
     users_email_body: string;
+    users_forbid_delegator_in_list_of_speakers: boolean;
+    users_forbid_delegator_as_submitter: boolean;
+    users_forbid_delegator_as_supporter: boolean;
+    users_forbid_delegator_to_vote: boolean;
 
     assignments_export_title: string;
     assignments_export_preamble: string;
@@ -191,7 +195,7 @@ If `set_as_template` is `True`, `template_for_organization_id` has to be set to
 
 ## Permissions
 - Users with `meeting.can_manage_settings` can modify group A
-- Users with `user.can_manage` can modify group B
+- Users with `user.can_update` can modify group B
 - Users with `projector.can_manage` can modify group C
 - Admins of the meeting can modify group D
 - Users with CML `can_manage` or users with a OML of `can_manage_organization` can modify group E

diff --git a/docs/actions/motion.create.md b/docs/actions/motion.create.md
@@ -130,6 +130,7 @@ Repeat an autonumbering task from above, but set the states `set_number=false`.
 
 ## Permissions
 The request user needs:
+- `motion.can_manage` if he has his vote delegated and the meeting has `users_forbid_delegator_as_submitter`
 - `motion.can_create_amendments` if `lead_motion_id` is given
 - `motion.can_create` else
 

diff --git a/docs/actions/motion.set_support_self.md b/docs/actions/motion.set_support_self.md
@@ -10,4 +10,6 @@
 This adds (support=True) or removes (support=False) the request user from `motion/supporter_ids`. This action fails, if the supporter system is deactivated (`meeting/motions_supporters_min_amount` is 0) or the motion state's `state/allow_support` is false.
 
 ## Permissions
-The request user needs `motion.can_support`.
+The request user generally needs `motion.can_support`.
+
+However, if the meeting has `users_forbid_delegator_as_supporter` and the request user has his vote delegated in the meeting, he needs `motion.can_manage` instead.