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

DF-838:ETNA-ROSETTA: DO NOT MERGE UNTIL #1483

Closed
wants to merge 17 commits into from
Closed

Conversation

TNA-Allan
Copy link
Collaborator

@TNA-Allan TNA-Allan commented Dec 5, 2023

Ticket URL: https://national-archives.atlassian.net/browse/DF-838

DO NOT MERGE UNTIL

  • Merge to develop will happen when we want to switch off KONG API or for some other reason.

About these changes

  • This branch contains changes for Etna Rosetta. It is a long running branch and environment until above criteria are met.
  • Rosetta API changes are merged here
  • Etna changes from develop are merged here via sync/PR
  • features, fixes for the work for Etna Rosetta are created from etna-rosetta branch which in turn should be synced with etna-rosetta branch.
  • contains an exclusive CD for env with same branch (will need to remove when merged to develop)
  • environment vars: API_CLIENT_NAME_PREFIX, ROSETTA_DEV_CLIENT_BASE_URL

TODO Before Merges

  • Remove Etna ## ETNA-ROSETTA WORKFLOW from README.md

How to check these changes

  • check changes made for etna-rosetta in the environment when PR's are merged into etna-rosetta

Before assigning to reviewer, please make sure you have

  • Checked things thoroughly before handing over to reviewer
  • Checked PR title starts with ticket number as per project conventions to help us keep track of changes
  • Ensured that PR includes only commits relevant to the ticket
  • Waited for all CI jobs to pass before requesting a review
  • Added/updated tests and documentation where relevant

Merging PR guidance

Follow docs\developer-guide\contributing.md

Deployment guidance

Follow docs\infra\environments.md

TNA-Allan and others added 3 commits November 28, 2023 13:21
Co-authored-by: JohnHeeryTNA <[email protected]>
Co-authored-by: Andrew Hosgood <[email protected]>
Co-authored-by: Helen Chapman <[email protected]>
Co-authored-by: jamesbiggs <[email protected]>
Co-authored-by: janehughes <[email protected]>
Conflicts:
	templates/whatson/exhibition_page.html

Changes to be committed:
	new file:   etna/articles/migrations/0100_remove_focusedarticlepage_author.py
	modified:   etna/articles/models.py
	modified:   etna/authors/models.py
	new file:   etna/whatson/migrations/0008_eventpage_need_to_know_button_link_and_more.py
	modified:   etna/whatson/models.py
	modified:   lint-requirements.txt
	modified:   poetry.lock
	modified:   pyproject.toml
	modified:   sass/etna.scss
	new file:   sass/includes/_useful-info.scss
	modified:   scripts/src/modules/search/global-search.js
	modified:   templates/articles/focused_article_page.html
	new file:   templates/includes/useful-info.html
	modified:   templates/search/blocks/search_landing_hero.html
	modified:   templates/whatson/exhibition_page.html
@TNA-Allan TNA-Allan changed the title ETNA-ROSETTA: DO NOT MERGE YET DF-838:ETNA-ROSETTA: DO NOT MERGE YET Dec 6, 2023
@TNA-Allan TNA-Allan changed the title DF-838:ETNA-ROSETTA: DO NOT MERGE YET DF-838:ETNA-ROSETTA: DO NOT MERGE UNTIL Dec 6, 2023
@TNA-Allan TNA-Allan added the finding Work relating to the Finding team label Jan 2, 2024
TNA-Allan and others added 6 commits January 2, 2024 16:05
Co-authored-by: Andrew Hosgood <[email protected]>
Co-authored-by: GitHub Action <[email protected]>
Co-authored-by: JohnHeeryTNA <[email protected]>
Conflicts:
	etna/records/tests/test_urls.py

Changes to be committed:
	modified:   .platform.app.yaml
	modified:   config/settings/base.py
	modified:   config/settings/dev.py
	new file:   config/settings/util.py
	modified:   etna/ciim/tests/test_utils.py
	modified:   etna/collections/tests/test_models.py
	modified:   etna/core/tests/test_decorators.py
	modified:   etna/core/tests/test_middleware.py
	modified:   etna/records/tests/test_blocks.py
	modified:   etna/records/tests/test_models.py
	modified:   etna/records/tests/test_urls.py
	modified:   etna/records/tests/test_views.py
@ahosgood ahosgood marked this pull request as ready for review January 18, 2024 13:32
@ahosgood ahosgood marked this pull request as draft January 18, 2024 13:32
@ahosgood
Copy link
Member

Closing this PR as the work will be re-done in the new ds-search repository

@ahosgood ahosgood closed this Sep 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
finding Work relating to the Finding team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants