Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge The Palace Circulation v15.0.1 into E-kirjasto #14

Merged
merged 35 commits into from
Feb 20, 2024

Conversation

ttuovinen
Copy link
Contributor

@ttuovinen ttuovinen commented Feb 19, 2024

Description

This PR brings in the circulation changes in the upstream until v15.0.1 to E-kirjasto (full changelog: v14.1.0...v15.0.1)

Changes in our code

  • OpenSearch Analytics initialisation moved to api/circulation_manager.py (according to file structure changes)
    • (NOTE: Following the recent changes in Palace, OpenSearch Analytics could perhaps be refactored into service)
  • Minor authentication test updates

Checklist

  • I have updated the documentation accordingly.
  • All new and existing tests passed.

dependabot bot and others added 30 commits January 17, 2024 19:39
* Replace opensearch integration with a service configuration.
* Use docker compose for our build tests
* Add new environment variable info to readme.
* Bump up admin-ui version.
* Allow OA titles to be imported in ODL feed.

* Add a comment

* Code review feedback: fix comment
…623)

* Pass along Flask mime_types for borrows.

* Convert serialized object to a string.

* Update loans test to include OPDS2 serialization.
* Refactor self tests
* Add some additional comments
Bumps [levenshtein](https://github.com/rapidfuzz/Levenshtein) from 0.23.0 to 0.24.0.
- [Release notes](https://github.com/rapidfuzz/Levenshtein/releases)
- [Changelog](https://github.com/rapidfuzz/Levenshtein/blob/main/HISTORY.md)
- [Commits](rapidfuzz/Levenshtein@v0.23.0...v0.24.0)

---
updated-dependencies:
- dependency-name: levenshtein
  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>
Bumps [pytz](https://github.com/stub42/pytz) from 2023.3.post1 to 2023.4.
- [Commits](stub42/pytz@release_2023.3.post1...release_2023.4)

---
updated-dependencies:
- dependency-name: pytz
  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>
Bumps [pyinstrument](https://github.com/joerick/pyinstrument) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/joerick/pyinstrument/releases)
- [Commits](joerick/pyinstrument@v4.6.1...v4.6.2)

---
updated-dependencies:
- dependency-name: pyinstrument
  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>
* Remove uses of the admin settings controller.
* Convert discovery_services tests.
* Fix up library settings tests
* Fix up catalog services controller tests.
* Replace admin controller fixture for TestAdminSearchController
* Replace admin controller fixture for DiscoveryServiceLibraryRegistrationsController
* Replace fixture for TestAdminPermissionsControllerMixin
* Replace fixtures in DeviceTokensController tests.
…893) (#1635)

* Remove SettingsController from IndividualAdminSettingsController
* Clean up dead code in self tests

Remove the now dead HasSelfTests class. Rename HasSelfTestsIntegrationConfiguration
to HasSelfTests since it has replaced the HasSelfTests class. Roll up the
BaseHasSelfTests class, since its no longer needed.

Update the tests to make sure they cover the new HasSelfTests classes.

* Codereview feedback: Fix comment.
…3) (#1636)

* Remove SettingsController from AnnouncementSettings

* Fix initialization
* Remove first book auth API.

* Update test
dependabot bot and others added 4 commits January 30, 2024 09:54
Bumps [types-pytz](https://github.com/python/typeshed) from 2023.3.1.1 to 2023.4.0.20240130.
- [Commits](https://github.com/python/typeshed/commits)

---
updated-dependencies:
- dependency-name: types-pytz
  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-pyopenssl](https://github.com/python/typeshed) from 23.3.0.20240106 to 24.0.0.20240130.
- [Commits](https://github.com/python/typeshed/commits)

---
updated-dependencies:
- dependency-name: types-pyopenssl
  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>
@ttuovinen ttuovinen marked this pull request as ready for review February 19, 2024 11:41
@ttuovinen ttuovinen merged commit 5c33ae3 into main Feb 20, 2024
19 checks passed
@ttuovinen ttuovinen deleted the merge_upstream_v15.0.1 branch February 20, 2024 11:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants