From ef6087f0b6e2a03ebe23a3bbfad6f330691817f8 Mon Sep 17 00:00:00 2001
From: twallema <63640510+twallema@users.noreply.github.com>
Date: Tue, 14 May 2024 15:35:32 +0200
Subject: [PATCH] Tryout Python 3.12 (#392)

---
 .../sciensano/vacc_incidence_national.pkl     | Bin 438008 -> 438008 bytes
 .../interim/sciensano/vacc_incidence_prov.pkl | Bin 3894823 -> 3894829 bytes
 environment.yml                               |   2 +-
 ...librate_BASE-COVID19_SEIQRD_hybrid_vacc.py |   6 +-----
 ...BASE-COVID19_SEIQRD_spatial_hybrid_vacc.py |   4 +---
 setup.py                                      |  10 ++--------
 src/covid19_DTM/data/model_parameters.py      |   8 ++++----
 7 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/data/covid19_DTM/interim/sciensano/vacc_incidence_national.pkl b/data/covid19_DTM/interim/sciensano/vacc_incidence_national.pkl
index 08a3219770066839119c3d0250be415c7cdea6f2..fd6eaabeb681bf15853aed5cb2f4a1b55e30e7c0 100644
GIT binary patch
delta 43
scmexySL(-IsSPt2S>)M1vNX?OY@fpj!c0KS48$xz%({IJBU{W`0DY7Xi~s-t

delta 43
scmexySL(-IsSPt2S$4#P@;1+5Y@fpj!c0KS48$xz%({IJBU{W`0E#yc=l}o!

diff --git a/data/covid19_DTM/interim/sciensano/vacc_incidence_prov.pkl b/data/covid19_DTM/interim/sciensano/vacc_incidence_prov.pkl
index 091b0ec78d5d5ee1653e0203ff8545db420172b6..9a8ed5c4e7e7c9dab90ed358cbf7557b17d15f4d 100644
GIT binary patch
delta 295
zcmWl|xlY1x0Knn=p@kN&a(RJrUjmhiirBGs=+ajpkT{XD`2-9u9h;P)yORk_zKkOq
zad2?=$CrE`-#_A$>y?m7iC<|MiT6nC#~7zXnF%JTP-Th-Jme9Nc|wh8W|(D;d7ko&
z=e*!03oP=A*DSHj3ahNK&IX%ovCR%|*kzA>>b&KE2JblJJs<eU5uZ5b^H(IyU@rbb
g!!tLEFHaUz?==Xwo;lQZzUsJ^^J2S}9lXu-fA8XA8UO$Q

delta 289
zcmWl|w+=yJ0D#f_dhfmW-aB{1AQGF+WRi%{6BsN;3B%n@5+)wT6G+4>_?+ZiUmtPd
z?JQK!#oWA;#a<Tw3M#3hni^`Uqn-vDX`-1HT4|%54m#<gn;v@Uqn`l=8Df|bMj2zA
z2_~6hni*!9W1a;TSz?(LR#{`64K~?gn;mx9W1oYEETrRFd{6a_bXTmVr}su`+NKBn
PWHy|P#<Su0xLsC${pep_

diff --git a/environment.yml b/environment.yml
index d3f130385..7308b6248 100644
--- a/environment.yml
+++ b/environment.yml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - python=3.11.4
+  - python=3.12
   - pandas  
   - numpy  
   - scipy  
diff --git a/notebooks/calibration/calibrate_BASE-COVID19_SEIQRD_hybrid_vacc.py b/notebooks/calibration/calibrate_BASE-COVID19_SEIQRD_hybrid_vacc.py
index 4ff3bdc52..7f7ecdeaf 100644
--- a/notebooks/calibration/calibrate_BASE-COVID19_SEIQRD_hybrid_vacc.py
+++ b/notebooks/calibration/calibrate_BASE-COVID19_SEIQRD_hybrid_vacc.py
@@ -35,10 +35,6 @@
 from pySODM.optimization.mcmc import perturbate_theta, run_EnsembleSampler, emcee_sampler_to_dictionary
 from pySODM.optimization.objective_functions import log_posterior_probability, log_prior_uniform, ll_negative_binomial, ll_poisson
 
-# Suppress warnings
-import warnings
-warnings.filterwarnings("ignore")
-
 #############################
 ## Handle script arguments ##
 #############################
@@ -192,7 +188,7 @@
     pars = pars1 + pars2 + pars3 + pars4
     bounds =  bounds1 + bounds2 + bounds3 + bounds4
     # Define labels
-    labels = ['$\Omega$', '$\Psi$', 'k', '$K_{inf, abc}$', '$K_{inf, \\delta}$', '$A$', '$f_h$']
+    labels = [r'$\Omega$', r'$\Psi$', r'k', r'$K_{inf, abc}$', r'$K_{inf, \delta}$', r'$A$', r'$f_h$']
     # Setup objective function without priors and with negative weights 
     objective_function = log_posterior_probability(model,pars,bounds,data,states,log_likelihood_fnc,log_likelihood_fnc_args,labels=labels)
 
diff --git a/notebooks/calibration/calibrate_BASE-COVID19_SEIQRD_spatial_hybrid_vacc.py b/notebooks/calibration/calibrate_BASE-COVID19_SEIQRD_spatial_hybrid_vacc.py
index 4b7d3e84e..4d2264b1d 100644
--- a/notebooks/calibration/calibrate_BASE-COVID19_SEIQRD_spatial_hybrid_vacc.py
+++ b/notebooks/calibration/calibrate_BASE-COVID19_SEIQRD_spatial_hybrid_vacc.py
@@ -32,8 +32,6 @@
 from pySODM.optimization.mcmc import perturbate_theta, run_EnsembleSampler, emcee_sampler_to_dictionary
 from pySODM.optimization.objective_functions import log_posterior_probability, log_prior_uniform, ll_poisson, ll_negative_binomial
 
-import warnings
-warnings.filterwarnings("ignore")
 
 ####################################
 ## Public or private spatial data ##
@@ -237,7 +235,7 @@
     # Join them together
     pars = pars1 + pars2 + pars3 + pars4
     bounds = bounds1 + bounds2 + bounds3 + bounds4
-    labels = ['$\\Omega$', '$\Psi$', '$k$', '$\Psi_{F}$', '$\Psi_{W}$', '$\Psi_{B}$', '$K_{inf, abc}$', '$K_{inf,\\delta}$', '$A$', '$f_h$']
+    labels = [r'$\Omega$', r'$\Psi$', '$k$', r'$\Psi_{F}$', r'$\Psi_{W}$', r'$\Psi_{B}$', r'$K_{inf, abc}$', r'$K_{inf,\delta}$', '$A$', '$f_h$']
     # Setup objective function with uniform priors
     objective_function = log_posterior_probability(model,pars,bounds,data,states,log_likelihood_fnc,log_likelihood_fnc_args,labels=labels, aggregation_function=aggregate_Brussels_Brabant_DataArray)
 
diff --git a/setup.py b/setup.py
index a0623b6da..b3268ff5f 100644
--- a/setup.py
+++ b/setup.py
@@ -13,15 +13,9 @@
         'numpy',
         'scipy',
         'pandas',
-        'xlrd',
-	    'openpyxl',
-        'zarr',
-        'emcee',
-        'xarray',
-        'rbfopt',
+        'openpyxl',
         'numba',
-        'SAlib',
-        'h5py'
+        'pySODM',
     ],
     extras_require={
         "develop":  ["pytest",
diff --git a/src/covid19_DTM/data/model_parameters.py b/src/covid19_DTM/data/model_parameters.py
index ec844bc11..6cbbce428 100644
--- a/src/covid19_DTM/data/model_parameters.py
+++ b/src/covid19_DTM/data/model_parameters.py
@@ -464,13 +464,13 @@ def get_COVID19_SEIQRD_VOC_parameters(VOCs=['WT', 'abc', 'delta', 'omicron'], pa
         index=['WT', 'abc', 'delta', 'omicron'], columns=pd.MultiIndex.from_tuples(columns))
 
     # Define logistic growth properties
-    VOC_parameters.loc['WT']['logistic_growth'] = [
+    VOC_parameters.loc['WT', 'logistic_growth'] = [
         datetime(2019, 1, 1), datetime(2019, 2, 1), 0.20]
-    VOC_parameters.loc['abc']['logistic_growth'] = [
+    VOC_parameters.loc['abc', 'logistic_growth'] = [
         datetime(2020, 12, 1), datetime(2021, 2, 14), 0.07]
-    VOC_parameters.loc['delta']['logistic_growth'] = [
+    VOC_parameters.loc['delta', 'logistic_growth'] = [
         datetime(2021, 5, 1), datetime(2021, 6, 25), 0.11]
-    VOC_parameters.loc['omicron']['logistic_growth'] = [
+    VOC_parameters.loc['omicron', 'logistic_growth'] = [
         datetime(2021, 11, 26), datetime(2021, 12, 24), 0.19]
 
     # Define variant properties