python commons (fixes #45 via #50)

* set alluredir to envtemp in tox ini

* add gitignore

* separate logic and files

Author: sseliverstov

.gitignore

@@ -0,0 +1,7 @@
+.idea
+.tox
+.cache
+.python-version
+
+*.pyc
+*.egg-info

allure-pytest/README.md

@@ -1,11 +1,9 @@
 # Allure pytest plugin
 
-## Installation 
-Beta version is not available on PyPI, but you can install allure directly from github:
+## Installation
+In process. We are hope to get beta on PyPi in april
+
 
-```bash
-$ pip install -e 'git+https://github.com/allure-framework/allure-python2.git#egg=pytest_allure_adaptor&subdirectory=allure-pytest'
-```
 ## Changes
 
 ### Attachments

allure-pytest/setup.py

@@ -1,17 +1,13 @@
-import sys
 from setuptools import setup
 
 PACKAGE = "pytest-allure-adaptor"
 VERSION = "2.0.3"
 
 install_requires = [
     "pytest>=2.7.3",
-    "attrs>=16.0.0",
+    "allure-python-commons==2.0.3"
 ]
 
-if sys.version_info < (3, 4):
-    install_requires.append("enum34")
-
 def main():
     setup(
         name=PACKAGE,

allure-pytest/src/allure/helper.py

@@ -1,12 +1,12 @@
 import pytest
-
 from functools import wraps
+from allure_commons.utils import uuid4
 
-from allure.utils import uuid4
 from allure.utils import step_parameters
-from allure.constants import Severity
-from allure.constants import ALLURE_LABEL_PREFIX, ALLURE_LINK_PREFIX
-from allure.constants import LabelType, LinkType, AttachmentType
+from allure.utils import ALLURE_LABEL_PREFIX, ALLURE_LINK_PREFIX
+
+from allure_commons.constants import Severity
+from allure_commons.constants import LabelType, LinkType, AttachmentType
 
 
 class AllureTestHelper(object):

allure-pytest/src/allure/listener.py

@@ -1,17 +1,18 @@
 import pytest
 
-from allure.logger import AllureLogger
-from allure.utils import now
-from allure.utils import uuid4
+from allure_commons.utils import now
+from allure_commons.utils import uuid4
+from allure_commons.logger import AllureLogger
+from allure_commons.model2 import TestStepResult, TestResult, TestBeforeResult, TestAfterResult
+from allure_commons.model2 import TestResultContainer
+from allure_commons.model2 import StatusDetails
+from allure_commons.model2 import Parameter
+from allure_commons.model2 import Label, Link
+from allure_commons.model2 import Status
+
 from allure.utils import allure_parameters
 from allure.utils import allure_labels, allure_links
 from allure.utils import allure_full_name, allure_package
-from allure.model2 import TestStepResult, TestResult, TestBeforeResult, TestAfterResult
-from allure.model2 import TestResultContainer
-from allure.model2 import StatusDetails
-from allure.model2 import Parameter
-from allure.model2 import Label, Link
-from allure.constants import Status
 
 
 class AllureListener(object):

allure-pytest/src/allure/pytest_plugin.py

@@ -1,13 +1,13 @@
+import pytest
 import argparse
+from six import text_type
 
-import pytest
+from allure_commons.constants import Severity
+from allure_commons.constants import LabelType
 
+from allure.utils import allure_labels
 from allure.helper import AllureTestHelper
 from allure.listener import AllureListener
-from allure.constants import Severity
-from allure.constants import LabelType
-from allure.utils import allure_labels
-from six import text_type
 
 
 def pytest_addoption(parser):

allure-pytest/src/allure/utils.py

@@ -1,20 +1,12 @@
 import os
-import time
-import uuid
-from itertools import product
 import inspect
+from itertools import product
 
-from allure.constants import ALLURE_LABEL_PREFIX
-from allure.constants import ALLURE_LINK_PREFIX
-from allure.constants import ALLURE_UNIQUE_LABELS
-
-
-def uuid4():
-    return str(uuid.uuid4())
+from allure_commons.constants import ALLURE_UNIQUE_LABELS
 
 
-def now():
-    return int(round(1000 * time.time()))
+ALLURE_LABEL_PREFIX = 'allure_label'
+ALLURE_LINK_PREFIX = 'allure_link'
 
 
 def allure_parameters(fixturedef, request):

allure-pytest/tox.ini

@@ -1,17 +1,29 @@
 [tox]
 envlist=
-    py27,py33,py34,py35,static_check
+    py{27,33,34,35}
+    static_check
 
 
 [testenv]
+whitelist_externals = rm
+
 deps=
-    pytest
     pyhamcrest
+    {distshare}/allure-python-commons-*.zip
 
 commands=
     python setup.py develop
-    py.test --doctest-module --alluredir=./report/ ./test/
+    rm -f {envtmpdir}/*.json
+    py.test --doctest-module --alluredir={envtmpdir} ./test/
+
+
+[testenv:demo]
+whitelist_externals = rm
 
+commands=
+    python setup.py develop
+    rm -f {envtmpdir}/*.json
+    - py.test --alluredir={envtmpdir} ./test/
 
 [testenv:static_check]
 deps=

allure-python-commons/setup.py

@@ -0,0 +1,26 @@
+import sys
+from setuptools import setup
+
+PACKAGE = "allure-python-commons"
+VERSION = "2.0.3"
+
+
+install_requires = [
+    "attrs>=16.0.0",
+]
+
+if sys.version_info < (3, 4):
+    install_requires.append("enum34")
+
+
+def main():
+    setup(
+        name=PACKAGE,
+        version=VERSION,
+        packages=['allure_commons'],
+        package_dir={'allure_commons': 'src'},
+        install_requires=install_requires
+    )
+
+if __name__ == '__main__':
+    main()