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.

Sign up for GitHub

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

TASK-7038 - Port Patch 6.2.2 -> 6.3.0 - Xetabase 2.2.2 -> 2.3.0 #712

Merged
merged 9 commits into from
Oct 11, 2024
Merged

TASK-7038 - Port Patch 6.2.2 -> 6.3.0 - Xetabase 2.2.2 -> 2.3.0 #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
050b14e
Prepare release in hotfix branch release-5.2.x
juanfeSanahuja Sep 26, 2024
737568d
core: fix configuration file by resolving conflics messages, #TASK-7030
jtarraga Oct 1, 2024
836965e
cicd: Adapt pull-request-approve workflow to the new SDLC
juanfeSanahuja Oct 1, 2024
da4fd6d
Merge branch 'release-6.2.x' into TASK-7030
jtarraga Oct 1, 2024
21c3b25
Merge pull request #710 from opencb/TASK-7030
jtarraga Oct 1, 2024
15efe18
Prepare release 6.2.2
juanfeSanahuja Oct 8, 2024
d5cab49
Prepare release 6.2.2
juanfeSanahuja Oct 8, 2024
55dd516
Prepare Port Patch 2.2.2 -> 2.3.0 #TASK-7038
juanfeSanahuja Oct 8, 2024
8e1a6b7
Merge branch 'release-6.x.x' into TASK-7038
juanfeSanahuja Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions cellbase-core/src/main/resources/configuration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,6 @@ download:
clinvar:
# host: https://ftp.ncbi.nlm.nih.gov/pub/clinvar/xml/ClinVarFullRelease_2021-07.xml.gz
# host: https://ftp.ncbi.nlm.nih.gov/pub/clinvar/xml/ClinVarFullRelease_2022-02.xml.gz
<<<<<<< HEAD
host: https://ftp.ncbi.nlm.nih.gov/pub/clinvar/xml/ClinVarFullRelease_2022-11.xml.gz
clinvarVariation:
# host: https://ftp.ncbi.nlm.nih.gov/pub/clinvar/xml/clinvar_variation/ClinVarVariationRelease_2021-07.xml.gz
# host: https://ftp.ncbi.nlm.nih.gov/pub/clinvar/xml/clinvar_variation/ClinVarVariationRelease_2022-02.xml.gz
host: https://ftp.ncbi.nlm.nih.gov/pub/clinvar/xml/clinvar_variation/ClinVarVariationRelease_2022-11.xml.gz
=======
# host: https://ftp.ncbi.nlm.nih.gov/pub/clinvar/xml/ClinVarFullRelease_2022-11.xml.gz
host: https://ftp.ncbi.nlm.nih.gov/pub/clinvar/xml/RCV_xml_old_format/ClinVarFullRelease_2024-05.xml.gz
version: 2024-05
Expand All @@ -122,7 +115,6 @@ download:
# host: https://ftp.ncbi.nlm.nih.gov/pub/clinvar/xml/clinvar_variation/ClinVarVariationRelease_2022-11.xml.gz
host: https://ftp.ncbi.nlm.nih.gov/pub/clinvar/xml/VCV_xml_old_format/ClinVarVariationRelease_2024-05.xml.gz
version: 2024-05
>>>>>>> release-6.2.x
clinvarSummary:
host: http://ftp.ncbi.nlm.nih.gov/pub/clinvar/tab_delimited/variant_summary.txt.gz
clinvarVariationAllele:
Expand All @@ -147,15 +139,10 @@ download:
genomicSuperDups:
host: http://hgdownload.cse.ucsc.edu/goldenPath
gwasCatalog:
<<<<<<< HEAD
host: http://resources.opencb.org/opencb/cellbase/data/gwas/gwas_catalog_v1.0.2-associations_e106_r2022-05-17.tsv
version: "1.0.2 associations_e106_r2022-05-17"
=======
#host: http://resources.opencb.org/opencb/cellbase/data/gwas/gwas_catalog_v1.0.2-associations_e106_r2022-05-17.tsv
host: "https://ftp.ebi.ac.uk/pub/databases/gwas/releases/2024/05/20/gwas-catalog-associations_ontology-annotated.tsv"
#version: "1.0.2 associations_e106_r2022-05-17"
version: "2024-05-20"
>>>>>>> release-6.2.x
hpo:
host: https://ci.monarchinitiative.org/view/hpo/job/hpo.annotations/lastSuccessfulBuild/artifact/rare-diseases/util/annotation/phenotype_to_genes.txt
disgenet:
Expand Down
1 change: 0 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<pycellbase.version>${project.version}</pycellbase.version>
<java-common-libs.version>5.3.0-SNAPSHOT</java-common-libs.version>
<biodata.version>3.3.0-SNAPSHOT</biodata.version>

<bionetdb.version>0.1.0</bionetdb.version>
<jackson.version>2.11.4</jackson.version>
<jackson-asl.version>1.9.13</jackson-asl.version>
Expand Down
Loading