New version: v2.6

3 files changed, 17 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e70438e2fb20..4f04223825eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-aiogram
 	pkgdesc = A pretty simple and fully asynchronous library for Telegram Bot API written in Python 3.7 with asyncio and aiohttp
-	pkgver = 2.4
+	pkgver = 2.6
 	pkgrel = 1
 	url = https://github.com/aiogram/aiogram
 	arch = any
@@ -17,10 +17,8 @@ pkgbase = python-aiogram
 	optdepends = python-emoji: emojize and demojize support
 	optdepends = python-aioredis: Redis storage support
 	optdepends = python-aiohttp-socks: SOCKS4(a) and SOCKS5 proxy support
-	source = https://github.com/aiogram/aiogram/archive/v2.4.tar.gz
-	source = no-pip.patch
-	sha256sums = ddaf49d6f1c38d597102eadd280c77ad26b451e4606464a72f42d43e227ae7e7
-	sha256sums = 6279e16e20acbae3e289cd0e5ba89db199753f35afa5201e3e8adbcd9c1653bb
+	source = https://github.com/aiogram/aiogram/archive/v2.6.tar.gz
+	sha256sums = 7d790b9334a5b96f22ac4267a868a34bb233dfb19e8e9eba82f3d9d46fbbb39d
 
 pkgname = python-aiogram
 
diff --git a/PKGBUILD b/PKGBUILD
index eedf4ee9e6df..80355c5cb4c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,18 @@
 # Maintainer: Evgeniy Filimonov <evgfilim1@gmail.com>
 
 pkgname='python-aiogram'
-pkgver=2.4
+pkgver=2.6
 pkgrel=1
 pkgdesc="A pretty simple and fully asynchronous library for Telegram Bot API written in Python 3.7 with asyncio and aiohttp"
 arch=('any')
 url="https://github.com/aiogram/aiogram"
 license=('MIT')
-depends=('python>=3.7' 'python-aiohttp>=3.5.4' 'python-aiohttp<4.0.0' 'python-babel>=2.6.0' 'python-certifi>=2019.3.9')
+depends=(
+    'python>=3.7'
+    'python-aiohttp>=3.5.4' 'python-aiohttp<4.0.0'
+    'python-babel>=2.6.0'
+    'python-certifi>=2019.3.9'
+)
 makedepends=(
     'python-setuptools'
 #    'python-pip'
@@ -21,14 +26,14 @@ optdepends=(
     'python-aiohttp-socks: SOCKS4(a) and SOCKS5 proxy support'
 #    'python-rethinkdb: RethinkDB storage support'  # No such package yet
 )
-source=("https://github.com/aiogram/aiogram/archive/v${pkgver}.tar.gz"
-        "no-pip.patch")
-sha256sums=('ddaf49d6f1c38d597102eadd280c77ad26b451e4606464a72f42d43e227ae7e7'
-            '6279e16e20acbae3e289cd0e5ba89db199753f35afa5201e3e8adbcd9c1653bb')
+source=("https://github.com/aiogram/aiogram/archive/v${pkgver}.tar.gz")
+#        "no-pip.patch")
+sha256sums=('7d790b9334a5b96f22ac4267a868a34bb233dfb19e8e9eba82f3d9d46fbbb39d')
+#            '6279e16e20acbae3e289cd0e5ba89db199753f35afa5201e3e8adbcd9c1653bb')
 
-prepare() {
-    patch -u "$srcdir/aiogram-${pkgver}/setup.py" no-pip.patch
-}
+#prepare() {
+#    patch -u "$srcdir/aiogram-${pkgver}/setup.py" no-pip.patch
+#}
 
 build() {
 	cd "$srcdir/aiogram-${pkgver}"
diff --git a/no-pip.patch b/no-pip.patch
deleted file mode 100644
index 9a3d93567bb2..000000000000
--- a/no-pip.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- setup.py	2019-08-17 01:00:02.000000000 +0500
-+++ setup.py	2019-08-17 01:04:56.908355213 +0500
-@@ -5,11 +5,6 @@
- 
- from setuptools import find_packages, setup
- 
--try:
--    from pip.req import parse_requirements
--except ImportError:  # pip >= 10.0.0
--    from pip._internal.req import parse_requirements
--
- WORK_DIR = pathlib.Path(__file__).parent
- 
- # Check python version
-@@ -54,9 +49,7 @@
- 
-     file = WORK_DIR / filename
- 
--    install_reqs = parse_requirements(str(file), session='hack')
--    return [str(ir.req) for ir in install_reqs]
--
-+    return file.resolve().read_text().replace('\r', '').rstrip().split('\n')
- 
- setup(
-     name='aiogram',