summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO21
-rw-r--r--PKGBUILD19
-rw-r--r--fix001.diff33
3 files changed, 17 insertions, 56 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 252431d717e9..7547c43ce1db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,13 @@
pkgbase = python-pytest-allure
- pkgdesc = Plugin for py.test to generate allure xml reports
- pkgver = 1.7.6
+ pkgdesc = Allure Pytest Plugin
+ pkgver = 2.5.3
pkgrel = 1
- url = https://pypi.python.org/pypi/pytest-allure-adaptor
- arch = i686
- arch = x86_64
- depends = python-pytest
- depends = python-lxml
- depends = python-six
- depends = python-namedlist
- source = https://pypi.python.org/packages/79/34/7fee1e62f5d99b58f1a6b4b23f0d99caa3e1294fdfa4672c6e6ec9e25b15/pytest-allure-adaptor-1.7.6.tar.gz
- source = fix001.diff
- md5sums = 67d5cdb1c2ea53c227c876dec2f287ab
- md5sums = 3043cd64176a904888d950871984deb9
+ url = https://github.com/allure-framework/allure-python/tree/master/allure-pytest
+ arch = any
+ depends = python-pytest>=3.3.0
+ depends = python-allure-commons=2.5.3
+ source = git+https://github.com/allure-framework/allure-python.git#tag=2.5.3
+ md5sums = SKIP
pkgname = python-pytest-allure
diff --git a/PKGBUILD b/PKGBUILD
index 87a57dfbc184..6636c6caa45c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,17 @@
# Contributor: Pavel Merzlyakov <pavel.merzlyakov@gmail.com>
pkgname=python-pytest-allure
-_pkgname=pytest-allure-adaptor
-pkgver=1.7.6
+_pkgname=allure-pytest
+pkgver=2.5.3
pkgrel=1
-pkgdesc='Plugin for py.test to generate allure xml reports'
-arch=('i686' 'x86_64')
-url='https://pypi.python.org/pypi/pytest-allure-adaptor'
-depends=('python-pytest' 'python-lxml' 'python-six' 'python-namedlist')
-source=("https://pypi.python.org/packages/79/34/7fee1e62f5d99b58f1a6b4b23f0d99caa3e1294fdfa4672c6e6ec9e25b15/${_pkgname}-$pkgver.tar.gz" "fix001.diff")
-md5sums=('67d5cdb1c2ea53c227c876dec2f287ab' '3043cd64176a904888d950871984deb9')
+pkgdesc='Allure Pytest Plugin'
+arch=('any')
+url="https://github.com/allure-framework/allure-python/tree/master/$_pkgname"
+depends=('python-pytest>=3.3.0' "python-allure-commons=$pkgver")
+source=("git+https://github.com/allure-framework/allure-python.git#tag=$pkgver")
+md5sums=('SKIP')
package() {
- cd "$srcdir/$_pkgname-$pkgver"
- patch -p0 -i ../fix001.diff
+ cd "$srcdir/allure-python/$_pkgname"
python setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/fix001.diff b/fix001.diff
deleted file mode 100644
index b6c5432e42fe..000000000000
--- a/fix001.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- ./allure/pytest_plugin.py 2016-11-21 16:21:21.000000000 +0200
-+++ ./allure/pytest_plugin.py 2017-02-04 20:00:11.209182287 +0200
-@@ -4,7 +4,7 @@
- import argparse
-
- from collections import namedtuple
--from _pytest.junitxml import mangle_testnames
-+#from _pytest.junitxml import mangle_testnames
- from six import text_type
-
- from allure.common import AllureImpl, StepContext
-@@ -14,6 +14,10 @@
- all_of, get_exception_message, now
- from allure.structure import TestCase, TestStep, Attach, TestSuite, Failure, TestLabel
-
-+def mangle_testnames(names):
-+ names = [x.replace(".py", "") for x in names if x != '()']
-+ names[0] = names[0].replace("/", '.')
-+ return names
-
- def pytest_addoption(parser):
- parser.getgroup("reporting").addoption('--alluredir',
---- ./setup.py 2016-11-21 16:21:21.000000000 +0200
-+++ ./setup.py 2017-02-05 00:28:16.000000000 +0200
-@@ -7,7 +7,7 @@
-
- install_requires = [
- "lxml>=3.2.0",
-- "pytest>=2.7.3,<=2.9.0",
-+ "pytest>=2.7.3",
- "namedlist",
- "six>=1.9.0"
- ]