Skip to content

Commit

Permalink
Merge branch 'update_hic' into workflows/epigenetics/hic-hicup-cooler
Browse files Browse the repository at this point in the history
  • Loading branch information
@lldelisle
lldelisle committed Sep 11, 2023
2 parents eaccbf7 + a958302 commit a345ccb
Show file tree
Hide file tree
Showing 10 changed files with 87 additions and 95 deletions.
18 changes: 9 additions & 9 deletions workflows/epigenetics/hic-hicup-cooler/.dockstore.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,36 @@ workflows:
- name: hic-fastq-to-cool-hicup-cooler
subclass: Galaxy
publish: true
primaryDescriptorPath: /hic_fastq_to_cool_hicup_cooler.ga
primaryDescriptorPath: /hic-fastq-to-cool-hicup-cooler.ga
testParameterFiles:
- /hic_fastq_to_cool_hicup_cooler-tests.yml
- /hic-fastq-to-cool-hicup-cooler-tests.yml
authors:
- name: Lucille Delisle
orcid: 0000-0002-1964-4960
- name: chic-fastq-to-cool-hicup-cooler
subclass: Galaxy
publish: true
primaryDescriptorPath: /chic_fastq_to_cool_hicup_cooler.ga
primaryDescriptorPath: /chic-fastq-to-cool-hicup-cooler.ga
testParameterFiles:
- /chic_fastq_to_cool_hicup_cooler-tests.yml
- /chic-fastq-to-cool-hicup-cooler-tests.yml
authors:
- name: Lucille Delisle
orcid: 0000-0002-1964-4960
- name: hic-juicermediumtabix-to_cool-cooler
- name: hic-juicermediumtabix-to-cool-cooler
subclass: Galaxy
publish: true
primaryDescriptorPath: /hic_juicermediumtabix_to_cool_cooler.ga
primaryDescriptorPath: /hic-juicermediumtabix-to-cool-cooler.ga
testParameterFiles:
- /hic_juicermediumtabix_to_cool_cooler-tests.yml
- /hic-juicermediumtabix-to-cool-cooler-tests.yml
authors:
- name: Lucille Delisle
orcid: 0000-0002-1964-4960
- name: hic-fastq-to-pairs-hicup
subclass: Galaxy
publish: true
primaryDescriptorPath: /hic_fastq_to_pairs_hicup.ga
primaryDescriptorPath: /hic-fastq-to-pairs-hicup.ga
testParameterFiles:
- /hic_fastq_to_pairs_hicup-tests.yml
- /hic-fastq-to-pairs-hicup-tests.yml
authors:
- name: Lucille Delisle
orcid: 0000-0002-1964-4960
7 changes: 4 additions & 3 deletions workflows/epigenetics/hic-hicup-cooler/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Changelog

## [0.2.2] 2023-09-05
## [0.3] 2023-09-08

### Automatic update
- `toolshed.g2.bx.psu.edu/repos/iuc/pygenometracks/pygenomeTracks/3.7+galaxy0` was updated to `toolshed.g2.bx.psu.edu/repos/iuc/pygenometracks/pygenomeTracks/3.8+galaxy2`
### Update tools
- all cooler tools were updated from 0.8.11 to 0.9.2
- pyGenomeTracks was updated from 3.7 to 3.8

## [0.2.1] 2023-09-01 Bug fix

Expand Down
0 ...chic_fastq_to_cool_hicup_cooler-tests.yml → ...chic-fastq-to-cool-hicup-cooler-tests.yml
View file
File renamed without changes.
74 changes: 37 additions & 37 deletions ...cooler/chic_fastq_to_cool_hicup_cooler.ga → ...cooler/chic-fastq-to-cool-hicup-cooler.ga
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
],
"format-version": "0.1",
"license": "MIT",
"release": "0.2.2",
"release": "0.3",
"name": "cHi-C_fastqToCool_hicup_cooler",
"steps": {
"0": {
Expand Down Expand Up @@ -319,7 +319,7 @@
"outputs": [],
"position": {
"left": 520,
"top": 0.0
"top": 0
},
"subworkflow": {
"a_galaxy_workflow": "true",
Expand Down Expand Up @@ -748,16 +748,6 @@
"uuid": "3584d879-0b7a-4a89-a5f6-8439db6f003e",
"when": null,
"workflow_outputs": [
{
"label": "HiCUP report (txt)",
"output_name": "HiCUP report (tabular)",
"uuid": "b479e588-6d59-4b60-9dd7-036e58358eae"
},
{
"label": "HiCUP report (html)",
"output_name": "HiCUP report (HTML)",
"uuid": "902f20ef-d51d-4fad-86a0-206cda2ef361"
},
{
"label": "valid pairs in juicebox format",
"output_name": "valid pairs in juicebox format",
Expand All @@ -767,6 +757,16 @@
"label": "valid pairs in juicebox format MAPQ filtered",
"output_name": "valid pairs in juicebox format MAPQ filtered",
"uuid": "ec040a8e-883a-4cdb-b5bf-ea5a611a16a7"
},
{
"label": "HiCUP report (html)",
"output_name": "HiCUP report (HTML)",
"uuid": "902f20ef-d51d-4fad-86a0-206cda2ef361"
},
{
"label": "HiCUP report (txt)",
"output_name": "HiCUP report (tabular)",
"uuid": "b479e588-6d59-4b60-9dd7-036e58358eae"
}
]
},
Expand Down Expand Up @@ -933,7 +933,7 @@
},
"14": {
"annotation": "",
"content_id": "toolshed.g2.bx.psu.edu/repos/lldelisle/cooler_csort_tabix/cooler_csort_tabix/0.8.11+galaxy1",
"content_id": "toolshed.g2.bx.psu.edu/repos/lldelisle/cooler_csort_tabix/cooler_csort_tabix/0.9.2+galaxy1",
"errors": null,
"id": 14,
"input_connections": {
Expand Down Expand Up @@ -975,15 +975,15 @@
"output_name": "output"
}
},
"tool_id": "toolshed.g2.bx.psu.edu/repos/lldelisle/cooler_csort_tabix/cooler_csort_tabix/0.8.11+galaxy1",
"tool_id": "toolshed.g2.bx.psu.edu/repos/lldelisle/cooler_csort_tabix/cooler_csort_tabix/0.9.2+galaxy1",
"tool_shed_repository": {
"changeset_revision": "d56db0e1555d",
"changeset_revision": "5cb855a2dc9e",
"name": "cooler_csort_tabix",
"owner": "lldelisle",
"tool_shed": "toolshed.g2.bx.psu.edu"
},
"tool_state": "{\"format_sel\": {\"format\": \"juicer_medium\", \"__current_case__\": 0}, \"input\": {\"__class__\": \"ConnectedValue\"}, \"size_source\": {\"size_source_selector\": \"cached\", \"__current_case__\": 0, \"fasta_cached\": {\"__class__\": \"ConnectedValue\"}}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "0.8.11+galaxy1",
"tool_version": "0.9.2+galaxy1",
"type": "tool",
"uuid": "bbb479cd-c67c-4347-9c1d-ac8095d90aa9",
"when": null,
Expand Down Expand Up @@ -1170,7 +1170,7 @@
},
"4": {
"annotation": "",
"content_id": "toolshed.g2.bx.psu.edu/repos/lldelisle/cooler_makebins/cooler_makebins/0.8.11+galaxy0",
"content_id": "toolshed.g2.bx.psu.edu/repos/lldelisle/cooler_makebins/cooler_makebins/0.9.2+galaxy0",
"errors": null,
"id": 4,
"input_connections": {
Expand Down Expand Up @@ -1203,23 +1203,23 @@
"output_name": "output"
}
},
"tool_id": "toolshed.g2.bx.psu.edu/repos/lldelisle/cooler_makebins/cooler_makebins/0.8.11+galaxy0",
"tool_id": "toolshed.g2.bx.psu.edu/repos/lldelisle/cooler_makebins/cooler_makebins/0.9.2+galaxy0",
"tool_shed_repository": {
"changeset_revision": "c3dc51297bf8",
"changeset_revision": "f67664a4e1d6",
"name": "cooler_makebins",
"owner": "lldelisle",
"tool_shed": "toolshed.g2.bx.psu.edu"
},
"tool_state": "{\"binsize\": {\"__class__\": \"ConnectedValue\"}, \"size_source\": {\"size_source_selector\": \"cached\", \"__current_case__\": 0, \"fasta_cached\": {\"__class__\": \"ConnectedValue\"}}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "0.8.11+galaxy0",
"tool_version": "0.9.2+galaxy0",
"type": "tool",
"uuid": "34e0a213-93e8-466e-b07b-ede1443ee7d6",
"when": null,
"workflow_outputs": []
},
"5": {
"annotation": "",
"content_id": "toolshed.g2.bx.psu.edu/repos/lldelisle/cooler_cload_tabix/cooler_cload_tabix/0.8.11+galaxy1",
"content_id": "toolshed.g2.bx.psu.edu/repos/lldelisle/cooler_cload_tabix/cooler_cload_tabix/0.9.2+galaxy1",
"errors": null,
"id": 5,
"input_connections": {
Expand Down Expand Up @@ -1258,15 +1258,15 @@
"output_name": "output"
}
},
"tool_id": "toolshed.g2.bx.psu.edu/repos/lldelisle/cooler_cload_tabix/cooler_cload_tabix/0.8.11+galaxy1",
"tool_id": "toolshed.g2.bx.psu.edu/repos/lldelisle/cooler_cload_tabix/cooler_cload_tabix/0.9.2+galaxy1",
"tool_shed_repository": {
"changeset_revision": "3ff6eeca667e",
"changeset_revision": "c639f60ae76a",
"name": "cooler_cload_tabix",
"owner": "lldelisle",
"tool_shed": "toolshed.g2.bx.psu.edu"
},
"tool_state": "{\"assembly\": {\"__class__\": \"ConnectedValue\"}, \"format_sel\": {\"format\": \"juicer_medium\", \"__current_case__\": 0, \"input_pairs\": {\"__class__\": \"ConnectedValue\"}}, \"input_bed\": {\"__class__\": \"ConnectedValue\"}, \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "0.8.11+galaxy1",
"tool_version": "0.9.2+galaxy1",
"type": "tool",
"uuid": "d411eea7-7996-44f2-af2a-feecb854a067",
"when": null,
Expand All @@ -1280,7 +1280,7 @@
},
"6": {
"annotation": "",
"content_id": "toolshed.g2.bx.psu.edu/repos/lldelisle/cooler_balance/cooler_balance/0.8.11+galaxy0",
"content_id": "toolshed.g2.bx.psu.edu/repos/lldelisle/cooler_balance/cooler_balance/0.9.2+galaxy0",
"errors": null,
"id": 6,
"input_connections": {
Expand Down Expand Up @@ -1320,15 +1320,15 @@
"output_name": "output"
}
},
"tool_id": "toolshed.g2.bx.psu.edu/repos/lldelisle/cooler_balance/cooler_balance/0.8.11+galaxy0",
"tool_id": "toolshed.g2.bx.psu.edu/repos/lldelisle/cooler_balance/cooler_balance/0.9.2+galaxy0",
"tool_shed_repository": {
"changeset_revision": "8f71aaf6e59d",
"changeset_revision": "9655af207032",
"name": "cooler_balance",
"owner": "lldelisle",
"tool_shed": "toolshed.g2.bx.psu.edu"
},
"tool_state": "{\"blacklist\": {\"__class__\": \"RuntimeValue\"}, \"cistrans\": {\"__class__\": \"ConnectedValue\"}, \"convergencepolicy\": \"error\", \"ignorediags\": \"2\", \"ignoredist\": \"0\", \"input\": {\"__class__\": \"ConnectedValue\"}, \"madmax\": \"5\", \"maxiters\": \"200\", \"mincount\": \"0\", \"minnnz\": \"10\", \"name\": \"weight\", \"tol\": \"1e-05\", \"__page__\": null, \"__rerun_remap_job_id__\": null}",
"tool_version": "0.8.11+galaxy0",
"tool_version": "0.9.2+galaxy0",
"type": "tool",
"uuid": "44270887-1c96-4ede-8bb9-3db2a07eeb6e",
"when": null,
Expand All @@ -1342,22 +1342,22 @@
}
},
"tags": "",
"uuid": "0f629683-f7b4-45be-8436-9f67ddd92697"
"uuid": "1a6f4422-8f82-4444-a30c-bde38d181e41"
},
"tool_id": null,
"type": "subworkflow",
"uuid": "63c60960-bd33-436a-ac47-fdaf69c4bdfa",
"when": null,
"workflow_outputs": [
{
"label": "matrix with raw values",
"output_name": "matrix with raw values",
"uuid": "606c3260-41a2-400e-a580-0db59b3bc11f"
},
{
"label": "matrix with iced values",
"output_name": "matrix with iced values",
"uuid": "178c2801-e3b3-4398-8448-795d67ae5aa3"
},
{
"label": "matrix with raw values",
"output_name": "matrix with raw values",
"uuid": "606c3260-41a2-400e-a580-0db59b3bc11f"
}
]
},
Expand Down Expand Up @@ -1422,6 +1422,6 @@
"tags": [
"Hi-C"
],
"uuid": "f310abac-4a50-41fa-a59a-84c51816a462",
"version": 1
}
"uuid": "2a89cbe4-a69f-4bff-9465-2e04b0217e35",
"version": 4
}
0 .../hic_fastq_to_cool_hicup_cooler-tests.yml → .../hic-fastq-to-cool-hicup-cooler-tests.yml
View file
File renamed without changes.
Loading

0 comments on commit a345ccb

Please sign in to comment.