[arch-commits] Commit in python-cheroot/trunk (2 files)

[Thore Bödecker]

    Date: Wednesday, January 2, 2019 @ 09:24:14
  Author: foxxx0
Revision: 420258

upgpkg: python-cheroot 6.5.3-1

update to 6.5.3

Modified:
  python-cheroot/trunk/PKGBUILD
  python-cheroot/trunk/cheroot-fix-setup-python3.patch

---------------------------------+
 PKGBUILD                        |   28 +++++++++++++++++++++------
 cheroot-fix-setup-python3.patch |   39 ++++++++++++++++++--------------------
 2 files changed, 41 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-02 05:34:53 UTC (rev 420257)
+++ PKGBUILD	2019-01-02 09:24:14 UTC (rev 420258)
@@ -5,7 +5,7 @@
 _pkgbase="${pkgbase//python-/}"
 pkgname=('python-cheroot' 'python2-cheroot')
 pkgdesc="Highly-optimized, pure-python HTTP server"
-pkgver=6.5.2
+pkgver=6.5.3
 pkgrel=1
 arch=('any')
 url="https://github.com/cherrypy/cheroot"
@@ -12,27 +12,43 @@
 license=('MIT')
 makedepends=('python-six' 'python2-six' 'python-setuptools-scm'
   'python2-setuptools-scm' 'python2-backports.functools_lru_cache'
-  'python2-backports.unittest_mock' 'tree')
+  'python2-backports.unittest_mock' 'tree' 'python-tox' 'python2-tox')
 source=("https://files.pythonhosted.org/packages/source/${_pkgbase:0:1}/${_pkgbase}/${_pkgbase}-${pkgver}.tar.gz"
         "LICENSE"
         "cheroot-fix-setup-python3.patch")
-sha512sums=('f31026050a45720a0aa08204607b521ae2c0666220886bd14f1f53f81411a66a8ff17e42640efb5189e998f3dfda2fbe41a2c18672dd83c52e9d8ad356cab264'
+sha512sums=('e31202d9d20395c9c1a270bfac5a609350ee60e1e7bcc8b32a45ed3e599294b49c4a56007bc88dc2cf161ab8f5e9aefa6a9f9141493f2c8916a1443c9a0032ab'
             '1106afed483b7258e4ae89c5d9459c3834412b31aac90169725ed62d2ab44f61f6f79e894d4c9e4d8bd99e14530ab778df2187784f0b25eaab86d312fad68944'
-            '35a8f2ba144c36421119326c7c93851318c8b02b9b33c2eb31979e980e38b430e962eff467ea18f060bec6fd4251f5abf489fb7be87e645243c9c356c16a6ec4')
+            '827ae94b2e1eabc06cf3b835434d4bc364189c988af54f5c2dea7b4487b9670496f2c7515497de3f87d4bd1d4bcf3a43d8bedd21081965e20e9d1831a1dd78e1')
 
 prepare() {
   cd "${srcdir}/${_pkgbase}-${pkgver}"
   patch -p1 -N -i "${srcdir}/cheroot-fix-setup-python3.patch"
+
   # git-archive support is not needed since we use PyPI tarballs
-  sed -i '/setuptools_scm_git_archive/d' setup.py
+  sed -i '/setuptools_scm_git_archive/d' setup.cfg
+
+  cp -r "${srcdir}/${_pkgbase}-${pkgver}" "${srcdir}/${_pkgbase}-${pkgver}-py2"
 }
 
 build() {
+  # setuptools wont find version from git tag
+  export SETUPTOOLS_SCM_PRETEND_VERSION="${pkgver}"
+
   cd "${srcdir}/${_pkgbase}-${pkgver}"
   python setup.py build
+
+  cd "${srcdir}/${_pkgbase}-${pkgver}-py2"
   python2 setup.py build
 }
 
+check() {
+  cd "${srcdir}/${_pkgbase}-${pkgver}"
+  tox
+
+  cd "${srcdir}/${_pkgbase}-${pkgver}-py2"
+  tox2
+}
+
 package_python-cheroot() {
   depends=('python-six')
 
@@ -50,7 +66,7 @@
   depends=('python2-six' 'python2-backports.functools_lru_cache'
            'python2-backports.unittest_mock')
 
-  cd "${srcdir}/${_pkgbase}-${pkgver}"
+  cd "${srcdir}/${_pkgbase}-${pkgver}-py2"
   python2 setup.py install --root="$pkgdir/" --optimize=1
 
   # the author has promised to include a LICENSE file in future releases:

Modified: cheroot-fix-setup-python3.patch
===================================================================
--- cheroot-fix-setup-python3.patch	2019-01-02 05:34:53 UTC (rev 420257)
+++ cheroot-fix-setup-python3.patch	2019-01-02 09:24:14 UTC (rev 420258)
@@ -1,21 +1,20 @@
---- a/setup.py	2018-04-10 16:26:17.000000000 +0200
-+++ b/setup.py	2018-04-13 20:41:04.896135916 +0200
-@@ -43,7 +43,7 @@
-     ),
-     python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
-     install_requires=[
--        'backports.functools_lru_cache',
-+        'backports.functools_lru_cache;python_version<"3.4"',
-         'six>=1.11.0',
-         'more_itertools>=2.6',
-     ],
-@@ -78,7 +78,7 @@
-             'codecov',
+--- a/setup.cfg	2018-12-27 20:35:11.000000000 +0100
++++ b/setup.cfg	2019-01-02 10:19:34.658391238 +0100
+@@ -58,7 +58,7 @@ setup_requires =
+ 	setuptools_scm>=1.15.0
+ 	setuptools_scm_git_archive>=1.0
+ install_requires = 
+-	backports.functools_lru_cache
++	backports.functools_lru_cache; python_version<"3.4.0"
+ 	six>=1.11.0
+ 	more_itertools>=2.6
  
-             'pytest-cov',
--            'backports.unittest_mock',
-+            'backports.unittest_mock;python_version<"3.4"',
-
-            # TLS
-            'trustme>=0.4.0',
-
+@@ -83,7 +83,7 @@ testing =
+ 	codecov
+ 	
+ 	pytest-cov
+-	backports.unittest_mock
++	backports.unittest_mock; python_version<"3.4.0"
+ 	
+ 	trustme>=0.4.0
+ 	pyopenssl