Skip to content

Commit da5d4db

Browse files
authored
rename allure-commons-testing (fixes #74 via #84)
* rename allure-commons-testing * fix jenkins file
1 parent 2079164 commit da5d4db

File tree

13 files changed

+20
-21
lines changed

13 files changed

+20
-21
lines changed

Jenkinsfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ pipeline {
66
stages {
77
stage("Build") {
88
steps {
9-
sh 'tox --version'
9+
sh 'tox --workdir=/tmp -c allure-python-commons-test/tox.ini'
1010
sh 'tox --workdir=/tmp -c allure-python-commons/tox.ini'
11-
sh 'tox --workdir=/tmp -c allure-python-testing/tox.ini'
1211
sh 'tox --workdir=/tmp -c allure-pytest/tox.ini'
1312
sh 'tox --workdir=/tmp -c allure-behave/tox.ini'
1413
}

allure-behave/features/steps/behave_steps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os
22
from tempfile import mkdtemp
3-
from allure_testing.report import AllureReport
3+
from allure_commons_test.report import AllureReport
44
from behave.parser import Parser
55
from behave.runner import ModelRunner
66
from behave.configuration import Configuration

allure-behave/features/steps/report_steps.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
from functools import partial
22
from hamcrest import assert_that
3-
from allure_testing.report import has_test_case
4-
from allure_testing.result import with_status
5-
from allure_testing.result import has_step
6-
from allure_testing.result import has_attachment
7-
from allure_testing.result import has_parameter
8-
from allure_testing.container import has_container
9-
from allure_testing.container import has_before
10-
from allure_testing.label import has_severity
11-
from allure_testing.label import has_tag
3+
from allure_commons_test.report import has_test_case
4+
from allure_commons_test.result import with_status
5+
from allure_commons_test.result import has_step
6+
from allure_commons_test.result import has_attachment
7+
from allure_commons_test.result import has_parameter
8+
from allure_commons_test.container import has_container
9+
from allure_commons_test.container import has_before
10+
from allure_commons_test.label import has_severity
11+
from allure_commons_test.label import has_tag
1212

1313

1414
def match(matcher, *args):

allure-behave/tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ setenv =
1515
whitelist_externals = rm
1616

1717
deps=
18-
{distshare}/allure-python-commons-*.zip
19-
{distshare}/allure-python-testing-*.zip
18+
{distshare}/allure-python-commons-2*.zip
19+
{distshare}/allure-python-commons-test-2*.zip
2020

2121
commands=
2222
python setup.py develop

allure-pytest/test/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import subprocess
44
import shlex
55
from inspect import getmembers, isfunction
6-
from allure_testing.report import AllureReport
6+
from allure_commons_test.report import AllureReport
77

88

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

15-
from allure_testing import container, label, report, result
15+
from allure_commons_test import container, label, report, result
1616
for module in [container, label, report, result]:
1717
for name, function in getmembers(module, isfunction):
1818
doctest_namespace[name] = function

allure-pytest/tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ whitelist_externals = rm
1212

1313
deps=
1414
pyhamcrest
15-
{distshare}/allure-python-commons-*.zip
16-
{distshare}/allure-python-testing-*.zip
15+
{distshare}/allure-python-commons-2*.zip
16+
{distshare}/allure-python-commons-test-2*.zip
1717

1818
commands=
1919
python setup.py develop

allure-python-testing/setup.py renamed to allure-python-commons-test/setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from setuptools import setup
22

3-
PACKAGE = "allure-python-testing"
3+
PACKAGE = "allure-python-commons-test"
44
VERSION = "2.0.0b2"
55

66
install_requires = [
@@ -18,8 +18,8 @@ def main():
1818
author="QAMetaSoftware, Stanislav Seliverstov",
1919
author_email="[email protected]",
2020
license="Apache-2.0",
21-
packages=["allure_testing"],
22-
package_dir={"allure_testing": "src"},
21+
packages=["allure_commons_test"],
22+
package_dir={"allure_commons_test": "src"},
2323
install_requires=install_requires
2424
)
2525

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)