Skip to content
Snippets Groups Projects
Commit 968810c3 authored by james94's avatar james94
Browse files

fix conda

parent c8086739
No related branches found
No related tags found
No related merge requests found
...@@ -18,9 +18,9 @@ with open(config['resources'], 'r') as f: ...@@ -18,9 +18,9 @@ with open(config['resources'], 'r') as f:
resource = yaml.safe_load(f) resource = yaml.safe_load(f)
### GET BASENAME FOR READS WILDCARDS ### ### GET BASENAME FOR READS WILDCARDS ###
def getBasename4Reads(path): # def getBasename4Reads(path):
base=os.path.basename(path) # base=os.path.basename(path)
return os.path.splitext(base)[0] # return os.path.splitext(base)[0]
### CHECK IF INPUT IS GZIPPED ### ### CHECK IF INPUT IS GZIPPED ###
def gzipped_or_not(path): def gzipped_or_not(path):
...@@ -41,14 +41,13 @@ def genomeSize_auto_or_not(given_size): ...@@ -41,14 +41,13 @@ def genomeSize_auto_or_not(given_size):
return given_size return given_size
def addUniqueLibraryID(library):
string2Add=library + "_1"
def to_be_smrtTrimmed(userAnswer):
if userAnswer == 'True': # def to_be_smrtTrimmed(userAnswer):
string2Add="smrtTrimmed" # if userAnswer == 'True':
elif userAnswer == 'False': # string2Add="smrtTrimmed"
string2Add="notsmrtTrimmed" # elif userAnswer == 'False':
# string2Add="notsmrtTrimmed"
samples = pd.read_csv(config['samplesTSV'], dtype=str, index_col=False, delim_whitespace=True, skip_blank_lines=True) samples = pd.read_csv(config['samplesTSV'], dtype=str, index_col=False, delim_whitespace=True, skip_blank_lines=True)
if set(['sample', 'Library_R1', 'Library_R2', 'meryl_kmer_size', 'trim10X', 'trimAdapters', 'fastQC']).issubset(samples.columns): if set(['sample', 'Library_R1', 'Library_R2', 'meryl_kmer_size', 'trim10X', 'trimAdapters', 'fastQC']).issubset(samples.columns):
......
...@@ -11,3 +11,4 @@ dependencies: ...@@ -11,3 +11,4 @@ dependencies:
- pandas - pandas
- numpy - numpy
- ghostscript - ghostscript
- python=3.9.*
channels: channels:
- anaconda - anaconda
- bioconda
- conda-forge - conda-forge
- bioconda
dependencies: dependencies:
- pigz=2.4 - openssl==3.0.5
- trim-galore=0.6.6 - python=3.10.5=ha86cf86_0_cpython
- pandoc=2.11 - pigz=2.6
- trim-galore=0.6.7
- pandoc=2.11.4
- multiqc=1.9 - multiqc=1.9
- python=3.8.5
- trimmomatic=0.39 - trimmomatic=0.39
...@@ -31,7 +31,7 @@ rule unzipFastq_R1_HiC: ...@@ -31,7 +31,7 @@ rule unzipFastq_R1_HiC:
output: output:
temp(os.path.join(config['Results'], "1_evaluation/{asmID}/HiC_MAPS/{asmID}.HiC.R1.fastq")), temp(os.path.join(config['Results'], "1_evaluation/{asmID}/HiC_MAPS/{asmID}.HiC.R1.fastq")),
log: log:
os.path.join(config['Results'], "1_evaluation/{asmID}/logs/pigzUnzip..HiC.R1.{asmID}.log") os.path.join(config['Results'], "1_evaluation/{asmID}/logs/pigzUnzip.HiC.R1.{asmID}.log")
conda: conda:
os.path.join(workflow.basedir, "envs/UNZIP_and_QC.yaml") os.path.join(workflow.basedir, "envs/UNZIP_and_QC.yaml")
threads: threads:
...@@ -56,7 +56,7 @@ rule symlink_UnzippedFastq_R1_HiC: ...@@ -56,7 +56,7 @@ rule symlink_UnzippedFastq_R1_HiC:
None None
shell: shell:
""" """
ln -s {input} {output} ln -sf {input} {output}
""" """
...@@ -94,7 +94,7 @@ rule symlink_UnzippedFastq_R2_HiC: ...@@ -94,7 +94,7 @@ rule symlink_UnzippedFastq_R2_HiC:
None None
shell: shell:
""" """
ln -s {input} {output} ln -sf {input} {output}
""" """
...@@ -334,7 +334,7 @@ rule symlink_UnzippedFasta_PRI: ...@@ -334,7 +334,7 @@ rule symlink_UnzippedFasta_PRI:
None None
shell: shell:
""" """
ln -s {input} {output} ln -fs {input} {output}
""" """
################ ################
...@@ -350,7 +350,7 @@ rule unzipFasta_ALT: ...@@ -350,7 +350,7 @@ rule unzipFasta_ALT:
log: log:
os.path.join(config['Results'], "1_evaluation/{asmID}/logs/pigzUnzip.ALT.{asmID}.log") os.path.join(config['Results'], "1_evaluation/{asmID}/logs/pigzUnzip.ALT.{asmID}.log")
conda: conda:
os.path.join(workflow.basedir, "envs/pigz.yaml") os.path.join(workflow.basedir, "envs/UNZIP_and_QC.yaml")
threads: threads:
resource['unzipFasta_ALT']['threads'] resource['unzipFasta_ALT']['threads']
resources: resources:
...@@ -431,7 +431,7 @@ rule merqury: ...@@ -431,7 +431,7 @@ rule merqury:
os.path.join(workflow.basedir, "envs/MERYL_MERQURY.yaml") os.path.join(workflow.basedir, "envs/MERYL_MERQURY.yaml")
shell: shell:
""" """
ln -s {input.merylDB_provided} {params.symlink_merylDB} ln -fs {input.merylDB_provided} {params.symlink_merylDB}
cd {params.outPath} cd {params.outPath}
export OMP_NUM_THREADS={threads} export OMP_NUM_THREADS={threads}
(merqury.sh {params.symlink_merylDB} {input.assemblyPRI} {input.assemblyALT} {params.outFile}) &> {log} (merqury.sh {params.symlink_merylDB} {input.assemblyPRI} {input.assemblyALT} {params.outFile}) &> {log}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment