| author | George Rawlinson
<grawlinson@archlinux.org> 2022-11-28 08:06:14 UTC |
| committer | George Rawlinson
<grawlinson@archlinux.org> 2022-11-28 08:06:14 UTC |
| parent | 87a603e509e52db1d0860c4859fcf0487bd484fa |
| PKGBUILD | +5 | -24 |
| idea-deprecation.patch | +0 | -16 |
diff --git a/PKGBUILD b/PKGBUILD index de62076..b562baf 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: James Morris <jmorris@securityinnovation.com> pkgname=python-pgpy -pkgver=0.5.4 -pkgrel=3 +pkgver=0.6.0 +pkgrel=1 pkgdesc='Pretty Good Privacy for Python' arch=('any') license=('BSD') @@ -11,7 +11,6 @@ url='https://github.com/SecurityInnovation/PGPy' depends=( 'python' 'python-cryptography' - 'python-six' 'python-pyasn1' ) makedepends=( @@ -22,13 +21,9 @@ checkdepends=( 'python-pytest' 'python-pytest-order' ) -_commit='345f4b8d74f4123b97198e10a383f485f80946d8' -source=( - "$pkgname::git+$url.git#commit=$_commit" - 'idea-deprecation.patch' -) -b2sums=('SKIP' - '55917c5f5e17aeea00c879e9c1329a5e28add956e87fb4e6159119fa7a2a4793f788851cbe716258acf34c9ffd6524f44273fe599329354a22b990ddc768dbf2') +_commit='a0e56ff79df37652208002dba9f37e29f451c8ac' +source=("$pkgname::git+$url.git#commit=$_commit") +b2sums=('SKIP') pkgver() { cd "$pkgname" @@ -36,20 +31,6 @@ pkgver() { git describe --tags | sed 's/^v//' } -prepare() { - cd "$pkgname" - - # https://github.com/SecurityInnovation/PGPy/pull/378 - sed -i '/wheel/d' setup.cfg - - # https://github.com/SecurityInnovation/PGPy/pull/373 - git cherry-pick --no-commit e2f427ea5c0347fb5995ed2a9bc00f780c212c70 - - # https://github.com/SecurityInnovation/PGPy/pull/403 - git cherry-pick --no-commit d84597eb8417a482433ff51dc6b13060d4b2e686 - patch -p1 -i "$srcdir/idea-deprecation.patch" -} - build() { cd "$pkgname" diff --git a/idea-deprecation.patch b/idea-deprecation.patch deleted file mode 100644 index 54bfacc..0000000 --- a/idea-deprecation.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/tests/test_10_exceptions.py -+++ b/tests/test_10_exceptions.py -@@ -230,11 +230,11 @@ class TestPGPKey(object): - rsa_pub.subkeys['EEE097A017B979CA'].encrypt(PGPMessage.new('asdf'), - cipher=SymmetricKeyAlgorithm.CAST5) - -- w = recwarn.pop(UserWarning) -+ w = recwarn.list[-2] - assert str(w.message) == "Selected symmetric algorithm not in key preferences" - assert w.filename == __file__ - -- w = recwarn.pop(UserWarning) -+ w = recwarn.list[-1] - assert str(w.message) == "Selected compression algorithm not in key preferences" - assert w.filename == __file__ -