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

Bentley et al. 2016 expression data #285

Merged

Conversation

clbarnes
Copy link
Contributor

@clbarnes clbarnes commented Feb 3, 2017

Resolves #284

Data spreadsheet: https://docs.google.com/spreadsheets/d/1kCxOOKu1wAREa9VbBiWVVHh-GEC3kJk0A3YVEipPKcc/edit#gid=0

  • Adds an expression_data directory in aux_data, and the expression data used in 10.1371/journal.pcbi.1005283 in a csv with the same schema as the Modified celegans db dump.csv
  • Adds insert_worm.upload_additional_receptors_neurotransmitters_neuropeptides_innexins(), which recursively searches the expression_data in lexicographic sort order for .csv files and adds any novel data to the network
  • Factors most of the insertion logic out into a separate private method, which is called by both upload_receptors_types_neurotransmitters_neuropeptides_innexins and upload_additional_receptors_neurotransmitters_neuropeptides_innexins
  • Tidies up some indentation in that method (sorry about the unhelpful diff)

Still todo:

  • Update data sources docs page
  • Add Data Integrity Test

Add neurotransmitter and receptor expression pattern data, receptor-ligand mappings, and neurotransmitter types (monoamine vs. neuropeptide) as used in Bentley et al. 2016.

http://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1005283
@clbarnes
Copy link
Contributor Author

clbarnes commented Feb 3, 2017

I haven't been able to test this because I can't install pyopenworm through pip in either py2 or py3.

py2: I think FuXi is the problem: it requires rdflib < 3a and the the setup.py requires rdflib==4.1.2. FuXi also doesn't install its own dependencies properly (specifically ez_setup).

py3: wsgiref==0.1.2 has a py2 print statement in it.

@clbarnes
Copy link
Contributor Author

clbarnes commented Feb 3, 2017

Build failures are just due to the doctests having the wrong expectations for the new data.

@@ -158,9 +161,11 @@ def upload_neurons():
def get_altun_evidence():
return parse_bibtex_into_evidence('../aux_data/bibtex_files/altun2009.bib')


Copy link
Contributor

Choose a reason for hiding this comment

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

Changes for pep8 compliance are fine, but please don't introduce newlines unnecessarily.

Copy link
Contributor

@mwatts15 mwatts15 Feb 3, 2017

Choose a reason for hiding this comment

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

To be consistent with other spacing between other methods is fine. Nevermind.


for neur in neurons:
n = NETWORK.neuron(neur)
print ("uploaded " + str(i) + " statements about types, receptors, innexins, neurotransmitters and neuropeptides")
_ = NETWORK.neuron(neur)
Copy link
Contributor

Choose a reason for hiding this comment

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

n really is unused. It's okay to just remove the assignment.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

Resolves openworm#284

Searches OpenWormData/aux_data/expression_data for innexin, neuropeptide, neurotransmitter and receptor expression data not already added.
@clbarnes clbarnes force-pushed the issue-284-extrasynaptic-connectome-data branch from be40160 to 0ff0bb3 Compare February 3, 2017 22:21
@coveralls
Copy link

coveralls commented Feb 3, 2017

Coverage Status

Coverage remained the same at 72.968% when pulling 0ff0bb3 on clbarnes:issue-284-extrasynaptic-connectome-data into cdcdd81 on openworm:dev.

@coveralls
Copy link

coveralls commented Feb 3, 2017

Coverage Status

Coverage remained the same at 72.968% when pulling 0ff0bb3 on clbarnes:issue-284-extrasynaptic-connectome-data into cdcdd81 on openworm:dev.

@clbarnes clbarnes force-pushed the issue-284-extrasynaptic-connectome-data branch from dc18ceb to 384b2c3 Compare February 3, 2017 22:57
@clbarnes
Copy link
Contributor Author

clbarnes commented Feb 3, 2017

Build should be green, now, forgot a dash in a receptor name...

Paradoxically, I can't do the URLs for the docs page until the PR is merged but I've got the changes except the URLs in a local branch (accidentally pushed it but then --force undid it, which is why this history might look a bit squiffy) so they can go up as soon as this PR is merged and OpenWorm has taken ownership of the spreadsheet https://docs.google.com/spreadsheets/d/1kCxOOKu1wAREa9VbBiWVVHh-GEC3kJk0A3YVEipPKcc/edit#gid=0

@coveralls
Copy link

coveralls commented Feb 3, 2017

Coverage Status

Coverage remained the same at 72.968% when pulling 384b2c3 on clbarnes:issue-284-extrasynaptic-connectome-data into cdcdd81 on openworm:dev.

@mwatts15
Copy link
Contributor

mwatts15 commented Feb 4, 2017

lgtm

@mwatts15 mwatts15 merged commit b9ae663 into openworm:dev Feb 4, 2017
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.

3 participants