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 develop into staging, 13 May 2024 #1450

Merged
merged 51 commits into from
May 14, 2024
Merged

Merge develop into staging, 13 May 2024 #1450

merged 51 commits into from
May 14, 2024
+1,542 −153

Conversation

dchiller
Copy link
Contributor

No description provided.

dchiller and others added 30 commits April 25, 2024 17:09
@dchiller
Add ForeignKey to Segment from BaseChant
9f0e108
@dchiller
Add migrations: ForeignKey Segment on BaseChant
187202e
@dchiller
Update Chant Create form with Segment field
2556679
@jacobdgm
Chant Edit: Reimplement suggested fulltext feature
f1f391f
@jacobdgm
Chant Edit: add comment
ec4358f
@jacobdgm
Chant Edit: account for case where user is not editing a specific cha…
9c3672c 
…nt, case where chant's Cantus ID is None
@dchiller
Add initial value to Chant Create segment
6e2d040
@jacobdgm
test_views.SourceEditChantsViewTest: patch requests.get calls in most…
04c0bef 
… tests
@dchiller
Add chant segment to Chant Edit form
6d1c17c
@dchiller
Fix test_models.ChantModelTest.test_get_concordances
5212b02
@dchiller
Add required marker to segment field
50992ab
@dchiller
Update tests for chant-level segment
ff664a7
@dchiller
Add temporary command: assign_chants_to_segments
028f83c
@dchiller
Adjust query for test_get_concordances
129a0c0
@dchiller
Use poetry for python dependency management
dc2f6d1
@dchiller
Refactor django container build with poetry dependency management
316fa78
@dchiller
Combine debug and test dependency groups
cbecd8f
@dchiller
Add button for filling suggested fulltext
d5e69f7
@dchiller
Add tests for get_suggested_fulltext
d238a06
@dchiller
Rename fill suggested fulltext button
1ed01bf
@dchiller
Merge pull request #1429 from dchiller/python-dependency-cleanup
0b41483 
Clean up python dependencies
@dchiller
Merge pull request #1435 from dchiller/1427-fix-get-concordances-test
b95397a 
Adjust query for `test_get_concordances`
@dchiller
Merge pull request #1436 from dchiller/1390-suggested-fulltext
ec06887 
Chant Edit: Reimplement suggested fulltexts feature
@dchiller
Update docker-compose.yml.development to match docker-compose.yml for…
07d3153 
… poetry
@dchiller
Rename docker-compose.yml.development to docker-compose-development.yml
5802d9f
@dchiller
Merge pull request #1439 from DDMAL/fix-docker-compose-development
0932bb5 
Add changes for poetry-based build to docker-compose.yml.development
@dchiller
Add build args to docker-compose-development.yml
2f7211c
@dchiller
Merge pull request #1440 from DDMAL/add-docker-compose-development-bu…
a021091 
…ild-args

Add build args to docker-compose-development.yml
@dchiller
Remove superfluous imports from test_assign_chants_to_segments
5df6b70
@dchiller
Chunk assign_chants_to_segments command
816cadb
dchiller and others added 21 commits May 8, 2024 07:48
@dchiller
Merge pull request #1434 from dchiller/1420-chant-segment
39fcbc4 
Add `segment` field to `BaseChant` model
@dchiller
Fix docker compose configurations for dev containers
7369de3
@dchiller
Clean-up imports in views/chant.py
e3401ae
@lucasmarchd01
add management command to update chant diff_id field
a604c05
@lucasmarchd01
decrease chunk size for batch processing
f643a5c
@lucasmarchd01
source edit: replace "manuscript" with "source"
f10d4bc
@lucasmarchd01
source detail: replace "manuscript" with "source"
5ca3d23
@lucasmarchd01
chant list: replace "manuscript" with "source"
e52585c
@dchiller
Fix get_feast_selector_options
c2d9761
@dchiller
Configure docker-compose-dev-containers and docker-compose-development
c52aa9e
@dchiller
Combine dev and debug dependencies
6851e5e 
Add django typing and linting extensions

Use binary package of psycopg
@dchiller
Update install_packages.sh for combined dev and debug dependencies
b6ccc78
@dchiller
Merge branch 'develop' into fix-dev-containers
e77b9c7
@dchiller
Update docker-compose-dev-containers.yml
62bd79d
@lucasmarchd01
Merge pull request #1446 from lucasmarchd01/issue-1097
373a1d9 
Replace some instances of "manuscript" with "source"
@dchiller
Merge pull request #1443 from dchiller/fix-dev-containers
1261582 
Update configurations for development processes
@dchiller
Merge pull request #1447 from dchiller/916-feast-dropdown
b44993c 
Remove duplicates from feast-folio dropdown
@dchiller
Change PDF documents to "Reference and Instructional Documents"
8ad24e7
@lucasmarchd01
remove unnecessary conditional statement
b4e6525
@lucasmarchd01
Merge pull request #1445 from lucasmarchd01/issue-1368-2
1f08f4d 
Populate missing `diff_id` Chant fields
@dchiller
Merge pull request #1449 from DDMAL/pdf-docs-menu-item
520b446 
Change PDF documents to "Reference and Instructional Documents"
@dchiller dchiller requested a review from lucasmarchd01 May 13, 2024 18:54
lucasmarchd01
lucasmarchd01 approved these changes May 14, 2024
View reviewed changes
Copy link
Contributor

@lucasmarchd01 lucasmarchd01 left a comment

Choose a reason for hiding this comment

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

Probably should hold off until #1451 and #1452 are merged

@dchiller dchiller merged commit d855805 into staging May 14, 2024
54 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lucasmarchd01 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
3 participants
@dchiller @lucasmarchd01 @jacobdgm