diff --git a/eva-accession-release-automation/publish_release_to_ftp/README_release_changelog.txt b/eva-accession-release-automation/publish_release_to_ftp/README_release_changelog.txt index 8af72cbc6..fccbe1858 100644 --- a/eva-accession-release-automation/publish_release_to_ftp/README_release_changelog.txt +++ b/eva-accession-release-automation/publish_release_to_ftp/README_release_changelog.txt @@ -1,5 +1,11 @@ This document describes technical changes associated with the EVA RefSNP release. +EVA RefSNP release 6 +==================== + +- No significant changes compare to release 5 + + EVA RefSNP release 5 ==================== diff --git a/eva-accession-release-automation/publish_release_to_ftp/README_release_general_info.txt b/eva-accession-release-automation/publish_release_to_ftp/README_release_general_info.txt index c77a06e8d..8a1f7660a 100644 --- a/eva-accession-release-automation/publish_release_to_ftp/README_release_general_info.txt +++ b/eva-accession-release-automation/publish_release_to_ftp/README_release_general_info.txt @@ -1,4 +1,4 @@ -EVA RefSNP release 5 +EVA RefSNP release 6 Feedback ================================== diff --git a/eva-accession-release-automation/publish_release_to_ftp/publish_release_files_to_ftp.py b/eva-accession-release-automation/publish_release_to_ftp/publish_release_files_to_ftp.py index a34cf1b4c..3480ae075 100644 --- a/eva-accession-release-automation/publish_release_to_ftp/publish_release_files_to_ftp.py +++ b/eva-accession-release-automation/publish_release_to_ftp/publish_release_files_to_ftp.py @@ -27,7 +27,7 @@ from ebi_eva_common_pyutils.logger import logging_config from ebi_eva_internal_pyutils.metadata_utils import get_metadata_connection_handle from ebi_eva_internal_pyutils.pg_utils import get_all_results_for_query -from run_release_in_embassy.run_release_for_species import load_config +from run_release_in_embassy.run_release_for_species import load_config, get_release_folder from run_release_in_embassy.release_metadata import release_vcf_file_categories, release_text_file_categories by_assembly_folder_name = "by_assembly" @@ -51,8 +51,8 @@ def __init__(self, release_version): self.private_config_xml_file = cfg.query('maven', 'settings_file') self.profile = cfg.query('maven', 'environment') self.release_version = release_version - self.release_species_inventory_table = cfg["inventory_table"] - self.staging_release_folder = cfg["release_output"] + self.release_species_inventory_table = cfg.query('release', 'inventory_table') + self.staging_release_folder = get_release_folder(release_version) self.public_ftp_release_base_folder = cfg["public_ftp_release_base_folder"] self.public_ftp_current_release_folder = os.path.join(self.public_ftp_release_base_folder, f"release_{self.release_version}") @@ -131,8 +131,8 @@ def create_symlink_to_species_folder_from_assembly_folder(current_release_assemb run_command_with_output(f"""Creating symlink from assembly folder {public_release_assembly_species_folder} to species folder {public_release_species_assembly_folder}""", 'bash -c "cd {0} && ln -sfT {1} {2}"'.format(public_release_assembly_folder, - os.path.relpath(public_release_species_assembly_folder, - public_release_assembly_folder), public_release_assembly_species_folder)) + os.path.relpath(public_release_species_assembly_folder, + public_release_assembly_folder), public_release_assembly_species_folder)) def recreate_public_release_species_assembly_folder(assembly_accession, public_release_species_assembly_folder): @@ -346,4 +346,4 @@ def main(): if __name__ == "__main__": - main() + main() \ No newline at end of file