Revert "Relax structlog version constraints"

This reverts commit 448fe9a845c232c48588beaa1c287bef81238bf6.

3 files changed, 5 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 575c04c0c360..321b1f511a64 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openconnect-sso
 	pkgdesc = Wrapper script for OpenConnect supporting Azure AD (SAMLv2) authentication
 	pkgver = 0.7.3
-	pkgrel = 2
+	pkgrel = 1
 	url = https://github.com/vlaci/openconnect-sso
 	arch = any
 	license = GPL3
@@ -24,8 +24,7 @@ pkgbase = openconnect-sso
 	depends = sudo
 	depends = openconnect
 	source = https://github.com/vlaci/openconnect-sso/releases/download/v0.7.3/openconnect-sso-0.7.3.tar.gz
-	source = relax-structlog-version-constraints.patch
 	sha256sums = 4159d133ea7d27a61f958479c3d551f9f2a5a825c91cdef405500284112bba18
-	sha256sums = 2f09b062f41eeb09721d8b1063ece3f620e5f947bdfb82262fb6b862f581ea89
 
 pkgname = openconnect-sso
+
diff --git a/PKGBUILD b/PKGBUILD
index f782fea755ca..a671d451fd0f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=openconnect-sso
 pkgver=0.7.3
-pkgrel=2
+pkgrel=1
 pkgdesc="Wrapper script for OpenConnect supporting Azure AD (SAMLv2) authentication"
 arch=('any')
 url="https://github.com/vlaci/openconnect-sso"
@@ -13,15 +13,8 @@ depends=('python' 'python-pyqt5' 'python-pyqtwebengine' 'python-attrs' 'python-c
 makedepends=('python-setuptools')
 checkdepends=('python-pytest' 'python-pytest-asyncio')
 optdepends=()
-source=("https://github.com/vlaci/openconnect-sso/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
-        'relax-structlog-version-constraints.patch')
-sha256sums=('4159d133ea7d27a61f958479c3d551f9f2a5a825c91cdef405500284112bba18'
-            '2f09b062f41eeb09721d8b1063ece3f620e5f947bdfb82262fb6b862f581ea89')
-
-prepare() {
-  cd "$pkgname-$pkgver"
-  patch --forward --strip=1 --input="${srcdir}/relax-structlog-version-constraints.patch"
-}
+source=("https://github.com/vlaci/openconnect-sso/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz")
+sha256sums=('4159d133ea7d27a61f958479c3d551f9f2a5a825c91cdef405500284112bba18')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/relax-structlog-version-constraints.patch b/relax-structlog-version-constraints.patch
deleted file mode 100644
index 12ec7c37feba..000000000000
--- a/relax-structlog-version-constraints.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 4eb678f4d3a4f8c4cd7cf11fb1ba825028361fed Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= <laszlo.varady93@gmail.com>
-Date: Wed, 27 Oct 2021 20:50:36 +0200
-Subject: [PATCH] Relax structlog version constraints
-
-https://www.structlog.org/en/stable/changelog.html
-
-> Versions are year-based with a strict backward compatibility policy.
----
- PKG-INFO       | 2 +-
- pyproject.toml | 2 +-
- setup.py       | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/PKG-INFO b/PKG-INFO
-index 3851bb5..2396429 100644
---- a/PKG-INFO
-+++ b/PKG-INFO
-@@ -30,7 +30,7 @@ Requires-Dist: prompt-toolkit (>=3.0.3,<4.0.0)
- Requires-Dist: pyxdg (>=0.26,<0.28)
- Requires-Dist: requests (>=2.22,<3.0)
- Requires-Dist: setuptools (>40.0)
--Requires-Dist: structlog (>=20.1,<21.2.0)
-+Requires-Dist: structlog (>=20.1)
- Requires-Dist: toml (>=0.10,<0.11)
- Project-URL: Repository, https://github.com/vlaci/openconnect-sso
- Description-Content-Type: text/markdown
-diff --git a/pyproject.toml b/pyproject.toml
-index de7388a..4cc6159 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -29,7 +29,7 @@ keyring = ">=21.1, <24.0.0"
- prompt-toolkit = "^3.0.3"
- pyxdg = ">=0.26, <0.28"
- requests = "^2.22"
--structlog = ">=20.1, <21.2.0"
-+structlog = ">=20.1"
- toml = "^0.10"
- setuptools = ">40.0"
- 
-diff --git a/setup.py b/setup.py
-index 21dc95f..e9825a2 100644
---- a/setup.py
-+++ b/setup.py
-@@ -17,7 +17,7 @@ install_requires = \
-  'pyxdg>=0.26,<0.28',
-  'requests>=2.22,<3.0',
-  'setuptools>40.0',
-- 'structlog>=20.1,<21.2.0',
-+ 'structlog>=20.1',
-  'toml>=0.10,<0.11']
- 
- extras_require = \
--- 
-2.33.1
-