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

Rename files from "phonemic"/"phonetic" to "broad"/"narrow" #402

Merged
merged 38 commits into from
Apr 20, 2021
Merged

Rename files from "phonemic"/"phonetic" to "broad"/"narrow" #402

merged 38 commits into from
Apr 20, 2021

Conversation

ajmalanoski
Copy link
Collaborator

@ajmalanoski ajmalanoski commented Apr 15, 2021 •
edited
Loading

  • Updated Unreleased in CHANGELOG.md to reflect the changes in code or data.

Closes #389

I renamed the files with this script: link

I only changed the filenames, so I'm sure a lot of stuff is broken at the moment…

@ajmalanoski
Adds subdirectories 'lib' and 'phones' to 'data/phones'. Moves '.phon…
36af387 
…es' files into 'data/phones/phones'. Moves relevant scripts from 'data/src' into 'data/phones/lib'. Updates paths in 'data/scrape/lib/codes.py'
@ajmalanoski
Updates 'data/phones/HOWTO.md' to reflect new locations of files
6f673f9
@ajmalanoski
Fixes file path in 'data/phones/HOWTO.md'
528cb1e
@ajmalanoski
Updates outdated components of 'data/phones/HOWTO.md'
6f8ea4c
@ajmalanoski
Updates path to phones in 'tests/test_data/test_summary.py'
2d98838
@ajmalanoski
Updates changelog
afdb768
@ajmalanoski
Merge branch 'master' into reorganize
a6b079c
@ajmalanoski
Renames 'data/cg' to 'data/covering_grammar'
ba0839a
@ajmalanoski
Renames covering grammar files to include script info and and transcr…
8f34b19 
…iption type (broad/narrow)
@ajmalanoski
Moves covering grammar/error analysis scripts to 'data/covering_gramm…
e9ab803 
…ar/lib'
@ajmalanoski
Adds placeholder README for 'data/covering_grammar/'
353d8f8
@ajmalanoski
Adds script to make input files for error analysis
c33739c
@ajmalanoski
Removes superfluous comments from 'data/covering_grammar/lib/make_tes…
abd10d0 
…t_file.py'
@ajmalanoski
Updates changelog
d52822a
@ajmalanoski
Merge branch 'master' of https://github.com/kylebgorman/wikipron into…
f7eefef 
… reorganize
@ajmalanoski
Makes (most of the) suggested edits to data/covering_grammar/lib/make…
d0b26ed 
…_test_file.py
@ajmalanoski
Adds logging config to data/covering_grammar/lib/make_test_file.py. M…
6c164bc 
…akes minor stylistic changes to the same file
@ajmalanoski
Minor style fix
0176fe7
@ajmalanoski
Merge branch 'master' of https://github.com/kylebgorman/wikipron
4505a49
@ajmalanoski
Adds French covering grammar. Reorganizes French phonelist.
de2afe5
@ajmalanoski
Updates changelog
5b47606
@ajmalanoski
Fix extra line in French phonelist
b8438dd
@ajmalanoski
Add end line to French covering grammar
a4618ce
@ajmalanoski
Add final lines
2037b1c
@ajmalanoski
Pull upstream
3ee9743
@ajmalanoski
Merge branch 'master' of https://github.com/kylebgorman/wikipron into…
0efd858 
… fre_cg
@ajmalanoski
Rename files from phonemic/phonetic to broad/narrow
327f3da
@ajmalanoski
Update changelog
e92053d
@kylebgorman
Copy link
Collaborator

Is your plan for this PR that you'll also make this change to the scrape and testing code?

@ajmalanoski ajmalanoski marked this pull request as draft April 15, 2021 14:54
@ajmalanoski
Copy link
Collaborator Author

The name change sort of involved some degree of reconceptualization of the phone-listing process, as expressed in data/phones/HOWTO.md. I edited the file in a way that I thought made sense, but let me know what you think.

kylebgorman
kylebgorman approved these changes Apr 16, 2021
View reviewed changes
Copy link
Collaborator

@kylebgorman kylebgorman left a comment

Choose a reason for hiding this comment

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

All looks good to me. Still a failing black test, which should be easy to fix.

data/phones/HOWTO.md Outdated Show resolved Hide resolved
@ajmalanoski
Copy link
Collaborator Author

I didn't change tests/test_wikipron/test_config or tests/test_wikipron/test_scrape because I was confused by the code. I changed wikipron/cli.py, but I'm not really sure what that script is for, so someone should check that…

@ajmalanoski ajmalanoski marked this pull request as ready for review April 16, 2021 23:39
@kylebgorman
Copy link
Collaborator

cli.py controls the command-line wikipron (which perhaps you've never used but it works nicely). The change you made there is fine but you're effectively renaming args.phonetic (or something like that), but you have to rename it everywhere in that directory, not just in cli.py.

@lfashby
Copy link
Collaborator

lfashby commented Apr 17, 2021

Hey, thanks for taking this on. The annoying part of this is now going to be going through the test_wikipron, wikipron and data directories to make sure everything still works. In particular fixing scrape/lib/generate_tsv_summary.py could be a challenge. Once all the tests pass it might be a good idea to run a restricted big scrape of a small language, say Basque (and maybe a small language with a dialect like Armenian?), and run the postprocessing code just to make sure that all the files are being generated correctly.

@ajmalanoski
Copy link
Collaborator Author

I think I'm going to need some help with the stuff in wikipron/ and tests/. Can we make a new branch so that other people can make changes too?

@kylebgorman
Copy link
Collaborator

Sure, you can issue a PR against a non-master/main branch.

@ajmalanoski ajmalanoski changed the base branch from master to renaming April 17, 2021 21:54
@ajmalanoski
Copy link
Collaborator Author

I'm not sure what went wrong with the CircleCI tests/how to fix the problem. Any help?

@lfashby
Copy link
Collaborator

lfashby commented Apr 20, 2021 •
edited
Loading

Hey, I'll take a more thorough look at this tomorrow but for now changing this line ought to resolve the current problem.

@ajmalanoski
Copy link
Collaborator Author

Thanks for catching that, Lucas!

@ajmalanoski
Copy link
Collaborator Author

Oh yay, all the tests are finally passing

kylebgorman
kylebgorman approved these changes Apr 20, 2021
View reviewed changes
Copy link
Collaborator

@kylebgorman kylebgorman left a comment

Choose a reason for hiding this comment

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

Submit away

@kylebgorman kylebgorman merged commit 86be6d9 into CUNY-CL:renaming Apr 20, 2021
@kylebgorman kylebgorman mentioned this pull request Apr 20, 2021
Closed
kylebgorman added a commit that referenced this pull request Apr 25, 2021
@kylebgorman @ajmalanoski @lfashby
Renaming (#408)
eedd3fa 
* Rename files from "phonemic"/"phonetic" to "broad"/"narrow" (#402)

* Adds subdirectories 'lib' and 'phones' to 'data/phones'. Moves '.phones' files into 'data/phones/phones'. Moves relevant scripts from 'data/src' into 'data/phones/lib'. Updates paths in 'data/scrape/lib/codes.py'

* Updates 'data/phones/HOWTO.md' to reflect new locations of files

* Fixes file path in 'data/phones/HOWTO.md'

* Updates outdated components of 'data/phones/HOWTO.md'

* Updates path to phones in 'tests/test_data/test_summary.py'

* Updates changelog

* Renames 'data/cg' to 'data/covering_grammar'

* Renames covering grammar files to include script info and and transcription type (broad/narrow)

* Moves covering grammar/error analysis scripts to 'data/covering_grammar/lib'

* Adds placeholder README for 'data/covering_grammar/'

* Adds script to make input files for error analysis

* Removes superfluous comments from 'data/covering_grammar/lib/make_test_file.py'

* Updates changelog

* Makes (most of the) suggested edits to data/covering_grammar/lib/make_test_file.py

* Adds logging config to data/covering_grammar/lib/make_test_file.py. Makes minor stylistic changes to the same file

* Minor style fix

* Adds French covering grammar. Reorganizes French phonelist.

* Updates changelog

* Fix extra line in French phonelist

* Add end line to French covering grammar

* Add final lines

* Rename files from phonemic/phonetic to broad/narrow

* Update changelog

* Update code in data/ and tests/test_data to change phonemic/phonetic to broad/narrow

* Fix formatting in data/frequencies/merge.py and data/phones/HOWTO.md

* Updates wikipron/cli.py to reflect renaming

* (Hopefully) fix summary generation code. Re-run data/scrape/postprocess, data/scrape/lib/generate_tsv_summary.py, and data/phones/lib/generate_phone_summary.tsv

* Renames 'phonetic' to 'narrow' in wikipron/config.py

* Finish renaming 'phonetic' to 'narrow' in wikipron/config.py

* Update tests in tests/test_wikipron to reflect broad/narrow renaming

* Fix and rerun data/scrape/lib/generate_tsv_summary.py

* Fix line in data/scrape/scrape.py

* Minor updates for new names, adds phones postprocess (#405)

* minor updates for new names, adds phones postprocess

* reflow

* updates changelog

* new sorting

* updates sorting of both phones and TSVs to use path

* adds top level data README

* changes comment and import

Co-authored-by: Aidan Malanoski <71616036+ajmalanoski@users.noreply.github.com>
Co-authored-by: Lucas Ashby <lfeashby@gmail.com>
@kylebgorman kylebgorman mentioned this pull request Jun 11, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kylebgorman kylebgorman kylebgorman approved these changes

@lfashby lfashby Awaiting requested review from lfashby

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

Successfully merging this pull request may close these issues.

Phonemic/phonetic vs. broad/narrow
3 participants
@ajmalanoski @kylebgorman @lfashby