TC_EXTRA_CMAP_FOLDER now works as intended (#217) (#218)

terracotta/cmaps/get_cmaps.py

@@ -53,10 +53,6 @@ def _get_cmap_files() -> Dict[str, str]:
     return cmap_files
 
 
-CMAP_FILES = _get_cmap_files()
-AVAILABLE_CMAPS = sorted(CMAP_FILES.keys())
-
-
 def _read_cmap(path: str) -> np.ndarray:
     with open(path, 'rb') as f:
         cmap_data = np.load(f)
@@ -70,6 +66,10 @@ def _read_cmap(path: str) -> np.ndarray:
     return cmap_data
 
 
+CMAP_FILES = _get_cmap_files()
+AVAILABLE_CMAPS = sorted(CMAP_FILES.keys())
+
+
 def get_cmap(name: str) -> np.ndarray:
     """Retrieve the given colormap and return RGBA values as a uint8 NumPy array of
     shape (255, 4)

terracotta/drivers/mysql.py

@@ -66,8 +66,13 @@ def user(self) -> Optional[str]:
         return self._user or get_settings().MYSQL_USER
 
     @property
-    def password(self) -> Optional[str]:
-        return self._password or get_settings().MYSQL_PASSWORD
+    def password(self) -> str:
+        pw = self._password or get_settings().MYSQL_PASSWORD
+
+        if pw is None:
+            pw = ''
+
+        return pw
 
 
 class MySQLDriver(RasterDriver):
@@ -219,7 +224,7 @@ def _connect(self, check: bool = True) -> Iterator:
                         write_timeout=self.DB_CONNECTION_TIMEOUT,
                         binary_prefix=True, charset='utf8mb4'
                     )
-                self._cursor = cast(DictCursor, self._connection.cursor(DictCursor))
+                self._cursor = self._connection.cursor(DictCursor)
                 self._connected = close = True
 
                 if check:
@@ -360,7 +365,6 @@ def keytuple(row: Dict[str, Any]) -> Tuple[str, ...]:
 
         datasets = {}
         for row in cursor:
-            row = cast(Dict[str, Any], row)
             datasets[keytuple(row)] = row['filepath']
 
         return datasets

terracotta/scripts/click_types.py

@@ -24,7 +24,7 @@ def convert(self, value: str, *args: Any) -> List[pathlib.Path]:
 class PathlibPath(click.Path):
     """Converts a string to a pathlib.Path object"""
 
-    def convert(self, *args: Any) -> pathlib.Path:  # type: ignore
+    def convert(self, *args: Any) -> pathlib.Path:
         return pathlib.Path(super().convert(*args))
 
 

tests/drivers/test_mysql.py

@@ -2,19 +2,19 @@
 
 TEST_CASES = {
     'mysql://root@localhost:5000/test': dict(
-        user='root', host='localhost', port=5000, db='test'
+        user='root', password='', host='localhost', port=5000, db='test'
     ),
     'root@localhost:5000/test': dict(
-        user='root', host='localhost', port=5000, db='test'
+        user='root', password='', host='localhost', port=5000, db='test'
     ),
     'mysql://root:foo@localhost/test': dict(
         user='root', password='foo', host='localhost', port=3306, db='test'
     ),
     'mysql://localhost/test': dict(
-        host='localhost', port=3306, db='test'
+        password='', host='localhost', port=3306, db='test'
     ),
     'localhost/test': dict(
-        host='localhost', port=3306, db='test'
+        password='', host='localhost', port=3306, db='test'
     )
 }