1.7.7

4 files changed, 24 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c29def90bfe..8ea052b8035a 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-pynput
 	pkgdesc = Python library to monitor and control user input devices
-	pkgver = 1.7.6
-	pkgrel = 2
+	pkgver = 1.7.7
+	pkgrel = 1
 	url = https://github.com/moses-palmer/pynput
 	arch = any
 	license = LGPL-3.0-or-later
@@ -9,12 +9,10 @@ pkgbase = python-pynput
 	makedepends = python-installer
 	makedepends = python-setuptools
 	makedepends = python-wheel
-	depends = python-xlib
-	depends = python-six
 	depends = python-evdev
-	source = https://files.pythonhosted.org/packages/source/p/pynput/pynput-1.7.6.tar.gz
-	source = setup.patch
-	sha256sums = 3a5726546da54116b687785d38b1db56997ce1d28e53e8d22fc656d8b92e533c
-	sha256sums = c519290a88baa3e15be4bb6cff4d665a020b9e0c8c1241749670d58a48b07e2c
+	depends = python-six
+	depends = python-xlib
+	source = pynput-1.7.7.tar.gz::https://github.com/moses-palmer/pynput/archive/refs/tags/v1.7.7.tar.gz
+	sha256sums = e042e70933938b3b1226aee936d60acf03f43d52e83d7abbd728e8bab2deeacd
 
 pkgname = python-pynput
diff --git a/.gitignore b/.gitignore
index f6d26664c68d..4dab8d6386e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,3 @@
 !.gitignore
 !PKGBUILD
 !.SRCINFO
-!setup.patch
diff --git a/PKGBUILD b/PKGBUILD
index eef9c37ba457..0fe507f8036c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,31 @@
 # Contributor: Juliette Monsel <j_4321 at protonmail dot com>
 pkgname=python-pynput
 _name=${pkgname#python-}
-pkgver=1.7.6
-pkgrel=2
+pkgver=1.7.7
+pkgrel=1
 pkgdesc="Python library to monitor and control user input devices"
 arch=('any')
 url="https://github.com/moses-palmer/pynput"
 license=('LGPL-3.0-or-later')
-depends=('python-xlib' 'python-six' 'python-evdev')
-makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel')
-source=("https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz"
-        'setup.patch')
-sha256sums=('3a5726546da54116b687785d38b1db56997ce1d28e53e8d22fc656d8b92e533c'
-            'c519290a88baa3e15be4bb6cff4d665a020b9e0c8c1241749670d58a48b07e2c')
+depends=(
+  'python-evdev'
+  'python-six'
+  'python-xlib'
+)
+makedepends=(
+  'python-build'
+  'python-installer'
+  'python-setuptools'
+  'python-wheel'
+)
+source=("$_name-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz")
+sha256sums=('e042e70933938b3b1226aee936d60acf03f43d52e83d7abbd728e8bab2deeacd')
 
 prepare() {
   cd "$_name-$pkgver"
-  patch -Np1 -i $srcdir/setup.patch
+
+  # Don't require SETUP_PACKAGES since we're neither building docs nor uploading to PyPI
+  sed -i 's/setup_requires=RUNTIME_PACKAGES + SETUP_PACKAGES/setup_requires=RUNTIME_PACKAGES/g' setup.py
 }
 
 build() {
diff --git a/setup.patch b/setup.patch
deleted file mode 100644
index 2b7be112cec3..000000000000
--- a/setup.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --unified --recursive --text pynput-1.7.3-a/setup.py pynput-1.7.3-b/setup.py
---- pynput-1.7.3-a/setup.py	2021-02-10 09:50:04.000000000 -0700
-+++ pynput-1.7.3-b/setup.py	2021-09-01 08:15:42.243368000 -0600
-@@ -21,11 +21,6 @@
- RUNTIME_PACKAGES = [
-     'six']
- 
--#: Additional requirements used during setup
--SETUP_PACKAGES = [
--    'setuptools-lint >=0.5',
--    'sphinx >=1.3.1']
--
- #: Packages requires for different environments
- EXTRA_PACKAGES = {
-     ':sys_platform == "darwin"': [
-@@ -90,7 +85,6 @@
-     long_description=README + '\n\n' + CHANGES,
- 
-     install_requires=RUNTIME_PACKAGES,
--    setup_requires=RUNTIME_PACKAGES + SETUP_PACKAGES,
-     extras_require=EXTRA_PACKAGES,
- 
-     author=INFO['author'],