Closed amkwong closed 5 years ago
Looking at the listed conflict, it looks like the only file it's complaining about is index.html because I added an extra line. I just merged it in, so there should be no more conflicts.
I've fixed some problems and done additional testing. I have successfully managed to run the data generation pipeline on both the StatGen cluster and my own Linux subsystem.
We should review this pull request, remove extraneous things, and merge it into master so we can work off the reorganized structure.
Quick setup instructions:
Homo_sapiens.GRCh38.97.chr.gff3.gz
(downloaded from ensembl, or you can copy or link it from my directory at /net/amd/amkwong/browseQTL/all_chr/ensembl/
). This file needs to be accessible in the data directory. (The make step will fail if this file is missing.)util
directory and run generate.makefile.to.process.data.py
to generate run.extract.Makefile
. You can build everything automatically by running this makefile. phegetrun
and test features in the single-variant view. README.md
in the util directory.Notes:
/net/amd/amkwong/browseQTL/all_chr/by_chromosome/
) and store the results in a file called chr15.All_Tissues.sorted.txt.gz, then copy it to the data directory. This will allow you to access this particular variant for testing.I've pushed some minor cleanup to this branch (mostly to reduce flake8/ eslint noise, and removing files that don't need to be in the repo).
With Alan's changes I'm seeing some errors trying to run the app: No such file or directory: 'data/gene.symbol.pickle'
. Pausing review until we can sort that out, but look forward to merging soon!
I generated and tested small files which should allow us to run the flask app directly from a git clone (after switching to this branch).
Currently pheget should run for the variant 19:6718376 from a fresh install with no additional installation or data processing.
Looks good; merging!
Because this PR represented some initial trial and error, we have a lot of "noisy" commits in this branch (including some large files that were removed early on)
Therefore, this one time, I've squashed the entire PR into a single commit to clean all that up. I apologize for the bad etiquette of compressing commit history, but to compensate, I've created a CONTRIBUTORS.md
to ensure you all got credit for your work.
There will be more commits (and lots more credit) in the future; thanks all!
Thanks for the review and merge! We can all work from the master branch again finally.
We need to get this updated on the staging server (I'll ask Peter).
I want to merge my additions from the data_generation_pipeline branch #8 into Mukai's reorganized branch. My goal is to have one unified master branch from which we can work.
I am currently working on resolving the merge conflicts between the different versions.