Merge branch 'lb584_290923' into main (3e47827f) · Commits · Gilligan Lab for Epidemiology and Modelling / Wheat rusts / ews-coordinator · GitLab

FAQ | This is a LIVE service | Changelog

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ews-coordinator
- Activity
- Members
- Terraform modules
- Contributor analytics

Snippets Groups Projects

3e47827f

Commit 3e47827f authored 1 year ago by L. Bower

Downloads
- Plain Diff

Merge branch 'lb584_290923' into main

# Conflicts:
#	coordinator/Processor.py
#	tests/integration/partial/test_env_suit.py

parents 832feb4d 78134a92

No related branches found

No related tags found

Loading

Changes 22

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 1 addition, 0 deletions

.gitlab-ci.yml
configs/docker/build/build.sh 1 addition, 1 deletion

configs/docker/build/build.sh
coordinator/Processor.py 521 additions, 482 deletions

coordinator/Processor.py
coordinator/ProcessorAdvisory.py 50 additions, 26 deletions

coordinator/ProcessorAdvisory.py
coordinator/ProcessorComponents.py 1 addition, 25 deletions

coordinator/ProcessorComponents.py
coordinator/ProcessorDeposition.py 131 additions, 103 deletions

coordinator/ProcessorDeposition.py
coordinator/ProcessorEnvironment.py 211 additions, 189 deletions

coordinator/ProcessorEnvironment.py
coordinator/ProcessorEpidemiology.py 582 additions, 558 deletions

coordinator/ProcessorEpidemiology.py
coordinator/ProcessorScraper.py 411 additions, 382 deletions

coordinator/ProcessorScraper.py
coordinator/ProcessorSurveys.py 309 additions, 286 deletions

coordinator/ProcessorSurveys.py
scripts/run_Processor.sh 50 additions, 1 deletion

scripts/run_Processor.sh
tests/integration/full/full_test_advisory.py 19 additions, 4 deletions

tests/integration/full/full_test_advisory.py
tests/integration/full/full_test_deposition.py 5 additions, 1 deletion

tests/integration/full/full_test_deposition.py
tests/integration/full/full_test_env_suit.py 5 additions, 1 deletion

tests/integration/full/full_test_env_suit.py
tests/integration/full/full_test_epi.py 15 additions, 7 deletions

tests/integration/full/full_test_epi.py
tests/integration/full/full_test_survey.py 6 additions, 1 deletion

tests/integration/full/full_test_survey.py
tests/integration/partial/integration_test_utils.py 11 additions, 19 deletions

tests/integration/partial/integration_test_utils.py
tests/integration/partial/test_advisory.py 7 additions, 2 deletions

tests/integration/partial/test_advisory.py
tests/integration/partial/test_deposition.py 7 additions, 1 deletion

tests/integration/partial/test_deposition.py
tests/integration/partial/test_env_suit.py 8 additions, 2 deletions

tests/integration/partial/test_env_suit.py

with 2351 additions and 2091 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment