Costing Module

.github/workflows/run-on-comment.yml

@@ -126,7 +126,7 @@ jobs:
     - name: Get comment-bot token
       if: always() && steps.has_permissions.outputs.result == 'true'
       id: get_comment_bot_token
-      uses: peter-murray/workflow-application-token-action@8e4e6fbf6fcc8a272781d97597969d21b3812974
+      uses: peter-murray/workflow-application-token-action@dc0413987a085fa17d19df9e47d4677cf81ffef3
       with:
         application_id: ${{ secrets.application-id }}
         application_private_key: ${{ secrets.application-private-key }}

.github/workflows/run-profiling.yaml

@@ -163,7 +163,7 @@ jobs:
       ## The token provided needs contents and pages access to the target repo
       ## Token can be (re)generated by a member of the UCL organisation, 
       ## the current member is the rc-softdev-admin.
-      ## [17-07-2024] New token generated, will expire 10-07-2025
+      ## [10-07-2023] The current token will expire 10-07-2024
       - name: Push results to profiling repository
         uses: dmnemec/[email protected]
         env:

.github/workflows/tests.yml

@@ -10,8 +10,6 @@ on:
       - requirements/**
       - resources/**
       - src/tlo/**
-      - src/scripts/profiling/scale_run.py
-      - src/scripts/profiling/shared.py
       - tests/**
       - pyproject.toml
       - tox.ini
@@ -46,10 +44,9 @@ jobs:
         name: Set matrix
         run: |
           set -e
-          shopt -s globstar
           # Find all test files and generate their list in JSON format
           VAR_FILES="{\"include\":["
-          for file in tests/**/test_*.py; do
+          for file in tests/test_*.py; do
               VAR_FILES="${VAR_FILES}{\"file\":\"${file}\"},"
           done
           VAR_FILES="${VAR_FILES}]}"
@@ -78,12 +75,4 @@ jobs:
           tox --version
       - name: Test with tox
         run: |
-          tox -v -e py311 -- pytest --show-capture=no -vv "${{ matrix.file }}" --junit-xml="${{ matrix.file }}.results.xml"
-      - name: Generate test report
-        if: always()
-        uses: pmeier/pytest-results-action@fc6576eced1f411ea48ab10e917d9cfce2960e29
-        with:
-          path: ${{ matrix.file }}.results.xml
-          summary: true
-          display-options: fEX
-          title: Results for ${{ matrix.file }}
+          tox -v -e py311,report -- pytest --cov --cov-report=term-missing -vv "${{ matrix.file }}"

.gitignore

@@ -109,6 +109,9 @@ venv.bak/
 # PyCharm
 .idea/
 
+# TLO .rst files
+docs/reference/tlo*.rst
+
 # TLO configuration
 tlo.conf
 
@@ -121,12 +124,3 @@ profiling_results/
 
 # ignore _version.py file generated by setuptools_scm
 src/**/_version.py
-
-# Generated TLO docs files
-docs/_*.rst
-docs/_*.html
-docs/hsi_events.csv
-docs/parameters.rst
-docs/reference/modules.rst
-docs/reference/tlo*.rst
-docs/resources/**/*.rst

CITATION.cff

@@ -113,11 +113,6 @@ authors:
   family-names: Janoušková
   orcid: https://orcid.org/0000-0002-4104-0119
   affiliation: University College London
-  website: https://profiles.ucl.ac.uk/90260
-- given-names: Rachel
-  family-names: Murray-Watson
-  affiliation: Imperial College London
-  orcid: https://orcid.org/0000-0001-9079-5975
 repository-code: https://github.com/UCL/TLOmodel
 url: https://tlomodel.org
 abstract: Our fundamental aim is to develop the use of epidemiological and economic

README.md

@@ -1,5 +1,5 @@
 <div style="text-align: center" align="center">
-<img src="docs/thanzi-la-onse.png" alt="Thanzi la Onse" />
+<img src="docs/thanzi-la-onse.png" alt="Thanzi La Onze" />
 <br />
 <h1>Thanzi la Onse model</h1>
 </div>
@@ -24,7 +24,7 @@ The __Thanzi la Onse model (TLOmodel)__ is a part of the [Thanzi la Onse][thanzi
 TLOmodel is developed in a collaboration between:
 
 - [Kamuzu University of Health Sciences][kuhes-link]
-- [MRC Centre for Global Infectious Disease Analysis][mrc-gida-link], [Imperial College London][imperial-link]
+- [MRC Centre for Global Infectioous Disease Analysis][mrc-gida-link], [Imperial College London][imperial-link]
 - [Institute for Global Health][igh-link], [University College London][ucl-link]
 - [Centre for Advanced Research Computing][arc-link], [University College London][ucl-link]
 - [Centre for Health Economics][che-link], [University of York][york-link]

contributors.yaml

@@ -4,7 +4,7 @@
   affiliation: "Imperial College London"
   website: "https://www.imperial.ac.uk/people/timothy.hallett"
   github-username: tbhallett
-  role: Project Lead
+  role: Joint lead epidemiology
   contributions:
     - Epidemiology and modelling
     - Software development
@@ -14,7 +14,7 @@
   affiliation: "University College London"
   website: "https://profiles.ucl.ac.uk/5430"
   github-username: andrew-phillips-1
-  role: Lead Epidemiology
+  role: Joint lead epidemiology
   contributions:
     - Epidemiology and modelling
     - Software development
@@ -102,6 +102,7 @@
   website: "https://www.york.ac.uk/che/staff/research/sakshi-mohan/"
   github-username: sakshimohan
   contributions:
+    - Epidemiology and modelling
     - Health economics
     - Software development
 - given-names: Wingston
@@ -195,7 +196,6 @@
   family-names: Janoušková
   orcid: "https://orcid.org/0000-0002-4104-0119"
   affiliation: "University College London"
-  website: "https://profiles.ucl.ac.uk/90260"
   github-username: EvaJanouskova
   contributions:
     - Epidemiology and modelling
@@ -206,14 +206,15 @@
   affiliation: University College London
   website: "https://profiles.ucl.ac.uk/954"
   contributions:
-    - Clinical process modelling
+    - Clinical consultant 
 - given-names: Paul
   family-names: Revill
   orcid: "https://orcid.org/0000-0001-8632-0600"
   affiliation: University of York
   website: "https://www.york.ac.uk/che/staff/research/paul-revill/"
   github-username: paulrevill
-  role: "Lead Health-Economics"
+  contributions:
+    - Health economics
 - given-names: Wiktoria
   family-names: Tafesse
   orcid: "https://orcid.org/0000-0002-0076-8285"
@@ -236,7 +237,7 @@
   website: "https://www.york.ac.uk/che/staff/students/newton-chagoma/"
   github-username: nchagoma503
   contributions:
-    - Health economics
+    - Health economics  
 - given-names: Martin
   family-names: Chalkley
   orcid: "https://orcid.org/0000-0002-1091-8259"
@@ -272,31 +273,3 @@
   family-names: Uwais
   website: "https://uk.linkedin.com/in/leila-uwais-597705142"
   github-username: Leila-Uwais
-- given-names: Dominic
-  family-names: Nkhoma
-  affiliation: "Kamuzu University of Health Sciences"
-  orcid: "https://orcid.org/0000-0001-6125-6630"
-  contributions:
-      - Policy translation
-  website: "https://mw.linkedin.com/in/dominicnkhoma1978"
-- given-names: Gerald
-  family-names: Manthalu
-  affiliation: "Department of Planning and Policy Development, Ministry of Health and Population, Lilongwe, Malawi"
-  orcid: "https://orcid.org/0000-0002-3501-8601"
-  contributions:
-      - Policy translation
-- given-names: Rachel
-  family-names: Murray-Watson
-  affiliation: "Imperial College London"
-  orcid: https://orcid.org/0000-0001-9079-5975
-  github-username: RachelMurray-Watson
-  contributions:
-    - Epidemiology and modelling
-    - Software development
-- given-names: Victor
-  family-names: Mwapasa
-  orcid: "https://orcid.org/0000-0002-2748-8902"
-  affiliation: "Kamuzu University of Health Sciences"
-  website: "https://www.kuhes.ac.mw/prof-victor-mwapasa/"
-  contributions:
-    - Clinical process modelling

docs/conf.py

@@ -106,9 +106,6 @@
     'exclude-members': '__dict__, name, rng, sim'  # , read_parameters',
 }
 
-# Include both class level and __init__ docstring content in class documentation
-autoclass_content = 'both'
-
 # The checker can't see private repos
 linkcheck_ignore = ['^https://github.com/UCL/TLOmodel.*',
                     'https://www.who.int/bulletin/volumes/88/8/09-068213/en/nn']

docs/index.rst

@@ -52,7 +52,6 @@ Contents
    azure_batch
    reference/index
    resources/index
-   parameters
    learning
    publications
    contributors