devpi-common 4.0.2-1

3 files changed, 8 insertions, 100 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6af2a2fcaaa0..59d51dadba98 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = devpi-common
 	pkgdesc = Utilities jointly used by devpi-server and devpi-client
-	pkgver = 3.7.2
+	pkgver = 4.0.2
 	pkgrel = 1
 	url = https://github.com/devpi/devpi
 	changelog = CHANGELOG
@@ -12,12 +12,11 @@ pkgbase = devpi-common
 	makedepends = python-build
 	makedepends = python-installer
 	makedepends = python-wheel
+	makedepends = python-setuptools-changelog-shortener
 	depends = python-lazy
 	depends = python-py
 	depends = python-requests
-	source = devpi-common-3.7.2.tar.gz::https://files.pythonhosted.org/packages/source/d/devpi-common/devpi-common-3.7.2.tar.gz
-	source = 2aba62c961653aa82181b201995ecbdcb63ce639.patch
-	sha256sums = 9078989279ad79e9c181c7badc4a738460445187101eb0cbade675934d5e4644
-	sha256sums = f722975b8b9b025238d2fb84b6fd89c7a61d785b54ebc9e4f7a973a5ad12b2d5
+	source = devpi-common-4.0.2.tar.gz::https://files.pythonhosted.org/packages/source/d/devpi-common/devpi-common-4.0.2.tar.gz
+	sha256sums = 2d277701faf05d4a6f6cbdb7e040f93c0a00286dbe87d5c0a2eeaeba2055919c
 
 pkgname = devpi-common
diff --git a/2aba62c961653aa82181b201995ecbdcb63ce639.patch b/2aba62c961653aa82181b201995ecbdcb63ce639.patch
deleted file mode 100644
index ac89ff7302a6..000000000000
--- a/2aba62c961653aa82181b201995ecbdcb63ce639.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/common/devpi_common/metadata.py b/common/devpi_common/metadata.py
-index 712f77e4e..f72567fa1 100644
---- a/common/devpi_common/metadata.py
-+++ b/common/devpi_common/metadata.py
-@@ -1,7 +1,9 @@
- import posixpath
- import re
--from packaging.version import parse as parse_version
- from packaging.requirements import Requirement as BaseRequirement
-+from packaging.version import InvalidVersion
-+from packaging.version import Version as PackagingVersion
-+from packaging.version import parse as orig_parse_version
- from .types import CompareMixin
- from .types import cached_property
- from .validation import normalize_name
-@@ -12,6 +14,72 @@
-     ".tar.bz2 .tar .tgz .zip .doc.zip".split())
- 
- 
-+class LegacyVersion(object):
-+    # "naturally" sorted and always smaller than a valid version
-+    __slots__ = ('_value', 'cmpval')
-+
-+    def __init__(self, version):
-+        self._value = version
-+        self.cmpval = tuple(
-+            (int(n) if n != '' else 0, a)
-+            for n, a in re.findall(r'(\d*)([^\d]*)', version))
-+
-+    def __lt__(self, other):
-+        if isinstance(other, PackagingVersion):
-+            # always smaller
-+            return True
-+        if isinstance(other, LegacyVersion):
-+            return self.cmpval < other.cmpval
-+        return NotImplemented
-+
-+    def __le__(self, other):
-+        if isinstance(other, PackagingVersion):
-+            # always smaller or equal
-+            return True
-+        if isinstance(other, LegacyVersion):
-+            return self.cmpval <= other.cmpval
-+        return NotImplemented
-+
-+    def __eq__(self, other):
-+        if isinstance(other, PackagingVersion):
-+            # never equal
-+            return False
-+        if isinstance(other, LegacyVersion):
-+            return self.cmpval == other.cmpval
-+        return NotImplemented
-+
-+    def __ne__(self, other):
-+        if isinstance(other, PackagingVersion):
-+            # never equal
-+            return True
-+        if isinstance(other, LegacyVersion):
-+            return self.cmpval != other.cmpval
-+        return NotImplemented
-+
-+    def __ge__(self, other):
-+        if isinstance(other, PackagingVersion):
-+            # never greater or equal
-+            return False
-+        if isinstance(other, LegacyVersion):
-+            return self.cmpval >= other.cmpval
-+        return NotImplemented
-+
-+    def __gt__(self, other):
-+        if isinstance(other, PackagingVersion):
-+            # never greater
-+            return False
-+        if isinstance(other, LegacyVersion):
-+            return self.cmpval > other.cmpval
-+        return NotImplemented
-+
-+
-+def parse_version(version):
-+    try:
-+        return orig_parse_version(version)
-+    except InvalidVersion:
-+        return LegacyVersion(version)
-+
-+
- _releasefile_suffix_rx = re.compile(
-     r"(\.deb|\.dmg|\.msi|\.zip|\.tar\.gz|\.tgz|\.tar\.bz2|"
-     r"\.doc\.zip|"
diff --git a/PKGBUILD b/PKGBUILD
index b7b56c635c2d..256e5f8c870a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Florian Bruhin (The Compiler) <archlinux.org@the-compiler.org>
 
 pkgname=devpi-common
-pkgver=3.7.2
+pkgver=4.0.2
 pkgrel=1
 pkgdesc="Utilities jointly used by devpi-server and devpi-client"
 arch=('any')
@@ -11,17 +11,14 @@ url="https://github.com/devpi/devpi"
 license=('MIT')
 groups=('devpi')
 depends=('python-lazy' 'python-py' 'python-requests')
-makedepends=('python-setuptools' 'python-build' 'python-installer' 'python-wheel')
+makedepends=('python-setuptools' 'python-build' 'python-installer' 'python-wheel' 'python-setuptools-changelog-shortener')
 checkdepends=('python-pytest')
 changelog=CHANGELOG
-source=("$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/d/devpi-common/devpi-common-$pkgver.tar.gz"
-        "2aba62c961653aa82181b201995ecbdcb63ce639.patch")
-sha256sums=('9078989279ad79e9c181c7badc4a738460445187101eb0cbade675934d5e4644'
-            'f722975b8b9b025238d2fb84b6fd89c7a61d785b54ebc9e4f7a973a5ad12b2d5')
+source=("$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/d/devpi-common/devpi-common-$pkgver.tar.gz")
+sha256sums=('2d277701faf05d4a6f6cbdb7e040f93c0a00286dbe87d5c0a2eeaeba2055919c')
 
 prepare() {
   cd "$pkgname-$pkgver"
-  patch -p2 < "${srcdir}/2aba62c961653aa82181b201995ecbdcb63ce639.patch"
 }
 
 build() {