version bump

2 files changed, 7 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f7731a15d51..e69de29bb2d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +0,0 @@
-pkgbase = python-django-channels-redis
-	pkgdesc = Redis-backed ASGI channel layer implementation
-	pkgver = 4.2.0
-	pkgrel = 0
-	url = http://github.com/django/channels_redis/
-	arch = any
-	license = BSD
-	makedepends = python-setuptools
-	depends = python
-	depends = python-django-channels
-	depends = python-aioredis1
-	depends = python-msgpack
-	depends = python-asgiref
-	depends = python-async-timeout
-	source = https://pypi.io/packages/source/c/channels_redis/channels_redis-4.2.0.tar.gz
-	sha256sums = 01c26c4d5d3a203f104bba9e5585c0305a70df390d21792386586068162027fd
-
-pkgname = python-django-channels-redis
diff --git a/PKGBUILD b/PKGBUILD
index 681278475950..8e2dd03f2a68 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,20 @@
 
 pkgname=python-django-channels-redis
 _pypi_pkgname=channels_redis
+<<<<<<< HEAD
 pkgver=4.2.0
 pkgrel=0
+=======
+pkgver=4.1.0
+pkgrel=2
+>>>>>>> a1d51eb18e6b10302bd240f75206d1653d8976d3
 pkgdesc="Redis-backed ASGI channel layer implementation"
 arch=(any)
 url=" http://github.com/django/channels_redis/"
 license=('BSD')
 makedepends=('python-setuptools')
-depends=('python' 'python-django-channels' 'python-aioredis1' 'python-msgpack' 'python-asgiref' 'python-async-timeout')
+depends=('python' 'python-django-channels' 'python-redis' 'python-msgpack' 'python-asgiref')
+optdepends=('python-cryptography')
 source=("https://pypi.io/packages/source/c/${_pypi_pkgname}/${_pypi_pkgname}-${pkgver}.tar.gz")
 sha256sums=('01c26c4d5d3a203f104bba9e5585c0305a70df390d21792386586068162027fd')