Fix pkg-info, remove python3-six (#11)

wirenboard · Jul 24, 2023 · 34eb09c · 34eb09c
1 parent 03ddf23
commit 34eb09c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+wb-common (2.1.2) stable; urgency=medium
+
+  * Fix PKG-INFO
+  * Remove python3-six from dependencies
+
+ -- Nikolay Korotkiy <nikolay.korotkiy@wirenboard.com>  Mon, 24 Jul 2023 18:13:00 +0400
+
 wb-common (2.1.1) stable; urgency=medium
 
   * mqtt_client: fix password authentication for websockets and unix socket connections

diff --git a/debian/control b/debian/control
@@ -4,9 +4,10 @@ Section: python
 Priority: optional
 Build-Depends: dh-python, python3-all, python3-setuptools
 Standards-Version: 3.9.1
+Homepage: https://github.com/wirenboard/wb-common
 X-Python3-Version: >= 3.5
 
 Package: python3-wb-common
 Architecture: all
-Depends: python3, ${misc:Depends}, python3-six, python3-paho-socket, busybox
+Depends: python3, ${misc:Depends}, python3-paho-socket, busybox
 Description: Wiren Board Python common library and helpers
diff --git a/setup.py b/setup.py
@@ -4,10 +4,20 @@
 
 from setuptools import find_packages
 
+
+def get_version():
+    with open("debian/changelog", "r", encoding="utf-8") as f:
+        return f.readline().split()[1][1:-1]
+
+
 setup(
     name="wb_common",
-    version="2.0",
+    version=get_version(),
     author="Evgeny Boger",
+    maintainer="Wiren Board Team",
+    maintainer_email="info@wirenboard.com",
     description="Common Python library for Wiren Board",
+    license="MIT",
+    url="https://github.com/wirenboard/wb-common",
     packages=find_packages(),
 )
diff --git a/wb_common/gpio.py b/wb_common/gpio.py
@@ -4,8 +4,6 @@
 import threading
 from collections import defaultdict
 
-from six import iteritems
-
 
 class GPIOHandler(object):
     IN = "in"
@@ -34,7 +32,7 @@ def gpio_polling_thread(self):
         while True:
             events = self.epoll.poll()
             for fileno, event in events:
-                for gpio, fd in iteritems(self.gpio_fds):
+                for gpio, fd in self.gpio_fds.items():
                     if fileno == fd.fileno():
                         if self.gpio_first_event_fired[gpio]:
                             # ~ print "fire callback"