v0.6.2

3 files changed, 14 insertions, 129 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 12bda76e9c74..40ea960755d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,15 @@
 pkgbase = python-gbulb
-	pkgdesc = Implmementation of asyncio using GLib
-	pkgver = 0.6.1
-	pkgrel = 2
+	pkgdesc = Implementation of asyncio using GLib
+	pkgver = 0.6.2
+	pkgrel = 1
 	url = https://github.com/nathan-hoad/gbulb
 	arch = any
 	license = Apache
-	checkdepends = python-pytest
+	checkdepends = python-tox
 	makedepends = python-setuptools
 	depends = python-gobject
 	optdepends = gtk3: Gtk application integration
-	source = https://github.com/nathan-hoad/gbulb/archive/0.6.1.tar.gz
-	source = 0001-fixes.patch
-	sha256sums = ab9dbde5d92a2b4f13c7acc9afc7235081a5c999d6807b049e2d8c2ef26c03a9
-	sha256sums = 42fe5793da6645c0ad9c1147dd4842ba6aa29c3536ffb5165a78f33a376b7e65
+	source = https://github.com/beeware/gbulb/archive/v0.6.2.tar.gz
+	sha256sums = e35a01f6779a87c682e5f3e6b7bc7f65815330fc3c15f7c648a32ddb286dc973
 
 pkgname = python-gbulb
-
diff --git a/0001-fixes.patch b/0001-fixes.patch
deleted file mode 100644
index ee8c31e32987..000000000000
--- a/0001-fixes.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 1d003a2554f5b8e9a2f7b45b26eb44d506a66d3f Mon Sep 17 00:00:00 2001
-From: Sam Day <me@samcday.com>
-Date: Sat, 26 Sep 2020 22:21:17 +0200
-Subject: [PATCH] fixes
-
----
- gbulb/glib_events.py | 6 +++---
- gbulb/transports.py  | 6 +++---
- tests/test_utils.py  | 2 +-
- tests/utils.py       | 8 ++++----
- 4 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/gbulb/glib_events.py b/gbulb/glib_events.py
-index 4c06a48..47723e0 100644
---- a/gbulb/glib_events.py
-+++ b/gbulb/glib_events.py
-@@ -7,7 +7,7 @@ import socket
- import sys
- import threading
- import weakref
--from asyncio import constants, events, futures, sslproto, tasks
-+from asyncio import constants, events, exceptions, sslproto, tasks
- 
- from gi.repository import GLib, Gio
- 
-@@ -382,7 +382,7 @@ class GLibBaseEventLoop(_BaseEventLoop, GLibBaseEventLoopPlatformExt):
-                         'socket': sock,
-                     })
-                     sock.close()
--            except futures.CancelledError:
-+            except exceptions.CancelledError:
-                 sock.close()
-             else:
-                 self._accept_futures[sock.fileno()] = f
-@@ -549,7 +549,7 @@ class GLibBaseEventLoop(_BaseEventLoop, GLibBaseEventLoopPlatformExt):
-             # Coroutine closing the accept socket if the future is cancelled
-             try:
-                 return (yield from future)
--            except futures.CancelledError:
-+            except exceptions.CancelledError:
-                 sock.close()
-                 raise
- 
-diff --git a/gbulb/transports.py b/gbulb/transports.py
-index ebc9f81..950ff0d 100644
---- a/gbulb/transports.py
-+++ b/gbulb/transports.py
-@@ -1,7 +1,7 @@
- import collections
- import socket
- import subprocess
--from asyncio import base_subprocess, futures, transports
-+from asyncio import base_subprocess, exceptions, futures, transports
- 
- 
- class BaseTransport(transports.BaseTransport):
-@@ -159,10 +159,10 @@ class ReadTransport(BaseTransport, transports.ReadTransport):
-             self._force_close(exc)
-         except OSError as exc:
-             self._fatal_error(exc, 'Fatal read error on pipe transport')
--        except futures.CancelledError:
-+        except exceptions.CancelledError:
-             if not self._closing:
-                 raise
--        except futures.InvalidStateError:
-+        except concurrent.futures.InvalidStateError:
-             self._read_fut = fut
-             self._cancelable.add(self._read_fut)
-         else:
-diff --git a/tests/test_utils.py b/tests/test_utils.py
-index 18fa7bb..5b754ce 100644
---- a/tests/test_utils.py
-+++ b/tests/test_utils.py
-@@ -2,7 +2,7 @@ from unittest import mock
- 
- import pytest
- 
--from utils import glib_loop
-+from utils import glib_loop, glib_policy
- 
- 
- @pytest.mark.parametrize('gtk,gtk_available', [
-diff --git a/tests/utils.py b/tests/utils.py
-index da65e5e..8040356 100644
---- a/tests/utils.py
-+++ b/tests/utils.py
-@@ -28,8 +28,8 @@ def gtk_policy():
- 
- 
- @pytest.yield_fixture(scope='function')
--def glib_loop():
--    l = glib_policy().new_event_loop()
-+def glib_loop(glib_policy):
-+    l = glib_policy.new_event_loop()
-     setup_test_loop(l)
-     yield l
-     check_loop_failures(l)
-@@ -37,8 +37,8 @@ def glib_loop():
- 
- 
- @pytest.yield_fixture(scope='function')
--def gtk_loop():
--    l = gtk_policy().new_event_loop()
-+def gtk_loop(gtk_policy):
-+    l = gtk_policy.new_event_loop()
-     setup_test_loop(l)
-     yield l
-     check_loop_failures(l)
--- 
-2.28.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 06343c8a3476..1817e8134537 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,27 +3,26 @@
 
 _modname='gbulb'
 pkgname='python-gbulb'
-pkgver=0.6.1
-pkgrel=2
-pkgdesc='Implmementation of asyncio using GLib'
+pkgver=0.6.2
+pkgrel=1
+pkgdesc='Implementation of asyncio using GLib'
 arch=('any')
 url='https://github.com/nathan-hoad/gbulb'
 license=('Apache')
 makedepends=('python-setuptools')
 depends=('python-gobject')
 optdepends=('gtk3: Gtk application integration')
-checkdepends=('python-pytest')
-source=("https://github.com/nathan-hoad/gbulb/archive/$pkgver.tar.gz" 0001-fixes.patch)
-sha256sums=('ab9dbde5d92a2b4f13c7acc9afc7235081a5c999d6807b049e2d8c2ef26c03a9'
-            '42fe5793da6645c0ad9c1147dd4842ba6aa29c3536ffb5165a78f33a376b7e65')
+checkdepends=('python-tox')
+source=("https://github.com/beeware/gbulb/archive/v$pkgver.tar.gz")
+sha256sums=('e35a01f6779a87c682e5f3e6b7bc7f65815330fc3c15f7c648a32ddb286dc973')
 
 prepare() {
     cd "$_modname-$pkgver"
-    cat ../0001-fixes.patch | patch -s -F0 -E -p1
 }
+
 check() {
     cd "$_modname-$pkgver"
-    python -m pytest ./tests
+    tox -e py
 }
 
 package() {