Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions coderbuild/build_all.py
Original file line number Diff line number Diff line change
Expand Up @@ -430,17 +430,17 @@ def get_latest_commit_hash(owner, repo, branch='main'):
decompress_file(file)

### These should be done before schema checking.
sample_mapping_command = ['python3', 'scripts/map_improve_sample_ids.py', '--local_dir', "/tmp", '--version', args.version]
sample_mapping_command = ['python3', 'coderbuild/utils/map_improve_sample_ids.py', '--local_dir', "/tmp", '--version', args.version]
run_docker_upload_cmd(sample_mapping_command, 'all_files_dir', 'Map_Samples', args.version)

drug_mapping_command = ['python3', 'scripts/map_improve_drug_ids.py', '--local_dir', "/tmp", '--version', args.version]
drug_mapping_command = ['python3', 'coderbuild/utils/map_improve_drug_ids.py', '--local_dir', "/tmp", '--version', args.version]
run_docker_upload_cmd(drug_mapping_command, 'all_files_dir', 'Map_Drugs', args.version)

drug_mapping_command_2 = ['python3', 'scripts/align_drug_descriptors.py', '--local_dir', "/tmp", '--version', args.version]
drug_mapping_command_2 = ['python3', 'coderbuild/utils/align_drug_descriptors.py', '--local_dir', "/tmp", '--version', args.version]
run_docker_upload_cmd(drug_mapping_command_2, 'all_files_dir', 'Align_Drug_Descriptors', args.version)

# Run schema checker - This will always run if uploading data.
schema_check_command = ['python3', 'scripts/check_schema.py', '--datasets'] + datasets
schema_check_command = ['python3', 'coderbuild/utils/check_schema.py', '--datasets'] + datasets
run_docker_upload_cmd(schema_check_command, 'all_files_dir', 'validate', args.version)

print("Validation complete. Proceeding with file compression/decompression adjustments")
Expand All @@ -457,7 +457,7 @@ def get_latest_commit_hash(owner, repo, branch='main'):

### Upload to Figshare using Docker
if args.figshare and args.version and figshare_token:
figshare_command = ['python3', 'scripts/push_to_figshare.py', '--directory', "/tmp", '--title', f"CODERData{args.version}", '--token', os.getenv('FIGSHARE_TOKEN'), '--project_id', '189342', '--version', args.version, '--publish']
figshare_command = ['python3', 'coderbuild/utils/push_to_figshare.py', '--directory', "/tmp", '--title', f"CODERData{args.version}", '--token', os.getenv('FIGSHARE_TOKEN'), '--project_id', '189342', '--version', args.version, '--publish']
run_docker_upload_cmd(figshare_command, 'all_files_dir', 'Figshare', args.version)

### Push changes to GitHub using Docker
Expand Down
2 changes: 1 addition & 1 deletion coderbuild/build_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ def run_schema_checker(dataset):
decompress_file(os.path.join('local', all_files_dir, file))

# Run schema checker
schema_check_command = ['python3', 'scripts/check_schema.py', '--datasets'] + datasets
schema_check_command = ['python3', 'coderbuild/utils/check_schema.py', '--datasets'] + datasets
run_docker_validate_cmd(schema_check_command, all_files_dir, 'Validation')

def main():
Expand Down
3 changes: 2 additions & 1 deletion coderbuild/docker/Dockerfile.upload
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ RUN apt-get update && \
# WORKDIR /usr/src/app/coderdata

ADD schema schema
ADD scripts scripts
ADD scripts scripts
ADD coderbuild/utils coderbuild/utils
File renamed without changes.
File renamed without changes.
76 changes: 0 additions & 76 deletions scripts/assign_improve_ids.py

This file was deleted.

111 changes: 0 additions & 111 deletions scripts/figshare_pull.py

This file was deleted.

14 changes: 0 additions & 14 deletions scripts/update_version.py

This file was deleted.