Add Ethiopia to country dictionary in demographics.py

[jdebacker]

Add Ethiopia to country dictionary in demographics.py

cc @rickecon

[codecov-commenter]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 72.70%. Comparing base (b333e10) to head (3bd17e9).

Additional details and impacted files

@@           Coverage Diff           @@
##           master    #1067   +/-   ##
=======================================
  Coverage   72.70%   72.70%           
=======================================
  Files          21       21           
  Lines        5111     5111           
=======================================
  Hits         3716     3716           
  Misses       1395     1395           

Flag	Coverage Δ
unittests	72.70% <100.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines	Coverage Δ
ogcore/__init__.py	100.00% <100.00%> (ø)
ogcore/demographics.py	55.68% <ø> (ø)

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[rickecon]

@jdebacker. I just submitted a PR to this branch that adds the jupyter-book and jupyter packages to the ogcore package list in setup.py. This was the only reason I could think of why the GitHub action would not be recognizing the jb command.

[rickecon]

@jdebacker. Also. Why do we need the ./docs/templates/parameters_template.md and ./docs/templates/variables_template.md. I don't see those two files called anywhere else in the OG-Core repo. And all the text in those two files is repeated exactly in ./docs/book/content/intro/parameters.md and in ./docs/book/content/intro/variables.md.

In other words, can we delete ./docs/templates/parameters_template.md and ./docs/templates/variables_template.md?

[SeaCelo]

I was running into this issue and came here to add this patch. Good to see its here. But is there a way to have the individual country models define this at run time in calibration.py instead of having to patch OG-Core?

[rickecon]

@SeaCelo said:

I was running into this issue and came here to add this patch. Good to see its here. But is there a way to have the individual country models define this at run time in calibration.py instead of having to patch OG-Core?

I'll have to think about that. But given that all the country calibrations have OG-Core as a dependency, it is valuable to fix this Jupyter Book issue in OG-Core because it will just show up in all the other country calibrations. The principle is that any packages or processes should be in OG-Core that are used in all the country calibrations.

[SeaCelo]

@SeaCelo said:

I was running into this issue and came here to add this patch. Good to see its here. But is there a way to have the individual country models define this at run time in calibration.py instead of having to patch OG-Core?

I'll have to think about that. But given that all the country calibrations have OG-Core as a dependency, it is valuable to fix this Jupyter Book issue in OG-Core because it will just show up in all the other country calibrations. The principle is that any packages or processes should be in OG-Core that are used in all the country calibrations.

@rickecon
The Jupyter Book issue yes. I was referring to the country_dict issue. It would make sense for OG-ETH calibrate.py to define the new dictionary entry instead of having to patch OG-Core each time there is a new country.

[rickecon]

@jdebacker. I submitted a new commit to my PR to your branch which pins the version of jupyter-book<2.0.0 in setup.py and environment.yml. I confirmed that these two changes allow all the GitHub Actions tests to pass by submitting it as a separate PR, which I have now closed. If you review and merge my PR to your branch, your PR should pass all the tests.

[rickecon]

@jdebacker. This looks good to me. I'll merge as soon as all the tests pass. But the docs_check.yml test has passed, so we expect all the other tests to pass.