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.

Sign up for GitHub

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

Jump to bottom

Merge staging into production, 2024 Apr 04 edition #1398

Merged
merged 17 commits into from Apr 5, 2024
Merged

Merge staging into production, 2024 Apr 04 edition #1398

merged 17 commits into from Apr 5, 2024

Conversation

jacobdgm
Copy link
Contributor

@jacobdgm jacobdgm commented Apr 4, 2024 •
edited

Changes:

  • Dependencies:
    • black bumped from 21.10b0 to 24.3.0
    • typing-extensions bumped from 3.10.0.0 to 4.0.1
    • click bumped from 7.1.2 to 8.0.0
  • Tests
    • main_app.tests.test_views.CsvExportTest updated to use subtests
    • main_app.tests.test_views.ChantCreateViewTest had several tests added to ensure the get_initial method works as expected
  • Ajax Concordance List - view removed
  • Chant Create
    • we now pre-populate the form's "Office" field using the same office as the most recently modified chant in the same source (should work the same way as the "Feast" field)
  • CSV Export
    • We now display the source's siglum in the "siglum" column, rather than each chant's individual siglum

@jacobdgm
Bump black from 21.10b0 to 24.3.0
e0eb156
@jacobdgm
Bump typing-extensions from 3.10.0.0 to 4.0.1
89f1e3a
@jacobdgm
Bump click from 7.1.2 to 8.0.0
7ff344c
@jacobdgm
Reformat several files to comply with updated Black version
d9e2841
@jacobdgm
Merge pull request #1387 from jacobdgm/update-black
d1632f8 
Bump Black to 24.3.0
@jacobdgm
Remove ajax_concordance_list view
9dbb859
@jacobdgm
Refactor CsvExportTest
36d3553 
mostly to use subTests
@jacobdgm
Update CsvExportTest.test_content to add subtest checking items' sigla
391fa11
@jacobdgm
Update csv_export view to ensure chants' sigla are never displayed
51d82dd
@jacobdgm
Create ChantCreateViewTest.test_initial_values
719b917 
with passing feast subtest and not-yet-passing office subtest
@jacobdgm
Chant Create: ensure office form field is prepopulated
c16bcb2 
with the same office as the most recently created chant
@jacobdgm
Merge pull request #1393 from jacobdgm/1378-concordances-ajax
ab3c204 
Remove ajax_concordance_list view
@jacobdgm
Optimize csv_export view
403ad5f 
to check source siglum once per source, rather than once per chant
@jacobdgm
Merge pull request #1395 from jacobdgm/1365-csv-siglum
6b5c0dc 
Update csv-export view to use chants' sources' sigla
@jacobdgm
Expand ChantCreateViewTest.test_initial_values
7aba709 
adding subtests for folio, sequence, and image link
@jacobdgm
Merge pull request #1396 from jacobdgm/915-office-selector
4b9f404 
Pre-populate office selector on Chant Create page
@jacobdgm
Merge pull request #1397 from DDMAL/develop
b151163 
Merge develop into staging, 2024 Apr 04 edition
@jacobdgm
Copy link
Contributor Author

jacobdgm commented Apr 4, 2024

There wasn't much to test for this one. @dchiller and/or @lucasmarchd01, can you quickly glance this over to make sure nothing is amiss? With an approval, we should be able to deploy this tomorrow.

dchiller
dchiller approved these changes Apr 4, 2024
View reviewed changes
Copy link
Contributor

@dchiller dchiller left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@jacobdgm jacobdgm merged commit d6546ea into production Apr 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dchiller dchiller dchiller approved these changes

@lucasmarchd01 lucasmarchd01 Awaiting requested review from lucasmarchd01

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jacobdgm @dchiller