Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ pipeline {
stages {
stage("Build") {
steps {
sh 'tox --version'
sh 'tox --workdir=/tmp -c allure-python-commons-test/tox.ini'
sh 'tox --workdir=/tmp -c allure-python-commons/tox.ini'
sh 'tox --workdir=/tmp -c allure-python-testing/tox.ini'
sh 'tox --workdir=/tmp -c allure-pytest/tox.ini'
sh 'tox --workdir=/tmp -c allure-behave/tox.ini'
}
Expand Down
2 changes: 1 addition & 1 deletion allure-behave/features/steps/behave_steps.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os
from tempfile import mkdtemp
from allure_testing.report import AllureReport
from allure_commons_test.report import AllureReport
from behave.parser import Parser
from behave.runner import ModelRunner
from behave.configuration import Configuration
Expand Down
18 changes: 9 additions & 9 deletions allure-behave/features/steps/report_steps.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
from functools import partial
from hamcrest import assert_that
from allure_testing.report import has_test_case
from allure_testing.result import with_status
from allure_testing.result import has_step
from allure_testing.result import has_attachment
from allure_testing.result import has_parameter
from allure_testing.container import has_container
from allure_testing.container import has_before
from allure_testing.label import has_severity
from allure_testing.label import has_tag
from allure_commons_test.report import has_test_case
from allure_commons_test.result import with_status
from allure_commons_test.result import has_step
from allure_commons_test.result import has_attachment
from allure_commons_test.result import has_parameter
from allure_commons_test.container import has_container
from allure_commons_test.container import has_before
from allure_commons_test.label import has_severity
from allure_commons_test.label import has_tag


def match(matcher, *args):
Expand Down
4 changes: 2 additions & 2 deletions allure-behave/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ setenv =
whitelist_externals = rm

deps=
{distshare}/allure-python-commons-*.zip
{distshare}/allure-python-testing-*.zip
{distshare}/allure-python-commons-2*.zip
{distshare}/allure-python-commons-test-2*.zip

commands=
python setup.py develop
Expand Down
4 changes: 2 additions & 2 deletions allure-pytest/test/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import subprocess
import shlex
from inspect import getmembers, isfunction
from allure_testing.report import AllureReport
from allure_commons_test.report import AllureReport


@pytest.fixture(scope='function', autouse=True)
Expand All @@ -12,7 +12,7 @@ def inject_matchers(doctest_namespace):
for name, function in getmembers(hamcrest, isfunction):
doctest_namespace[name] = function

from allure_testing import container, label, report, result
from allure_commons_test import container, label, report, result
for module in [container, label, report, result]:
for name, function in getmembers(module, isfunction):
doctest_namespace[name] = function
Expand Down
4 changes: 2 additions & 2 deletions allure-pytest/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ whitelist_externals = rm

deps=
pyhamcrest
{distshare}/allure-python-commons-*.zip
{distshare}/allure-python-testing-*.zip
{distshare}/allure-python-commons-2*.zip
{distshare}/allure-python-commons-test-2*.zip

commands=
python setup.py develop
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from setuptools import setup

PACKAGE = "allure-python-testing"
PACKAGE = "allure-python-commons-test"
VERSION = "2.0.0b2"

install_requires = [
Expand All @@ -18,8 +18,8 @@ def main():
author="QAMetaSoftware, Stanislav Seliverstov",
author_email="sseliverstov@qameta.io",
license="Apache-2.0",
packages=["allure_testing"],
package_dir={"allure_testing": "src"},
packages=["allure_commons_test"],
package_dir={"allure_commons_test": "src"},
install_requires=install_requires
)

Expand Down
File renamed without changes.