facilities fixes

.coveragerc

@@ -1,7 +1,7 @@
 [run]
 branch=True
 source=fahari
-omit=fahari/config/*,fahari/**/migrations/*,scripts/*,fahari/**/tests/*
+omit=fahari/config/*,fahari/**/migrations/*,scripts/*,fahari/**/tests/*,fahari/sims/*
 
 [report]
 exclude_lines =

.github/workflows/ci.yml

@@ -62,6 +62,7 @@ jobs:
 
       - name: mypy
         run: |
+          sudo apt-get update  && sudo apt-get upgrade
           mypy .
 
   pytest:
@@ -105,6 +106,7 @@ jobs:
 
       - name: Set up Django
         run: |
+          sudo apt-get update  && sudo apt-get upgrade
           python manage.py migrate
           python manage.py createcachetable
           python manage.py collectstatic --noinput

fahari/common/constants.py

@@ -58,6 +58,7 @@
                 "Mowlem",
                 "Umoja I",
                 "Umoja II",
+                "Utawala",
             ),
             "Kamukunji": (
                 "Airbase",

fahari/common/tests/test_administrative_unit_utils.py

@@ -83,7 +83,7 @@ def test_get_wards():
     assert ("Ziwani/Kariokor", "Ziwani/Kariokor") in wards
     assert ("Landimawe", "Landimawe") in wards
     assert ("Nairobi South", "Nairobi South") in wards
-    assert len(wards) == 109
+    assert len(wards) == 110
 
 
 def test_get_wards_for_sub_county_with_missing_sub_county():

fahari/common/views/mixins/drf_mixins.py

@@ -65,7 +65,7 @@ def get_excel_io(self, **kwargs) -> EIO:
         excel_io_class = self.get_excel_io_class()
         default_kwargs = self.get_excel_io_kwargs()
         default_kwargs.update(kwargs)
-        return excel_io_class(**default_kwargs)  # type: ignore
+        return excel_io_class(**default_kwargs)
 
     def get_excel_io_kwargs(self) -> Dict[str, Any]:
         """Return kwargs to be used when initializing an excel io instance."""

fahari/misc/exceptions.py

@@ -7,4 +7,4 @@ class ProcessGoogleSheetRowError(RuntimeError):
     def __init__(self, row: Sequence[str], row_index: int, *args, **kwargs):
         self.row: Sequence[str] = tuple(row)
         self.row_index: int = row_index
-        super().__init__(*args, **kwargs)  # type: ignore
+        super().__init__(*args, **kwargs)

fahari/utils/excel_utils/drf_serializer_excel_io.py

@@ -166,7 +166,7 @@ def get_template(self, *args, **kwargs) -> T:
                 self.get_fields(), self.get_nested_entries_delimiter()
             )
 
-        return template_class(*args, **kwargs)  # type: ignore
+        return template_class(*args, **kwargs)
 
     def get_template_class(self) -> Type[T]:
         """Return a class to use for the template. Defaults to using `self.template_class`."""

requirements/local.txt

@@ -7,7 +7,7 @@ watchgod~=0.7  # https://github.com/samuelcolvin/watchgod
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy~=0.910  # https://github.com/python/mypy
+mypy~=0.930  # https://github.com/python/mypy
 django-stubs~=1.8.0  # https://github.com/typeddjango/django-stubs
 pytest~=6.2.4  # https://github.com/pytest-dev/pytest
 pytest-sugar~=0.9.4  # https://github.com/Frozenball/pytest-sugar

scripts/load_facilities.py

@@ -31,7 +31,7 @@ def load_facilities(source_path):
     for pos, r in enumerate(records):
         if r["Code"] is not None and r["Code"] != "None":
             try:
-                facility, created = Facility.objects.get_or_create(
+                facility, created = Facility.objects.update_or_create(
                     mfl_code=r["Code"],
                     defaults={
                         "name": r["Name"],

scripts/mark_fahari_facilities.py

@@ -8,7 +8,7 @@
 from django.core.exceptions import ValidationError
 
 MFL_CODE_COLNAME = "MFL CODE"
-MFL_SHEET_NAME = "fyj_sites"
+MFL_SHEET_NAME = "fyj_facilities"
 
 
 def mark_facilities(source_path):
@@ -40,5 +40,5 @@ def mark_facilities(source_path):
     django.setup()
 
     data_dir = os.path.join(base_path, "data")
-    source_file = os.path.join(data_dir, "updated_fyj_sites.xlsx")
+    source_file = os.path.join(data_dir, "updated_fyj_facilities.xlsx")
     mark_facilities(source_file)