Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pkg-info, remove python3-six #11

Merged
merged 1 commit into from
Jul 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 11 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
)
4 changes: 1 addition & 3 deletions wb_common/gpio.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
import threading
from collections import defaultdict

from six import iteritems


class GPIOHandler(object):
IN = "in"
Expand Down Expand Up @@ -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"
Expand Down