Merge pull request #8 from applitools/develop

Merge develop to master

Author: danielputerman

.bumpversion.cfg

@@ -8,4 +8,3 @@ tag = True
 [bumpversion:file:eyes_images/applitools/images/__version__.py]
 
 [bumpversion:file:eyes_selenium/applitools/eyes_selenium/__version__.py]
-

.editorconfig

@@ -14,10 +14,7 @@ charset = utf-8
 [*.{py,rst,ini}]
 indent_style = space
 indent_size = 4
-max_line_length = 119
-
-[*.py]
-max_line_length = 119
+max_line_length = 88
 
 [*.rst]
 max_line_length = off

.pre-commit-config.yaml

@@ -0,0 +1,35 @@
+repos:
+    - repo: https://github.com/ambv/black
+      rev: 18.9b0
+      hooks:
+          - id: black
+            language_version: python3.7
+              # override until resolved: https://github.com/ambv/black/issues/402
+            files: \.pyi?$
+            types: []
+
+    - repo: https://gitlab.com/pycqa/flake8
+      rev: '3.7.3'
+      hooks:
+          - id: flake8
+            language_version: python3.7
+
+    - repo: https://github.com/asottile/seed-isort-config
+      rev: v1.5.0
+      hooks:
+          - id: seed-isort-config
+
+    - repo: https://github.com/pre-commit/mirrors-isort
+      rev: v4.3.4
+      hooks:
+          - id: isort
+            language_version: python3.7
+
+    - repo: https://github.com/pre-commit/pre-commit-hooks
+      rev: v2.1.0
+      hooks:
+          - id: trailing-whitespace
+          - id: end-of-file-fixer
+          - id: debug-statements
+          - id: mixed-line-ending
+            fix: lr

.travis.yml

@@ -1,6 +1,18 @@
 language: python
+addons:
+    apt:
+        sources:
+            - google-chrome
+        packages:
+            - google-chrome-stable
 matrix:
     include:
+        - python: 2.7
+          env:
+              - TOX_ENV=core
+        - python: 3.5
+          env:
+              - TOX_ENV=core
         - python: 2.7
           env:
               - TOX_ENV=images
@@ -13,13 +25,28 @@ matrix:
         - python: 3.6
           env:
               - TOX_ENV=integration
+        - python: 2.7
+          env:
+              - TOX_ENV=selenium
+        - python: 3.6
+          env:
+              - TOX_ENV=selenium
+        - python: 3.6
+          env:
+              - TOX_ENV=selenium-appium
         - python: 3.6
           env:
               - TOX_ENV=lint
 install:
-  - pip install -U tox
+    - npm install -g webdriver-manager
+    - webdriver-manager update
+    - pip install -U tox
 before_script:
-  - export APPLITOOLS_BATCH_ID=`uuidgen -t`
-  - echo $APPLITOOLS_BATCH_ID
+    - export DISPLAY=:99.0
+    - sh -e /etc/init.d/xvfb start
+    - nohup webdriver-manager start --logging=ERROR &
+    - sleep 10 # give webdriver some time to start
 script:
-  - tox -e $TOX_ENV
+    - export APPLITOOLS_BATCH_ID=`uuidgen -t`
+    - echo $APPLITOOLS_BATCH_ID
+    - tox -e $TOX_ENV

README.rst

@@ -1,4 +1,4 @@
-|Build Status|
+|Build Status| |Black Formatter|
 
 Eyes.Sdk.Python
 ===============
@@ -23,6 +23,8 @@ Please check the applitools website for usage instructions:
 -  Python Image SDK example:
    https://applitools.com/tutorials/screenshots-python.html
 
+.. |Black Formatter| image:: https://img.shields.io/badge/code%20style-black-000000.svg
+    :target: https://github.com/ambv/black
 .. |Build Status| image:: https://travis-ci.org/applitools/eyes.sdk.python.svg?branch=master
    :target: https://travis-ci.org/applitools/eyes.sdk.python
 
@@ -32,7 +34,7 @@ Development
 
 For smother development experience install Invoke for task run first
 
-:: 
+::
 
     pip install invoke
     inv install-requirements  # install libs required for development
@@ -41,13 +43,25 @@ For smother development experience install Invoke for task run first
     inv dist -core  # publish eyes_core to test.pypi.org
     inv dist -core  -prod # publish eyes_core to pypi.org
 
+Install pre-commit hook
+***********************
+We're using `pre-commit <https://github.com/pre-commit/pre-commit>`_ for check and format code before commit. For
+manage hooks you could use invoke:
+
+::
+
+    # installing of git hooks
+    inv install-precommit-hook
+    # removing of git hooks
+    inv remove-precommit-hook
+
 
 Testing
 -------
 
 For local testing, for example, images sdk
 
 ::
-    
+
     inv install-packages -core -images
     inv test-run -images

eyes_core/applitools/__init__.py

@@ -1 +1 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)  # type: ignore
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)  # type: ignore

eyes_core/applitools/core/__init__.py

@@ -7,21 +7,23 @@
 from .scaling import *  # noqa
 from .eyes_base import *  # noqa
 from .geometry import *  # noqa
-from .agent_connector import AgentConnector  # noqa
+from .server_connector import ServerConnector  # noqa
 from .positioning import *  # noqa
 from .match import *  # noqa
 from .metadata import *  # noqa
 
-__all__ = (triggers.__all__ +  # noqa
-           test_results.__all__ +  # noqa
-           match_window_task.__all__ +  # noqa
-           logger.__all__ +  # noqa
-           errors.__all__ +  # noqa
-           scaling.__all__ +  # noqa
-           capture.__all__ +  # noqa
-           eyes_base.__all__ +  # noqa
-           geometry.__all__ +  # noqa
-           positioning.__all__ +  # noqa
-           match.__all__ +  # noqa
-           metadata.__all__ +  # noqa
-           ('logger', 'AgentConnector'))
+__all__ = (
+    triggers.__all__  # noqa
+    + test_results.__all__  # noqa
+    + match_window_task.__all__  # noqa
+    + logger.__all__  # noqa
+    + errors.__all__  # noqa
+    + scaling.__all__  # noqa
+    + capture.__all__  # noqa
+    + eyes_base.__all__  # noqa
+    + geometry.__all__  # noqa
+    + positioning.__all__  # noqa
+    + match.__all__  # noqa
+    + metadata.__all__  # noqa
+    + ("logger", "ServerConnector")  # noqa
+)

eyes_core/applitools/core/__version__.py

@@ -1 +1 @@
-__version__ = '3.15.4'
+__version__ = "3.15.4"