Skip to content

Commit

Permalink
git subrepo pull (merge) ingest/vendored
Browse files Browse the repository at this point in the history
subrepo:
  subdir:   "ingest/vendored"
  merged:   "258ab8c"
upstream:
  origin:   "https://github.com/nextstrain/ingest"
  branch:   "main"
  commit:   "258ab8c"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"
  • Loading branch information
j23414 committed Jul 14, 2024
1 parent c06187a commit 6289e84
Show file tree
Hide file tree
Showing 13 changed files with 2 additions and 617 deletions.
3 changes: 0 additions & 3 deletions ingest/vendored/.cramrc

This file was deleted.

8 changes: 0 additions & 8 deletions ingest/vendored/.github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,3 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: nextstrain/.github/actions/shellcheck@master

cram:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- run: pip install cram
- run: cram tests/
4 changes: 2 additions & 2 deletions ingest/vendored/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/nextstrain/ingest
branch = main
commit = c94d78d1f38b99e893007a76526f3d3824ecded0
parent = 99034d1912479521e2c657c1a898aee6f803bb67
commit = 258ab8ce898a88089bc88caee336f8d683a0e79a
parent = c06187ad53db4d9d6beb1afbd15ca0078c5b539c
method = merge
cmdver = 0.4.6
14 changes: 0 additions & 14 deletions ingest/vendored/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,6 @@ Potential Nextstrain CLI scripts
- [download-from-s3](download-from-s3) - Download file from AWS S3 bucket with decompression based on file extension in S3 URL.
Skips download if the local file already exists and has a hash identical to the S3 object's metadata `sha256sum`.

Potential augur curate scripts

- [apply-geolocation-rules](apply-geolocation-rules) - Applies user curated geolocation rules to NDJSON records
- [merge-user-metadata](merge-user-metadata) - Merges user annotations with NDJSON records
- [transform-authors](transform-authors) - Abbreviates full author lists to '<first author> et al.'
- [transform-field-names](transform-field-names) - Rename fields of NDJSON records
- [transform-genbank-location](transform-genbank-location) - Parses `location` field with the expected pattern `"<country_value>[:<region>][, <locality>]"` based on [GenBank's country field](https://www.ncbi.nlm.nih.gov/genbank/collab/country/)
- [transform-strain-names](transform-strain-names) - Ordered search for strain names across several fields.

## Software requirements

Some scripts may require Bash ≥4. If you are running these scripts on macOS, the builtin Bash (`/bin/bash`) does not meet this requirement. You can install [Homebrew's Bash](https://formulae.brew.sh/formula/bash) which is more up to date.
Expand All @@ -134,11 +125,6 @@ Some scripts may require Bash ≥4. If you are running these scripts on macOS, t

Most scripts are untested within this repo, relying on "testing in production". That is the only practical testing option for some scripts such as the ones interacting with S3 and Slack.

For more locally testable scripts, Cram-style functional tests live in `tests` and are run as part of CI. To run these locally,

1. Download Cram: `pip install cram`
2. Run the tests: `cram tests/`

## Working on this repo

This repo is configured to use [pre-commit](https://pre-commit.com),
Expand Down
234 changes: 0 additions & 234 deletions ingest/vendored/apply-geolocation-rules

This file was deleted.

55 changes: 0 additions & 55 deletions ingest/vendored/merge-user-metadata

This file was deleted.

This file was deleted.

Loading

0 comments on commit 6289e84

Please sign in to comment.