-
Notifications
You must be signed in to change notification settings - Fork 28
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
information for modern samples added #147
Conversation
Cool that you started to add this info, @93Boy! Could you go through the checklist above and mark what you have done? |
Sure , I have a few more fields to complete in KilincSciAdv2021. I will check the package information afterwards |
quotations! |
And location string should not contain Y-haplogroup, that should go into the right column |
Also there are encoding problems. Make sure the text export is UTF8 (e.g. "Tai–Kadai") |
Can we get an update on this one, @93Boy, please? |
Please go through the checklist, and in particular update the versions. We also have seen backticks in locations and haplogroups in the Janno-file. Please clean them up @93Boy. |
Please update the Changelog and the version in the YAML. Also there are still single quotes ( |
I have made the informed changes. Please check and merge if everything is good |
Hi @93Boy. Thanks, but please remember to always check the "Files Changes" tab. You can easily see that the Wang-Janno has quotations. Please remove them. |
I am extremely sorry for this quotation issue. It's a default setting in Libre Office which I can't bypass. It will simply change the structure of a file, even if I open it to check. I have fixed it with the below commit. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this 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. Thank you!
My only question is do we need to update lastModified:
for 2021_Wang_EastAsia ?
Excellent catch, @AyGhal. I have just done that inline. Now it should be good to merge. |
I see many new warnings of the form:
Note that this check was only added to trident in v1.4.1.0. It should be an error, but we have some legacy packages with this issue, so we decided to only make it a warning. We should absolutely avoid it for new packages. @93Boy: You seem to get this error, because @stschiff and @AyGhal: I made it a habit to search the GitHub validation log for the keyword |
OK, I will run the validator and fix the outstanding issues quickly |
OK, I think indeed the Kilinc package lists C14 dates but no IDs or uncalibrated dates. I will take a look at the paper myself and give Dana a pointer. |
OK, so I've checked the paper (https://www.science.org/doi/10.1126/sciadv.abc4587) and here attach the supplementary Tables that list the C14 dates. @93Boy can you please go through these and add the C14 IDs and uncalibrated dates to the Janno file? Alternatively, if you feel that would take too much time for now, we can also merge this PR for now and then fix this separately. But I think it could be a relatively quick task of about one hour to add all of them. |
@nevrome I have removed the typos caused by my editor and changed group names. I have changed .fam files accordingly but trident-rectify throws the following error. |
Regarding the 2021_Wang_EastAsia , I havent changed anything in the location information but I can manually trim it off. |
Regarding
Regarding
|
@stschiff Regarding the |
@93Boy I've updated my comment. The history how this came about isn't too important. The issues are relatively clear. Can you work on fixing them, please, and let us know where you couldn't? Thanks. |
I have made the following recommended changes to 2021_Wang_EastAsia Janno,
I have thoroughly reviewed supplementary documents, but I could not find the information for 383 modern samples. I appreciate it if you could guide me about this. Herewith I have attached the supplementary documents. |
Notes from Meeting on May 3rd: For Wang et al. 2021:
|
Wang et al. 2021: |
suspicious_IDs.csv
|
Notes from May 17th: Thanks for catching these. As discussed. Please replace library names like "S15162.Y1.E1.L1" with the Master ID in Supplementary Table 2, in this case it would be "I15162", wherever this is possible. Of course, these changes should be made in both the fam- and the janno-file. |
Update, @93Boy ? |
I completed all the requested changes during the last review. I think now this is ready for the second review |
2021_Kilinc_northeastAsia looks good to me now. |
2021_Wang_EastAsia also looks good now, imho. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Super. Good to go from my end.
After an epic seven month long quest this PR got finally merged 🚀 |
PR Checklist for modifying one or multiple existing packages
POSEIDON.yml
files were adjusted properly.POSEIDON.yml
files and there are no additional, supplementary files in the submission that are not documented there.packageVersion
numbers of the affected packages were increased in theirPOSEIDON.yml
files.CHANGELOG
files. If noCHANGELOG
files existed previously it was added here.lastModified
fields of the affectedPOSEIDON.yml
files were updated.contributor
fields were updated withname
,email
andorcid
of the relevant, new contributors.trident validate --fullGeno
.git lfs migrate import --no-rewrite path/to/file.bed
(see here).