Fixes some warnings with latest setuptools (#1445)

Signed-off-by: Tao He <[email protected]>

pyproject.toml

@@ -1,3 +1,7 @@
+[build-system]
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
+
 [tool.black]
 line-length = 88
 exclude = '''

python/vineyard/__init__.py

@@ -20,6 +20,10 @@
 import logging
 import os
 import sys
+from typing import Any
+from typing import Dict
+from typing import Generator
+from typing import Union
 
 from .version import __version__
 
@@ -39,7 +43,11 @@
 
 
 @contextlib.contextmanager
-def envvars(key: str, value: str = None, append: bool = False) -> None:
+def envvars(
+    key: Union[str, Dict[str, str]],
+    value: Union[str, None] = None,
+    append: bool = False,
+) -> Generator[os._Environ, Any, Any]:
     """Create a context with specified environment variables set.
 
     It is useful for setting the :code`VINEYARD_IPC_SOCKET` environment
@@ -59,9 +67,13 @@ def envvars(key: str, value: str = None, append: bool = False) -> None:
             # env :code:`KEY1` will be set as None and :code:`KEY2` will
             # be set as :code:`value2`.
     """
-    items = key
     if isinstance(key, str):
-        items = {key: value}
+        if value is None:
+            items = dict()
+        else:
+            items: Dict[str, str] = {key: value}
+    else:
+        items: Dict[str, str] = key
     original_items = dict()
     for k, v in items.items():
         original_items[k] = os.environ.get(k, None)

setup.cfg

@@ -56,4 +56,4 @@ all_files  = 1
 fresh-env  = 1
 
 [upload_docs]
-upload-dir = docs/_build/html
+upload_dir = docs/_build/html

setup.cfg.in

@@ -56,4 +56,4 @@ all_files  = 1
 fresh-env  = 1
 
 [upload_docs]
-upload-dir = docs/_build/html
+upload_dir = docs/_build/html