[arch-commits] Commit in python-setuptools/trunk (PKGBUILD)

[Felix Yan]

    Date: Monday, July 24, 2017 @ 18:58:57
  Author: felixonmars
Revision: 301225

upgpkg: python-setuptools 1:36.2.2-1

Modified:
  python-setuptools/trunk/PKGBUILD

----------+
 PKGBUILD |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-24 17:31:06 UTC (rev 301224)
+++ PKGBUILD	2017-07-24 18:58:57 UTC (rev 301225)
@@ -4,7 +4,7 @@
 
 pkgbase=python-setuptools
 pkgname=('python-setuptools' 'python2-setuptools')
-pkgver=36.2.0
+pkgver=36.2.2
 pkgrel=1
 epoch=1
 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
@@ -14,9 +14,11 @@
 makedepends=('python-packaging' 'python2-packaging' 'python-appdirs' 'python2-appdirs' 'python-pip'
              'python2-pip')
 checkdepends=('python-pytest-runner' 'python2-pytest-runner' 'python-pytest-flake8'
-              'python2-pytest-flake8' 'python2-backports.unittest_mock' 'git')
+              'python2-pytest-flake8' 'python-mock' 'python2-mock' 'python-pytest-fixture-config'
+              'python2-pytest-fixture-config' 'python-pytest-virtualenv' 'python2-pytest-virtualenv'
+              'git')
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/pypa/setuptools/archive/v$pkgver.tar.gz")
-sha512sums=('579e63feb9f5ea33e29f4ae3a2736a2cfd18e83927775a56553dbe34bcfa32f325457204333d4f183759dbcd57e4ad7f8b166fcfbf626db597b18e14bbcd9ea4')
+sha512sums=('868d83224a6ed02278c2f8b19992f231ae2ad664c690479067a67494498a1ccf0426f6d3b13a21d2735114a5135bbe63f5e789fd90d11e5f4f811bc9db866f1b')
 
 prepare() {
   # Don't download and install deps
@@ -29,6 +31,14 @@
       -e '/tag_date = 1/d' \
       -i setuptools-$pkgver/setup.cfg
 
+  # 'Clean' installation is expected to fail since we removed bundled packages
+  sed -i '/^def test_clean_env_install/i import pytest\n\n at pytest.mark.xfail' setuptools-$pkgver/setuptools/tests/test_virtualenv.py
+
+  # Test failed. Importing an unbundled new setuptools in a virtualenv does not work, but this won't
+  # affect normal virtualenv usage (which don't have to import the unbundled setuptools in *current*
+  # dir.
+  sed -i '/^def test_pip_upgrade_from_source/i @pytest.mark.xfail' setuptools-$pkgver/setuptools/tests/test_virtualenv.py
+
   cp -a setuptools-$pkgver{,-py2}
 
   cd "$srcdir"/setuptools-$pkgver