Skip to content

Commit 68b7395

Browse files
authored
chore: rename pipeline dir (#1223)
* rename pipeline dir * add loading pipeline * fix a test * Finish off test
1 parent 31100f9 commit 68b7395

File tree

1,024 files changed

+881
-839
lines changed

Some content is hidden

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

1,024 files changed

+881
-839
lines changed

.cloudbuild/docker.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ steps:
33
args:
44
- --destination=gcr.io/seqr-project/seqr-pipeline-runner:${COMMIT_SHA}
55
- --destination=gcr.io/seqr-project/seqr-pipeline-runner:${_CUSTOM_BRANCH_TAG}
6-
- --dockerfile=v03_pipeline/deploy/Dockerfile
6+
- --dockerfile=loading_pipeline/deploy/Dockerfile
77
- --cache=true
88
- --cache-ttl=168h
99
- --build-arg=PIPELINE_RUNNER_APP_VERSION=${COMMIT_SHA}

.cloudbuild/vep-docker.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Run locally with:
22
#
3-
# gcloud builds submit --quiet --substitutions='_REFERENCE_GENOME=GRCh38' --config .cloudbuild/vep-docker.cloudbuild.yaml v03_pipeline/deploy
3+
# gcloud builds submit --quiet --substitutions='_REFERENCE_GENOME=GRCh38' --config .cloudbuild/vep-docker.cloudbuild.yaml loading_pipeline/deploy
44
steps:
55
- name: 'gcr.io/kaniko-project/executor:v1.3.0'
66
args:

.github/workflows/dev-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ jobs:
4444
- name: Copy files to release directory
4545
run: |-
4646
gcloud storage rm -r gs://seqr-pipeline-runner-builds/dev/latest/ || echo 'No latest release'
47-
gcloud storage cp v03_pipeline/bin/* gs://seqr-pipeline-runner-builds/dev/latest/bin/
47+
gcloud storage cp loading_pipeline/bin/* gs://seqr-pipeline-runner-builds/dev/latest/bin/
4848
gcloud storage cp dist/*.whl gs://seqr-pipeline-runner-builds/dev/latest/pyscripts.zip
49-
gcloud storage cp v03_pipeline/bin/* gs://seqr-pipeline-runner-builds/dev/${{ github.event.workflow_run.head_sha }}/bin/
49+
gcloud storage cp loading_pipeline/bin/* gs://seqr-pipeline-runner-builds/dev/${{ github.event.workflow_run.head_sha }}/bin/
5050
gcloud storage cp dist/*.whl gs://seqr-pipeline-runner-builds/dev/${{ github.event.workflow_run.head_sha }}/pyscripts.zip
5151
docker:
5252
runs-on: ubuntu-latest

.github/workflows/prod-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ jobs:
4646
shell: bash
4747
run: |-
4848
gcloud storage rm -r gs://seqr-pipeline-runner-builds/prod/latest/ || echo 'No latest release'
49-
gcloud storage cp v03_pipeline/bin/* gs://seqr-pipeline-runner-builds/prod/latest/bin/
49+
gcloud storage cp loading_pipeline/bin/* gs://seqr-pipeline-runner-builds/prod/latest/bin/
5050
gcloud storage cp dist/*.whl gs://seqr-pipeline-runner-builds/prod/latest/pyscripts.zip
51-
gcloud storage cp v03_pipeline/bin/* gs://seqr-pipeline-runner-builds/prod/${{ github.event.workflow_run.head_sha }}/bin/
51+
gcloud storage cp loading_pipeline/bin/* gs://seqr-pipeline-runner-builds/prod/${{ github.event.workflow_run.head_sha }}/bin/
5252
gcloud storage cp dist/*.whl gs://seqr-pipeline-runner-builds/prod/${{ github.event.workflow_run.head_sha }}/pyscripts.zip
53-
gcloud storage cp -r v03_pipeline/var/vep/* gs://seqr-reference-data/vep/
53+
gcloud storage cp -r loading_pipeline/var/vep/* gs://seqr-reference-data/vep/
5454
5555
docker:
5656
runs-on: ubuntu-latest

.github/workflows/unit-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,18 @@ jobs:
5656
- name: Sync dependencies (prod + dataproc)
5757
run: uv sync --locked
5858
- name: Check Ruff Format
59-
run: uv run ruff format --check v03_pipeline --diff
59+
run: uv run ruff format --check loading_pipeline --diff
6060
- name: Check Ruff
6161
run: uv run ruff check --output-format github
6262
- name: Run ShellCheck
6363
uses: ludeeus/action-shellcheck@master
6464
with:
6565
severity: error
66-
scandir: './v03_pipeline/bin'
66+
scandir: './loading_pipeline/bin'
6767
- name: Unit Tests
6868
run: |
6969
export CLICKHOUSE_OPTIMIZE_TABLE_WAIT_S=1
7070
export PYSPARK_SUBMIT_ARGS='--driver-memory 8G pyspark-shell'
7171
export CLICKHOUSE_DATABASE=test
72-
uv run nosetests --with-coverage --cover-package v03_pipeline v03_pipeline
72+
uv run nosetests --with-coverage --cover-package loading_pipeline loading_pipeline
7373
uv run coverage report --omit '*test*' --fail-under=85

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ download_and_create_reference_datasets/*.txt
88
download_and_create_reference_datasets/*.gz
99
*.ht
1010
*.mt
11-
!/v03_pipeline/var/test/**/*
11+
!/loading_pipeline/var/test/**/*
1212

1313
# Standard python gitignore below
1414
######################################################################

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99

1010
## 📁 Repository Structure
1111

12-
### `v03_pipeline/api/`
13-
Contains the interface layer to the _seqr_ application.
12+
### `loading_pipeline/api/`
13+
Contains the interface layer to the _seqr_ application.
1414
- `api/model.py` defines pydantic models for the REST interface.
15-
- `api/app.py` specifies an `aiohttp` webserver that handles load data requests.
15+
- `api/app.py` specifies an `aiohttp` webserver that handles load data requests.
1616

17-
### `v03_pipeline/bin/`
17+
### `loading_pipeline/bin/`
1818
Scripts or command-line utilities used for setup or task execution.
1919
- `bin/pipeline_worker.py` — manages asynchronous jobs requested by _seqr_.
2020

21-
### `v03_pipeline/deploy/`
21+
### `loading_pipeline/deploy/`
2222
Dockerfiles for the loading pipeline itself & any annotation utilities.
2323
Kubernetes manifests are managed separately in [seqr-helm](https://github.com/broadinstitute/seqr-helm/tree/main/charts/pipeline-runner)
2424

25-
### `v03_pipeline/lib/`
26-
Core logic and shared libraries.
25+
### `loading_pipeline/lib/`
26+
Core logic and shared libraries.
2727
- `annotations` defines hail logic to re-format and standardize fields.
2828
- `methods` wraps hail-defined genomics methods for QC.
2929
- `misc` contains single modules with defined utilities.
@@ -37,10 +37,10 @@ the pipeline is defined, effectively, in reverse.
3737
- `test` holds a few utilities used by the tests, which are dispersed throughout the rest of the repository.
3838
- `paths.py` defines paths for all intermediate and output files of the pipeline.
3939

40-
### `v03_pipeline/ops/`
40+
### `loading_pipeline/ops/`
4141
Manual operations scripts.
4242

43-
### `v03_pipeline/var/`
43+
### `loading_pipeline/var/`
4444
Static configuration and test files.
4545

4646
---
@@ -58,14 +58,14 @@ RUN uv sync --group dev --locked
5858
### [Install](https://clickhouse.com/docs/getting-started/quick-start/oss) & start ClickHouse with provided test configuration:
5959
```bash
6060
curl https://clickhouse.com/ | sh
61-
./clickhouse server --config-file=./seqr-loading-pipelines/v03_pipeline/var/clickhouse_config/test-clickhouse.xml
61+
./clickhouse server --config-file=./seqr-loading-pipelines/loading_pipeline/var/clickhouse_config/test-clickhouse.xml
6262
```
6363

6464
### [Run the Tests](https://github.com/broadinstitute/seqr-loading-pipelines/blob/main/.github/workflows/unit-tests.yml#L66-L73)
6565

6666
### Run an Individual Test
6767
```bash
68-
uv run nosetests v03_pipeline/lib/misc/math_test.py
68+
uv run nosetests loading_pipeline/lib/misc/math_test.py
6969
```
7070

7171
### Formatting and Linting
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from aiohttp import web
22

3-
from v03_pipeline.api.app import init_web_app
4-
from v03_pipeline.lib.logger import get_logger
3+
from loading_pipeline.api.app import init_web_app
4+
from loading_pipeline.lib.logger import get_logger
55

66

77
def run():

0 commit comments

Comments
 (0)