Merging in latest changes from master and resolved conflicts.

1 files changed, 2 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index a4f49f92..68a125d1 100644
--- a/setup.py
+++ b/setup.py
@@ -1,2 +1,3 @@
-import setuptools
+import setuptools  # type: ignore
+
 setuptools.setup()