Switch to Pipenv and fix a few isort issues (#151)

mozilla · Feb 23, 2018 · f3bf244 · f3bf244
1 parent d8fc35b
commit f3bf244
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@ var/
 .installed.cfg
 *.egg
 .DS_Store
+Pipfile.lock
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -45,6 +46,7 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *,cover
+.pytest_cache
 
 # Translations
 *.mo

diff --git a/Pipfile b/Pipfile
@@ -0,0 +1,21 @@
+[[source]]
+
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+
+[packages]
+
+selenium = "==3.9.0"
+
+
+[dev-packages]
+
+coveralls = "==1.2.0"
+flake8 = "==3.5.0"
+flake8-docstrings = "==1.3.0"
+flake8-isort = "==2.3"
+pytest = "==3.4.0"
+pytest-cov = "==2.5.1"
+pytest-selenium = "==1.11.4"
diff --git a/pyup.yml b/pyup.yml
@@ -0,0 +1,2 @@
+requirements:
+- Pipfile
diff --git a/requirements/coverage.txt b/requirements/coverage.txt
diff --git a/requirements/flake8.txt b/requirements/flake8.txt
diff --git a/requirements/tests.txt b/requirements/tests.txt
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -4,6 +4,7 @@
 """Configuration files for pytest."""
 
 import pytest
+
 from foxpuppet import FoxPuppet
 
 

diff --git a/tests/test_browser_model.py b/tests/test_browser_model.py
@@ -3,9 +3,8 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 """Tests for the browser model API."""
 
-from selenium.webdriver.support.wait import WebDriverWait
-
 import pytest
+from selenium.webdriver.support.wait import WebDriverWait
 
 
 def test_initial_browser_window(foxpuppet):

diff --git a/tests/test_notifications.py b/tests/test_notifications.py
@@ -3,9 +3,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 """Tests for the notifications API."""
 
+import pytest
 from selenium.common.exceptions import TimeoutException
 
-import pytest
 from foxpuppet.windows.browser.notifications import BaseNotification
 from foxpuppet.windows.browser.notifications.addons import (  # noqa: I001
     AddOnInstallBlocked,  # noqa: I001

diff --git a/tox.ini b/tox.ini
@@ -4,9 +4,10 @@ envlist = py{27,36}, flake8, docs
 [testenv]
 recreate = True
 passenv = DISPLAY MOZ_HEADLESS TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
-deps = -rrequirements/coverage.txt
+deps = pipenv
 commands =
-    pytest --driver=Firefox --cov --html=results/{envname}.html {posargs}
+    pipenv install --dev --skip-lock
+    pipenv run pytest --driver Firefox --cov --html results/{envname}.html {posargs}
     coveralls
 
 [testenv:docs]
@@ -15,8 +16,9 @@ deps = sphinx
 commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
 
 [testenv:flake8]
-deps = -rrequirements/flake8.txt
-commands = flake8 {posargs:.}
+commands =
+    pipenv install --dev --skip-lock
+    pipenv run flake8 {posargs:.}
 
 [flake8]
 exclude = .eggs,.tox,docs