diff options
| author | Yen Chi Hsuan | 2017-10-27 20:30:26 +0800 |
|---|---|---|
| committer | Yen Chi Hsuan | 2017-10-27 20:30:26 +0800 |
| commit | 8c5823161c8e7362bad541457d7e0e85b0e715f5 (patch) | |
| tree | db7517b263ec87e98c2d65e0c1603ed529160e46 | |
| parent | c6694b54cfbe6aa611933f2421f22b125e1b3d79 (diff) | |
| download | aur-8c5823161c8e7362bad541457d7e0e85b0e715f5.tar.gz | |
the tox patch is landed upstream
Ref: https://github.com/vheon/JediHTTP/pull/42
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | ignore-setup.py-in-tox.patch | 13 |
3 files changed, 4 insertions, 23 deletions
@@ -1,6 +1,6 @@ pkgbase = python-jedihttp-git pkgdesc = Simple http wrapper around jedi (with yan12125's packaging patch) - pkgver = r170.a9ae0be + pkgver = r172.3d3dcf4 pkgrel = 1 url = https://github.com/vheon/JediHTTP arch = any @@ -18,11 +18,9 @@ pkgbase = python-jedihttp-git source = git+https://github.com/vheon/JediHTTP source = setup.py source = allow-missing-vendor.patch - source = ignore-setup.py-in-tox.patch sha256sums = SKIP sha256sums = 1008eeddf02def5a41d3200124f407e96a2f5085da5676080d33334b352130ac sha256sums = dc8be481565b3276b6c30449ea9f31dc4fb3d8d1f760cf10728fe1910bf622b5 - sha256sums = 230e234d199acbc9935f98d9840c00332bcf0f7ccc79a161cc1aa87d77d59040 pkgname = python-jedihttp-git depends = python-bottle @@ -3,7 +3,7 @@ pkgbase=python-jedihttp-git pkgname=(python-jedihttp-git python2-jedihttp-git) -pkgver=r170.a9ae0be +pkgver=r172.3d3dcf4 pkgrel=1 pkgdesc="Simple http wrapper around jedi (with yan12125's packaging patch)" license=('Apache') @@ -16,12 +16,10 @@ checkdepends=( 'python-bottle' 'python-jedi' 'python-waitress') source=('git+https://github.com/vheon/JediHTTP' 'setup.py' - 'allow-missing-vendor.patch' - 'ignore-setup.py-in-tox.patch') + 'allow-missing-vendor.patch') sha256sums=('SKIP' '1008eeddf02def5a41d3200124f407e96a2f5085da5676080d33334b352130ac' - 'dc8be481565b3276b6c30449ea9f31dc4fb3d8d1f760cf10728fe1910bf622b5' - '230e234d199acbc9935f98d9840c00332bcf0f7ccc79a161cc1aa87d77d59040') + 'dc8be481565b3276b6c30449ea9f31dc4fb3d8d1f760cf10728fe1910bf622b5') pkgver() { cd "$srcdir/JediHTTP" @@ -34,8 +32,6 @@ pkgver() { prepare() { cd "${srcdir}/JediHTTP" patch -Np1 -F0 -i ../allow-missing-vendor.patch - # See https://github.com/nose-devs/nose/issues/872#issuecomment-70628127 - patch -Np1 -F0 -i ../ignore-setup.py-in-tox.patch ln -sf ../setup.py } diff --git a/ignore-setup.py-in-tox.patch b/ignore-setup.py-in-tox.patch deleted file mode 100644 index 5e1a1540f638..000000000000 --- a/ignore-setup.py-in-tox.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tox.ini b/tox.ini -index d8c2c29..fcdc474 100644 ---- a/tox.ini -+++ b/tox.ini -@@ -10,7 +10,7 @@ commands = - f.write('import coverage\ncoverage.process_startup()')" - # nose ignores __main__.py by default but we want to cover this file. Only - # ignore files whose name starts with a dot. -- nosetests -v --ignore-files=^\.$ --with-coverage --cover-erase \ -+ nosetests -v --ignore-files=(^\.|^setup\.py$) --with-coverage --cover-erase \ - --cover-package=jedihttp --cover-html --cover-inclusive {posargs} - [testenv:py26] - deps = |