Upstream update: release 3.4.0

This release removes support of Python 2. Meanwhile, the Python 2
versions of too many dependencies were removed from both the official
repositories and the AUR.

2 files changed, 14 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6847c6801a1..8b99d095aacd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,44 +1,13 @@
 pkgbase = python-social-auth-core
-	pkgdesc = Core component of the python-social-auth ecosystem
-	pkgver = 1.7.0
+	pkgdesc = Python Social Auth core component
+	pkgver = 3.4.0
 	pkgrel = 1
 	url = https://github.com/python-social-auth/social-core
 	arch = any
 	license = BSD
 	makedepends = python-setuptools
-	makedepends = python-defusedxml
-	makedepends = python-pyjwt
-	makedepends = python-pyjwkest
-	makedepends = python-requests-oauthlib
-	makedepends = python-openid
-	makedepends = python-cryptography
-	makedepends = python3-saml
-	makedepends = python2-setuptools
-	makedepends = python2-defusedxml
-	makedepends = python2-pyjwt
-	makedepends = python2-pyjwkest
-	makedepends = python2-requests-oauthlib
-	makedepends = python2-openid
-	makedepends = python2-cryptography
-	makedepends = python2-saml
-	source = python-social-auth-core-1.7.0.tar.gz::https://github.com/python-social-auth/social-core/archive/1.7.0.tar.gz
-	sha256sums = c12480159bc7a8ed5d71627103e70cbe8ce63af1bf6f4f1d265d8e9b6c58c39c
+	source = python-social-auth-core-3.4.0.tar.gz::https://github.com/python-social-auth/social-core/archive/3.4.0.tar.gz
+	sha256sums = 06e137cf87a23bd077541523833b29f481081dd7ee143651b758db701032e606
 
 pkgname = python-social-auth-core
-	depends = python-defusedxml
-	depends = python-pyjwt
-	depends = python-pyjwkest
-	depends = python-requests-oauthlib
-	depends = python-openid
-	depends = python-cryptography
-	depends = python3-saml
-
-pkgname = python2-social-auth-core
-	depends = python2-defusedxml
-	depends = python2-pyjwt
-	depends = python2-pyjwkest
-	depends = python2-requests-oauthlib
-	depends = python2-openid
-	depends = python2-cryptography
-	depends = python2-saml
 
diff --git a/PKGBUILD b/PKGBUILD
index 84319bd716fa..3029a70d86ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,26 @@
 # Maintainer: Peter Mattern <pmattern at arcor dot de>
 
-pkgbase=python-social-auth-core
-pkgname=(${pkgbase} 'python2-social-auth-core')
-pkgver=1.7.0
+pkgname=python-social-auth-core
+pkgver=3.4.0
 pkgrel=1
-pkgdesc='Core component of the python-social-auth ecosystem'
+pkgdesc='Python Social Auth core component'
 arch=('any')
 url='https://github.com/python-social-auth/social-core'
 license=('BSD')
-makedepends=('python-setuptools' 'python-defusedxml' 'python-pyjwt' 'python-pyjwkest' 'python-requests-oauthlib'
-               'python-openid' 'python-cryptography' 'python3-saml'
-             'python2-setuptools' 'python2-defusedxml' 'python2-pyjwt' 'python2-pyjwkest' 'python2-requests-oauthlib'
-               'python2-openid' 'python2-cryptography' 'python2-saml')
-source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/python-social-auth/social-core/archive/${pkgver}.tar.gz")
-sha256sums=('c12480159bc7a8ed5d71627103e70cbe8ce63af1bf6f4f1d265d8e9b6c58c39c')
-
-prepare() {
-    cp -r social-core-${pkgver} social-core-${pkgver}-python2
-}
+makedepends=('python-six' 'python-defusedxml' 'python-pyjwt' 'python-jose' 'python-requests-oauthlib'
+             'python-openid' 'python-cryptography' 'python3-saml')
+makedepends=('python-setuptools')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
+sha256sums=('06e137cf87a23bd077541523833b29f481081dd7ee143651b758db701032e606')
 
 build() {
 
-    cd ${srcdir}/social-core-${pkgver}
+    cd social-core-${pkgver}
     python setup.py build
 
-    cd ${srcdir}/social-core-${pkgver}-python2
-    python2 setup.py build
-
 }
 
-package_python-social-auth-core() {
-
-    depends=('python-defusedxml' 'python-pyjwt' 'python-pyjwkest' 'python-requests-oauthlib'
-             'python-openid' 'python-cryptography' 'python3-saml')
+package() {
 
     cd social-core-${pkgver}
     python setup.py install --root ${pkgdir} --optimize=1
@@ -40,15 +28,3 @@ package_python-social-auth-core() {
     install -Dm644 ${srcdir}/social-core-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 
 }
-
-package_python2-social-auth-core() {
-
-    depends=('python2-defusedxml' 'python2-pyjwt' 'python2-pyjwkest' 'python2-requests-oauthlib'
-             'python2-openid' 'python2-cryptography' 'python2-saml')
-
-    cd social-core-${pkgver}-python2
-    python2 setup.py install --root ${pkgdir} --optimize=1
-
-    install -Dm644 ${srcdir}/social-core-${pkgver}-python2/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-}