Merge pull request #15 from applitools/develop

Merge develop to master

Author: eirenik0

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.15.5
+current_version = 4.0.0
 commit = True
 tag = True
 
@@ -8,3 +8,6 @@ tag = True
 [bumpversion:file:eyes_images/applitools/images/__version__.py]
 
 [bumpversion:file:eyes_selenium/applitools/selenium/__version__.py]
+
+[bumpversion:file:eyes_common/applitools/common/__version__.py]
+

.gitignore

@@ -8,7 +8,7 @@ applitools/__pycache__/
 applitools/utils/__pycache__/
 dist/
 test/__pycache__/
-.envrc
+.env
 .pytest_cache/
 geckodriver.log
 .mypy_cache
@@ -17,3 +17,179 @@ geckodriver.log
 *.egg-info
 .directory
 .python-version
+build/*
+### VirtualEnv template
+# Virtualenv
+# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
+.Python
+[Bb]in
+[Ii]nclude
+[Ll]ib
+[Ll]ib64
+[Ll]ocal
+[Ss]cripts
+pyvenv.cfg
+.venv
+pip-selfcheck.json
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+### Python template
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+build/
+develop-eggs/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.envrc
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+/eyes_selenium/node_modules/

.pre-commit-config.yaml

@@ -9,18 +9,18 @@ repos:
             types: []
 
     - repo: https://gitlab.com/pycqa/flake8
-      rev: '3.7.3'
+      rev: 3.7.7
       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/asottile/seed-isort-config
+#      rev: v1.7.0
+#      hooks:
+#          - id: seed-isort-config
 
     - repo: https://github.com/pre-commit/mirrors-isort
-      rev: v4.3.4
+      rev: v4.3.12
       hooks:
           - id: isort
             language_version: python3.7
@@ -32,4 +32,5 @@ repos:
           - id: end-of-file-fixer
           - id: debug-statements
           - id: mixed-line-ending
-            fix: lr
+            args:
+                - --fix=lf

.travis.yml

@@ -1,18 +1,15 @@
 language: python
 addons:
-    apt:
-        sources:
-            - google-chrome
-        packages:
-            - google-chrome-stable
+    chrome: stable
+#    firefox: latest
 matrix:
     include:
         - python: 2.7
           env:
-              - TOX_ENV=core
+              - TOX_ENV=unit
         - python: 3.5
           env:
-              - TOX_ENV=core
+              - TOX_ENV=unit
         - python: 2.7
           env:
               - TOX_ENV=images
@@ -34,19 +31,19 @@ matrix:
         - python: 3.6
           env:
               - TOX_ENV=selenium-appium
+        - python: 3.6
+          env:
+              - TOX_ENV=visualgrid
         - python: 3.6
           env:
               - TOX_ENV=lint
 install:
-    - npm install -g webdriver-manager
-    - webdriver-manager update
     - pip install -U tox
 before_script:
     - 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:
     - export APPLITOOLS_BATCH_ID=`uuidgen -t`
+script:
     - echo $APPLITOOLS_BATCH_ID
     - tox -e $TOX_ENV

README.rst

@@ -39,9 +39,9 @@ For smother development experience install Invoke for task run first
     pip install invoke
     inv install-requirements  # install libs required for development
     inv install-packages  # for installing all packages
-    inv install-packages  -core # install only core package, could be core|selenium]images
-    inv dist -core  # publish eyes_core to test.pypi.org
-    inv dist -core  -prod # publish eyes_core to pypi.org
+    inv install-packages  --core # install only core package, could be core|selenium]images
+    inv dist --core  # publish eyes_core to test.pypi.org
+    inv dist --core  -prod # publish eyes_core to pypi.org
 
 Install pre-commit hook
 ***********************
@@ -63,5 +63,5 @@ For local testing, for example, images sdk
 
 ::
 
-    inv install-packages -core -images
-    inv test-run -images
+    inv install-packages --core --images
+    inv test-run --images