Fix minor issues introduced in async migration

Remove mislabeled async from synchronous functions. Move test dependency to `dev` section.
intendednull · Jul 5, 2019 · f5ecc99 · f5ecc99
1 parent db4e670
commit f5ecc99
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/gentle_gnomes/poetry.lock b/gentle_gnomes/poetry.lock
diff --git a/gentle_gnomes/pyproject.toml b/gentle_gnomes/pyproject.toml
@@ -13,12 +13,12 @@ scipy = "^1.3"
 aiohttp = "^3.5"
 quart = "^0.9.1"
 uvloop = "^0.12.2"
-pytest-asyncio = "^0.10.0"
 
 [tool.poetry.dev-dependencies]
 pytest = "^4.6"
 coverage = "^4.5"
 flake8 = "^3.7"
+pytest-asyncio = "^0.10.0"
 
 [tool.poetry.scripts]
 start = "app:main"

diff --git a/gentle_gnomes/src/azavea.py b/gentle_gnomes/src/azavea.py
@@ -10,7 +10,7 @@ class City(t.NamedTuple):
     admin: str
     id: int
 
-    async def __str__(self):
+    def __str__(self):
         return f'{self.name}, {self.admin}'
 
 

diff --git a/gentle_gnomes/src/indicator.py b/gentle_gnomes/src/indicator.py
@@ -16,10 +16,9 @@
 
 
 class Indicator:
-    async def __init__(self, name: str, city: City):
+    def __init__(self, name: str, city: City):
         self.name = name
         self.city = city
-        await self._populate_data()
 
     async def _populate_data(self):
         items = []
@@ -57,6 +56,7 @@ async def get_top_indicators(city: City, n: int = 5) -> Tuple[Indicator, ...]:
 
     for name in INDICATORS:
         indicator = Indicator(name, city)
+        await indicator._populate_data()
 
         rates[name] = indicator.rate
         indicators[name] = indicator