main merged into Feature/vote decrypt #2278

r-peschke · 2024-03-06T16:55:34Z

No description provided.

…ides#2227) Bumps [pyupgrade](https://github.com/asottile/pyupgrade) from 3.15.0 to 3.15.1. - [Commits](asottile/pyupgrade@v3.15.0...v3.15.1) --- 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>

…es#2226) Bumps [autoflake](https://github.com/PyCQA/autoflake) from 2.2.1 to 2.3.0. - [Release notes](https://github.com/PyCQA/autoflake/releases) - [Commits](PyCQA/autoflake@v2.2.1...v2.3.0) --- updated-dependencies: - dependency-name: autoflake 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>

Bumps [types-requests](https://github.com/python/typeshed) from 2.31.0.20240125 to 2.31.0.20240218. - [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>

…2224) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.0 to 8.0.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.0...8.0.1) --- updated-dependencies: - dependency-name: pytest 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>

…Slides#2222) Bumps [pypdf[crypto]](https://github.com/py-pdf/pypdf) from 4.0.1 to 4.0.2. - [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.0.1...4.0.2) --- updated-dependencies: - dependency-name: pypdf[crypto] 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>

Bumps [types-redis](https://github.com/python/typeshed) from 4.6.0.20240106 to 4.6.0.20240218. - [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>

Bumps [types-simplejson](https://github.com/python/typeshed) from 3.19.0.2 to 3.19.0.20240218. - [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>

…des#2220) * Allow initial_time to be changed regardless of speach status * Make it reset remaining_time

* Add migration command to clear collectionfield tables * Update docs

* Enhance speaker creation * Fix tests * Add setting to meeting.update * Fix readd_last * Update meta repo * Fix models.py --------- Co-authored-by: rrenkert <[email protected]>

* Create mixin for motion update and create payload validation * Make mixin check extensions * Split mixin into two and make recognizing multiple problems possible * Prepare mixin for usage in json_upload * Un-comment json_upload headers * Start implementing motion.json_upload * Start building in lookups * Finish implementing lookups * Start implementing motion.import * Start writing tests for json_upload * Generalize test framework * Fix tests * Fix tests anew * Add new tests * Fix more tests * Refactor tests * Add duplicate tests * Add category tests * Add notes * Fix find duplicate test * Add more category tests and expand Lookup class * Add last category test * Clean up category tests * Start adding username tests * a * Generate users * Add basic submitter tests * Make first couple of submitter tests work * Add more expansive submitter tests * Finish simple user tests * Finalize user field functionality * Finish json_upload * general cleanup and start work on import * Write motion import * Add motion amendment test * Add more tests * Make sure the json_upload registers intended deletions * Cleanup json upload * First tests with references * Build in submitter sorting * Finish import code for now * Make payload checks in import * Test different models found * Add more tests for import * cleanup * Use datastore filters instead of lookups for foreign relations * Add amendment and verbose user field tests * add json_upload result based import tests * Remove wrong is_object flag from category_prefix header * Remove collection_field from Lookup class * Stop mocking ids * cleanup * Check forbidden_numbers first * Remove unnecessary code, make user warn messages more precise * Make tag warn messages more precise * cleanup * Fix after rebase * Determine meeting membership via meeting_ids field in json_upload * Change how list field errors are generated in json_upload * Make changes in accordance to recent models yml changes * Use one datastore call for all user fields in import * Show tag- and usernames in import errors * Add database corrupt error for if user is found multiple times * Fix after merge * cleanup * Rewrite motion.json_upload test * Start reimplementing import tests * Fix current tests * Finish tests and function for now * cleanup * cleanup * Maybe fix tests * Add som tests * Fix tests * Fix meta reference * use assert_model_exists * Update meta to main * Update meta to main 2 --------- Co-authored-by: Joshua Sangmeister <[email protected]>

Co-authored-by: jsangmeister <[email protected]>

Bumps [types-bleach](https://github.com/python/typeshed) from 6.1.0.1 to 6.1.0.20240222. - [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>

…2248) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.1 to 8.0.2. - [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.1...8.0.2) --- updated-dependencies: - dependency-name: pytest 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>

Co-authored-by: jsangmeister <[email protected]>

…th 5 updates (OpenSlides#2247) * 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.22.0` | `1.23.0` | | [opentelemetry-sdk](https://github.com/open-telemetry/opentelemetry-python) | `1.22.0` | `1.23.0` | | [opentelemetry-exporter-otlp](https://github.com/open-telemetry/opentelemetry-python) | `1.22.0` | `1.23.0` | | [opentelemetry-instrumentation-flask](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.43b0` | `0.44b0` | | [opentelemetry-instrumentation-requests](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.43b0` | `0.44b0` | Updates `opentelemetry-api` from 1.22.0 to 1.23.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.22.0...v1.23.0) Updates `opentelemetry-sdk` from 1.22.0 to 1.23.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.22.0...v1.23.0) Updates `opentelemetry-exporter-otlp` from 1.22.0 to 1.23.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.22.0...v1.23.0) Updates `opentelemetry-instrumentation-flask` from 0.43b0 to 0.44b0 - [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.43b0 to 0.44b0 - [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 export_service_commits.sh --------- 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]>

* Remove default_numbers from users * Add migration * Rearrange migration * Fix example data * Fix example- and initial-data.json

* Add new user permissions * Update permission script * Fix code style * Rename permission

Co-authored-by: jsangmeister <[email protected]>

)

…2256) (OpenSlides#2259) Co-authored-by: Joshua Sangmeister <[email protected]>

* Add cascade deletion to new motion fields * Add asserts

Bumps [types-beautifulsoup4](https://github.com/python/typeshed) from 4.12.0.20240106 to 4.12.0.20240229. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-beautifulsoup4 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>

Co-authored-by: jsangmeister <[email protected]>

…#2194)

Co-authored-by: luisa-beerboom <[email protected]>

Co-authored-by: jsangmeister <[email protected]>

…Slides#2271) Bumps [pypdf[crypto]](https://github.com/py-pdf/pypdf) from 4.0.2 to 4.1.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.0.2...4.1.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>

…s#2263) * Ensure consistent order for list_of_speakers.re_add_last * Fix order

…nSlides#2273) Bumps [aiosmtpd](https://github.com/aio-libs/aiosmtpd) from 1.4.4.post2 to 1.4.5. - [Release notes](https://github.com/aio-libs/aiosmtpd/releases) - [Changelog](https://github.com/aio-libs/aiosmtpd/blob/master/release.py) - [Commits](aio-libs/aiosmtpd@1.4.4.post2...v1.4.5) --- updated-dependencies: - dependency-name: aiosmtpd 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>

Co-authored-by: jsangmeister <[email protected]>

* Add merge command * Fix indentation & command

jsangmeister · 2024-03-07T08:23:51Z

Tip for the next time: If you run make run-dev without the -local option, it will output a more concise error:

The conflict is caused by:
     datastore 1.0.0 depends on redis==5.0.2
     authlib 1.0.0 depends on redis==5.0.1

r-peschke · 2024-03-07T08:49:47Z

Tip for the next time: If you run make run-dev without the -local option, it will output a more concise error:
The conflict is caused by:
     datastore 1.0.0 depends on redis==5.0.2
     authlib 1.0.0 depends on redis==5.0.1

Thank you for the tip:-). I saw it in the github checks. My idea was to build it locally and could see the problem. But didn't find any redis 5.0.1. The reason: auth service will not be build from local data.

dependabot bot and others added 30 commits February 20, 2024 08:24

Allow initial_time to be changed regardless of speach status (OpenSli…

0d31b17

…des#2220) * Allow initial_time to be changed regardless of speach status * Make it reset remaining_time

Add migration command to clear collectionfield tables (OpenSlides#2217)

7182546

* Add migration command to clear collectionfield tables * Update docs

Enhance speaker creation (OpenSlides#2231)

48edf75

* Enhance speaker creation * Fix tests * Add setting to meeting.update * Fix readd_last * Update meta repo * Fix models.py --------- Co-authored-by: rrenkert <[email protected]>

Update meta repository (OpenSlides#2235)

4991674

Co-authored-by: jsangmeister <[email protected]>

Make SLLoS ignore point-of-order time (OpenSlides#2240)

ec6d2bb

Fix PoO for others (OpenSlides#2242)

5aef715

Update meta repository (OpenSlides#2249)

2205cc1

Co-authored-by: jsangmeister <[email protected]>

Remove default_numbers from users (OpenSlides#2192)

5dec8d0

* Remove default_numbers from users * Add migration * Rearrange migration * Fix example data * Fix example- and initial-data.json

Add new user permissions (OpenSlides#2158)

bd30db1

* Add new user permissions * Update permission script * Fix code style * Rename permission

Update meta repository (OpenSlides#2254)

52bad0d

Co-authored-by: jsangmeister <[email protected]>

Stop paused point of order upon start of other speech (OpenSlides#2244)

5891534

Throw custom error for wrong decimal format in imports (OpenSlides#2250)

6c56a4a

Fix meeting.import handling of forwarding_committee_ids (OpenSlides#2245

cd9d76f

)

Automatically create PRs for commits on staging branches (OpenSlides#…

0af9859

…2256) (OpenSlides#2259) Co-authored-by: Joshua Sangmeister <[email protected]>

Add cascade deletion to new motion fields (OpenSlides#2243)

8a52cbe

* Add cascade deletion to new motion fields * Add asserts

Update meta repository (OpenSlides#2261)

c34fe75

Co-authored-by: jsangmeister <[email protected]>

Add ability to update workflow_timestamp to motion.update (OpenSlides…

06f7d7c

…#2194)

Update meta repository (OpenSlides#2264)

f48bd79

Co-authored-by: luisa-beerboom <[email protected]>

openslides-automation bot and others added 12 commits March 4, 2024 08:12

Update meta repository (OpenSlides#2265)

8d9a4bc

Co-authored-by: jsangmeister <[email protected]>

Update meta repository (OpenSlides#2267)

040035e

Co-authored-by: jsangmeister <[email protected]>

wip (OpenSlides#2258)

e983064

Update meta repository (OpenSlides#2270)

ada8ceb

Co-authored-by: jsangmeister <[email protected]>

Ensure consistent order for list_of_speakers.re_add_last (OpenSlide…

bdb4297

…s#2263) * Ensure consistent order for list_of_speakers.re_add_last * Fix order

Update meta repository (OpenSlides#2275)

7d573b6

Co-authored-by: jsangmeister <[email protected]>

Add merge command (OpenSlides#2257)

98e2b8d

* Add merge command * Fix indentation & command

Automatically close feature branch issues (OpenSlides#2276)

fc83a46

main merged

2eeabca

set current datastore commit hash

fe04da6

r-peschke self-assigned this Mar 6, 2024

r-peschke added needs discussion waiting Waiting for some other PR/feature; more details in comments labels Mar 6, 2024

r-peschke added this to the 4.x milestone Mar 6, 2024

fix auth-service commit hash

c01fb1b

r-peschke requested a review from jsangmeister March 7, 2024 08:43

r-peschke assigned jsangmeister and unassigned r-peschke Mar 7, 2024

r-peschke removed needs discussion waiting Waiting for some other PR/feature; more details in comments labels Mar 7, 2024

r-peschke merged commit c01fb1b into OpenSlides:feature/vote-decrypt Mar 7, 2024
6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

main merged into Feature/vote decrypt #2278

main merged into Feature/vote decrypt #2278

r-peschke commented Mar 6, 2024 •

edited

Loading

jsangmeister commented Mar 7, 2024

r-peschke commented Mar 7, 2024

main merged into Feature/vote decrypt #2278

main merged into Feature/vote decrypt #2278

Conversation

r-peschke commented Mar 6, 2024 • edited Loading

jsangmeister commented Mar 7, 2024

r-peschke commented Mar 7, 2024

r-peschke commented Mar 6, 2024 •

edited

Loading