Skip to content

Commit c6c11a2

Browse files
authored
Update to new HCA metadata schema and bundle structure (#70)
* Update requirements and setup.py to install and include the metadata-api library properly. * Update .ignore files. * Update dcp_utils and removed unused functions, remove redundant test cases too. * A big refactor to input_utils so that we can take advantage of the metadata-api library while not using the DSS client. * Refactor the create_analysis_json so we create analysis_process and analysis_protocol separately. * Refactor the create_envelope.py to perform_submission.py so we create analysis_process and analysis_protocol separately in the submission envelope. * Update setup.py, fix styles and update entry_points. * Update requirements, especially the pytest version. * Update get_analysis_metadata, so that we can use pipeline version as the analysis protocol_id. * Update submit WDL, so that it accepts different versions of the analysis process and protocol. * Update adapter WDL for SS2 pipeline. * Update adapter WDL for Optimus 3-prime pipeline. * update the outdated documentation. * Get rid of the deprecated 10x adapter workflow and its dependencies. * Update the version of pipeline-tools in adapter wdls. * Fix an issue that's caused by outdated cromwell-metadata docker image. * Update the dockerfile of cromwell-metadata image for development. * Fix issues with installing the hca-metadata-api library in pipeline-tools. * Remove unused testing fixtures. * Update Travis CI config for unittests and testing requirements. * Migrate existing test cases to use pytest, update fixtures and lint with PEP 8. * Refactor a function in input_utils.py so it's more testable and following the best practices. * Update test cases for input_utils.py * Update test cases for get_analysis_metadata.py * Fix bugs within the submission steps, lint code and respond to comments. * Update requirements as suggested in comments. * Update unittest data. * Add a new parameter cromwell_url to the adapter workflow, change all of the associated places. * Also change the Optimus while I can still remember it. * Update the metadata schema version we pin to. * Update the versions for metadata-api and the docker images everywhere.
1 parent 0dd53a0 commit c6c11a2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+3184
-3029
lines changed

.dockerignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
adapter_pipelines
2+
.eggs
3+
.pytest_cache
4+
pipeline_tools.egg-info
5+
cromwell_credentials.txt
6+
caas_key.json

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Byte-compiled / optimized / DLL files
22
__pycache__/
33
*.pyc
4-
docker/cromwell-metadata/cromwell_credentials.txt
5-
docker/cromwell-metadata/caas_key.json
4+
.pytest_cache
5+
cromwell_credentials.txt
6+
caas_key.json
67

78
# Sphinx documentation
89
docs/_build/

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: python
22
python:
3-
- '2.7'
43
- '3.6'
54
install: pip install -r requirements.txt -r test-requirements.txt
65
env:

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM python:2.7
1+
FROM python:3.6
22

33
LABEL maintainer="Mint Team <mintteam@broadinstitute.org>" \
44
software="Python" \
5-
description="Python2.7 library used for processing notifications from HCA DCP and doing submissions."
5+
description="Python3 library used for processing notifications from HCA DCP and doing submissions."
66

77
RUN mkdir /tools
88

99
WORKDIR /tools
1010

1111
COPY . .
1212

13-
RUN pip install . --process-dependency-links
13+
RUN pip install . --process-dependency-links --trusted-host github.com

adapter_pipelines/10x/README.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

adapter_pipelines/10x/adapter.wdl

Lines changed: 0 additions & 336 deletions
This file was deleted.

0 commit comments

Comments
 (0)