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 staging into production, 2023 Nov 10 edition #1146

Merged
merged 100 commits into from Nov 24, 2023
Merged

Conversation

jacobdgm
Copy link
Contributor

@jacobdgm jacobdgm commented Nov 10, 2023

When updating production, we need to remember to run python manage.py add_differentiae.

Nov 15 update: new code is running on staging, and all tests are passing.

Nov 21 update: the changelog is complete! let testing commence!

Changes:

  • general:
    • There is now a script to remap user contributions (e.g. who created which source, etc.). This needs to be tested on staging, and @annamorphism needs to verify that it worked properly before we run it on production.
      • this script appears to have bugs, so we've disabled it for now
  • all pages
    • footer:
      • the email icon in the footer now sends an email to Debra's email address rather than cantus@cantusindex.org
      • the copyright year has been updated from 2022 to 2023
  • Admin Area
    • Change Chant
      • old differentiae_database field has been hidden (this field has been replaced by the diff_db field (labelled "differentiae database"). the differentiae_database field will eventually be removed entirely)
    • Source Change
      • "source status" field is now hidden
  • Chant Create
    • there now exists a Differentiae Database autofill field
    • Office and Genre fields are now autocomplete fields
    • Office, Genre, Feast autocomplete fields search for contains matches instead of just startswith
    • Feast autocomplete no longer searches by feast code
    • we no longer send requests to CI when loading this view, and we no longer suggest fulltexts for new chants (we plan to reintroduce this feature in the near future)
  • Chant Detail
    • Differentiae Database snippets are now displayed
    • we no longer send requests to CI when loading this view, and the concordances tables have been replaced with a message directing people to CI
  • Chant Edit
    • there now exists a Differentiae Database autofill field
    • we no longer send requests to CI when loading this view, and we no longer suggest fulltexts for chants without fulltexts (we plan to reintroduce this feature in the near future)
    • Office, Genre, Feast autocomplete fields search for contains matches instead of just startswith
    • Feast autocomplete no longer searches by feast code
  • Chant Search
    • users can no longer search for chants without melodies
  • CI Search
    • this view has been temporarily removed (we plan to reimplement this view in the near future)
  • Full Index
    • we've added a "DD" (i.e., Differentiae Database) column
  • Melody Search page
    • fixed bug with melody search interface where it would break when window was resized
    • fixed bug with interface where staff would spill onto a second line when the window was narrow
  • Source Create
    • Provenance is now an Autocomplete field
  • Source Detail
    • previously, source descriptions, liturgical occasions and selected bibliographies would all run together onto single lines. Line breaks are now preserved.
  • Source Edit
    • Provenance is now an Autocomplete field
  • under the hood:
    • the urllib3 version was bumped from 1.26.5 to 1.26.17
    • Chant.differentiae_new was renamed to .differentiae_database
    • all pages now send traffic reports to Google Analytics (this will only be present on production)
    • A new DifferentiaeDatabase model has been added - see Chant Create/Detail/Edit. As of the evening of Wed Nov 15, I'm running python manage.py add_differentiae on staging, and this will also need to be run on Production

dependabot bot and others added 30 commits October 3, 2023 04:46
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.5 to 1.26.17.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@1.26.5...1.26.17)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
…oject/urllib3-1.26.17

build(deps): bump urllib3 from 1.26.5 to 1.26.17 in /django/cantusdb_project
Rename "differentia_new" field to "differentiae_database"
mostly containing print statements for the moment for testing
Source Detail: ensure line breaks are preserved when displaying TextFields
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.17 to 1.26.18.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@1.26.17...1.26.18)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Revert "chant detail: change viewing permissions for proofread fields"
Merge develop into staging, 2023-Nov-15 edition
@jacobdgm
Copy link
Contributor Author

jacobdgm commented Nov 21, 2023

sigh... I just found #1161. Going to have to fix that first before we continue testing...

update: I just opened #1162. Waiting for approval before merging into the staging branch and updating the staging server.

update: #1162 is merged, and the changes are running on the staging server!

@jacobdgm
Copy link
Contributor Author

update: #1165 has been discovered, so we did #1167. This change still needs to make its way to the Staging machine.

The internet at McGill isn't working today, so I've gone to a library to attempt to get something done. I had hoped to update staging from here, but naturally, I can't ssh into staging because I can't ssh into the jumpbox. Updating staging will have to wait for another day - hopefully McGill's internet will be doing better tomorrow.

@jacobdgm
Copy link
Contributor Author

#1167 has been implemented, the new code is running on Staging, and all tests are passing!

@jacobdgm
Copy link
Contributor Author

@lucasmarchd01 @dchiller @annamorphism can one of you approve this before I merge it?

@jacobdgm jacobdgm merged commit 547657d into production Nov 24, 2023
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.

None yet

3 participants