Skip to content

sorting scripts depending on their function #28

Merged
merged 3 commits into from Jan 3, 2019
Merged

Conversation

renewiegandt
Copy link
Collaborator

@renewiegandt renewiegandt commented Jan 3, 2019

I had to create a new branch and redo the work because i totally broke my old one.
Sorted all scripts in sub-folders depending on their function.
Tested it as far as i could. Run does not complete because of issue #23.
create_gtf is working! Which is one of the more sensitive scripts if it comes to changing paths.

Copy link
Collaborator

@HendrikSchultheis HendrikSchultheis left a comment

Choose a reason for hiding this comment

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

We can push this on dev if you want to but as long as #23 isn't fixed I won't accept this on our master branch!

README.md Outdated
```
When the enviroment is created, set the variable 'path_env' in the configuration file as the path to it.
Every other dependency will be automatically installed by Nextflow using conda. For that a new conda enviroment will be created, which can be found in the from Nextflow created work directory after the first pipeline run.
It is **not** required to create and activate the enviroment from the yaml-file beforehand.

**Important Note:** For conda the channel bioconda needs to be set as highest priority! This is required due to two differnt packages with the same name in different channels. For the pipeline the package jellyfish from the channel bioconda is needed and **NOT** the jellyfisch package from the channel conda-forge!
Copy link
Collaborator

Choose a reason for hiding this comment

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

different

@renewiegandt renewiegandt changed the base branch from master to dev January 3, 2019 13:38
@renewiegandt
Copy link
Collaborator Author

Wanted to merge with dev... Missed to change it while creating the request. The base is now dev.

@anastasiia
Copy link
Collaborator

I have posted several questions to the output gtf format #29, though I don't think that it could change something, if create_gtf is working with all paths, still I would wait and test it beforehand

@renewiegandt
Copy link
Collaborator Author

@anastasiia this only affects the script build in nextflow. It won't affect the script itself.

Copy link
Collaborator

@anastasiia anastasiia left a comment

Choose a reason for hiding this comment

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

the scripts are sorted very well! Still I would rely on what @HendrikSchultheis says about merging

@renewiegandt
Copy link
Collaborator Author

I would push it on dev! Because every path of the scripts changes. I fear that its going to cause a lot of problems if we change the files by other pull requests and then move them to a different location by accepting this pull request. I do not how how git manages this.

@HendrikSchultheis
Copy link
Collaborator

If this is really only about the new folder structure in /bin we should merge this.
I don't think changing the location will be a problem in the long run. The worst that can happen is that we have to fix a merge conflict.

@renewiegandt
Copy link
Collaborator Author

We can't we should have waited with your pull request. I do not know how to solve this conflict now.
The problem is that now we changes the files bin/cdhit_wrapper.R and bin/reduce_sequence.R But here the files are deleted.

@renewiegandt
Copy link
Collaborator Author

I broke my old Branch trying to resolve this conflict.

@HendrikSchultheis
Copy link
Collaborator

Can't you just merge dev into estmiated_motifs and update those files?

@renewiegandt
Copy link
Collaborator Author

Let's try.

@renewiegandt
Copy link
Collaborator Author

It worked.

@renewiegandt renewiegandt merged commit 8993670 into dev Jan 3, 2019
Sign in to join this conversation on GitHub.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants