Updates for compatibility with latest OG-Core

.github/workflows/build_and_test.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: ["3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11"]
 
     steps:
       - name: Checkout
@@ -17,7 +17,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup Miniconda using Python ${{ matrix.python-version }}
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-variant: Mambaforge
           auto-update-conda: true
@@ -38,10 +38,12 @@ jobs:
         run: |
           pytest -m 'not local' --cov=./ --cov-report=xml
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        if: matrix.os == 'ubuntu-latest' && contains(github.repository, 'EAPD-DRB/OG-ZAF')
+        uses: codecov/codecov-action@v4
         with:
           files: ./coverage.xml
           flags: unittests
           name: codecov-umbrella
+          token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true
           verbose: true

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.0.2] - 2024-06-12 8:00:00
+
+### Added
+
+- Updates to `Calibration` to work with OG-Core 0.11.9
+- Removal of unused lines of code throughout the package
+
+
 ## [0.0.1] - 2023-10-30 8:00:00
 
 ### Added

MANIFEST.in

@@ -1,5 +1 @@
-include ogzaf/data/demographic/un_zaf_deaths.csv
-include ogzaf/data/demographic/un_zaf_fert.csv
-include ogzaf/data/demographic/un_zaf_infmort.csv
-include ogzaf/data/demographic/un_zaf_mort.csv
-include ogzaf/data/demographic/un_zaf_pop.csv
+include ogzaf/ogzaf_default_parameters.json

environment.yml

@@ -2,7 +2,7 @@ name: ogzaf-dev
 channels:
 - conda-forge
 dependencies:
-- python>=3.7.7
+- python>=3.7.7, <3.12
 - numpy
 - numba>=0.54
 - scipy>=1.7.1

examples/run_og_zaf.py

@@ -51,15 +51,9 @@ def main():
         )
     )
     # Update parameters from calibrate.py Calibration class
-    c = Calibration(p)
+    c = Calibration(p, estimate_pop=True)
     updated_params = c.get_dict()
     p.update_specifications(updated_params)
-    updated_params_tax = {
-        "etr_params": (np.ones((1, p.S, 1)) * 0.35).tolist(),
-        "mtrx_params": (np.ones((1, p.S, 1)) * 0.35).tolist(),
-        "mtry_params": (np.ones((1, p.S, 1)) * 0.35).tolist(),
-    }
-    p.update_specifications(updated_params_tax)
 
     # Run model
     start_time = time.time()