Release v1.17.0

.travis.yml

@@ -10,6 +10,15 @@ jobs:
       addons: skip
       env: TOXENV=flake8
 
+    -
+      name: Formatting
+      python: 3.7
+      dist: xenial
+      sudo: required
+      before_install: skip
+      addons: skip
+      env: TOXENV=black
+
     -
       name: Docs
       python: 3.7

Pipfile

@@ -11,4 +11,4 @@ black = "*"
 pre-commit = "*"
 
 [packages]
-pytest-selenium = {editable = true,path = "."}
+pytest-selenium = {editable = true,extras = ["appium"],path = "."}

docs/development.rst

@@ -60,3 +60,17 @@ Instructions for `edgedriver <https://developer.microsoft.com/en-us/microsoft-ed
 IEDriver
 ~~~~~~~~
 Instructions for `iedriver <https://github.com/SeleniumHQ/selenium/wiki/InternetExplorerDriver>`_.
+
+Releasing a new version
+-----------------------
+
+Follow these steps to release a new version of the project:
+
+1. Update your local master with the upstream master (``git pull --rebase upstream master``)
+2. Create a new branch and update ``news.rst`` with the new version, today's date, and all changes/new features
+3. Commit and push the new branch and then create a new pull request
+4. Wait for tests and reviews and then merge the branch
+5. Once merged, update your local master again (``git pull --rebase upstream master``)
+6. Tag the release with the new release version (``git tag v<new tag>``)
+7. Push the tag (``git push upstream --tags``)
+8. Done. You can monitor the progress on `Travis <https://travis-ci.org/pytest-dev/pytest-selenium/>`_

docs/news.rst

@@ -1,10 +1,18 @@
 Release Notes
 =============
 
+1.17.0 (2019-07-13)
+-------------------
+
+* Added support for `Appium <https://appium.io/>`_
+
+* Deprecate support for `PhantomJS`
+
 1.16.0 (2019-02-12)
 -------------------
 
 * ``pytest-selenium`` now requires pytest 3.6 or later.
+
 * Fixed `issue <https://github.com/pytest-dev/pytest-selenium/issues/216>`_ with TestingBot local tunnel.
 
 1.15.1 (2019-01-07)

pytest_selenium/pytest_selenium.py

@@ -47,7 +47,7 @@
 def _merge(a, b):
     """ merges b and a configurations.
         Based on http://bit.ly/2uFUHgb
-     """
+    """
     for key in b:
         if key in a:
             if isinstance(a[key], dict) and isinstance(b[key], dict):

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py{27,36,37,py,py3}, docs, flake8
+envlist = py{27,36,37,py,py3}, docs, flake8, black
 
 [testenv]
 passenv = PYTEST_ADDOPTS
@@ -28,6 +28,12 @@ basepython = python
 deps = flake8
 commands = flake8 {posargs:.}
 
+[testenv:black]
+skip_install = true
+basepython = python
+deps = black
+commands = black --check {posargs:.}
+
 [flake8]
 max-line-length = 88
 exclude = .eggs,.tox,docs