Merge pull request #5 from applitools/fix-namespaec-issue

Fix namespace issue

Author: eirenik0

.travis.yml

@@ -1,14 +1,25 @@
 language: python
-python:
- - 2.7
- - 3.5
- - 3.6
-sudo: false
-env:
-  - DISPLAY=:0.0
+matrix:
+    include:
+        - python: 2.7
+          env:
+              - TOX_ENV=images
+        - python: 3.5
+          env:
+              - TOX_ENV=images
+        - python: 2.7
+          env:
+              - TOX_ENV=integration
+        - python: 3.6
+          env:
+              - TOX_ENV=integration
+        - python: 3.6
+          env:
+              - TOX_ENV=lint
 install:
-  - pip install -U tox-travis
-script:
+  - pip install -U tox
+before_script:
   - export APPLITOOLS_BATCH_ID=`uuidgen -t`
   - echo $APPLITOOLS_BATCH_ID
-  - tox
+script:
+  - tox -e $TOX_ENV

eyes_core/setup.py

@@ -40,7 +40,7 @@ def get_version(package_name):
 setup(
     name='eyes_core',
     version=get_version('core'),
-    packages=find_packages(include=['applitools.*'], exclude=('tests',)),
+    packages=find_packages(),
     url='http://www.applitools.com',
     license='Apache License, Version 2.0',
     author='Applitools Team',

eyes_images/setup.py

@@ -37,7 +37,7 @@ def get_version(package_name):
 setup(
     name='eyes_images',
     version=get_version('images'),
-    packages=find_packages(include=['applitools.*'], exclude=('tests',)),
+    packages=find_packages(),
     url='http://www.applitools.com',
     license='Apache License, Version 2.0',
     author='Applitools Team',
@@ -60,7 +60,7 @@ def get_version(package_name):
     install_requires=install_requires,
     package_data={
         '':     ['README.rst', 'LICENSE'],
-        'core': ['py.typed'],
+        'images': ['py.typed'],
     },
     project_urls={
         'Bug Reports': 'https://github.com/applitools/eyes.sdk.python/issues',

eyes_selenium/setup.py

@@ -39,7 +39,7 @@ def get_version(package_name):
 setup(
     name='eyes_selenium',
     version=get_version('selenium'),
-    packages=find_packages(include=['applitools.*'], exclude=('tests',)),
+    packages=find_packages(),
     url='http://www.applitools.com',
     license='Apache License, Version 2.0',
     author='Applitools Team',

setup.cfg

@@ -1,8 +1,3 @@
-[bumpversion]
-current_version = 3.14.2
-commit = True
-tag = True
-
 [tool:pytest]
 addopts = --verbose
 python_files = tests/*.py

tasks.py

@@ -35,24 +35,36 @@ def dist(c, core=None,
 
 
 @task
-def install_requirements(c):
+def install_requirements(c, dev=None, testing=None, lint=None):
     dev_requires = [
         'ipython',
         'ipdb',
         'bumpversion',
-        'flake8',
-        'flake8-import-order',
-        'flake8-bugbear',
-        'mypy',
         'wheel',
         'twine',
+        'pathlib',
     ]
     testing_requires = [
         'pytest==3.8.2',
         'pytest-cov',
         'pytest-xdist',
+        'virtualenv',
+        'pytest-virtualenv',
+    ]
+    lint_requires = [
+        'flake8',
+        'flake8-import-order',
+        'flake8-bugbear',
+        'mypy',
     ]
-    requires = dev_requires + testing_requires
+    if testing:
+        requires = testing_requires
+    elif dev:
+        requires = dev_requires
+    elif lint:
+        requires = lint_requires
+    else:
+        requires = dev_requires + testing_requires + lint_requires
     c.run("pip install {}".format(' '.join(requires)), echo=True)
 
 
@@ -109,7 +121,12 @@ def mypy_check(c, core=None,
 
 
 @task
-def test_run(c, core=None,
-             selenium=None, images=None):
+def test_run_packs(c, core=None,
+                   selenium=None, images=None):
     for pack in _packages_resolver(core, selenium, images):
-        c.run('pytest tests/{}'.format(pack), echo=True)
+        c.run('pytest tests/functional/{}'.format(pack), echo=True)
+
+
+@task
+def test_run_integration(c):
+    c.run('pytest tests/test_integration.py')