merge in changes from dev

.gitignore

@@ -5,7 +5,6 @@ venv/
 *.egg-info/
 *.egg
 dist/
-.tox/
 .DS_Store
 
 # cygwin

.travis.yml

@@ -1,12 +1,10 @@
 language: python
+
 python: 2.7
-env:
-  global:
-    - TOX_ENV=py27
-    - TOX_ENV=flake8
+
 install:
-    - pip install tox
+    - pip install flake8
     - pip install -r requirements.txt
 
 script:
-    - tox -e $TOX_ENV
+    - flake8 .

README.rst

@@ -5,7 +5,7 @@ ff-tool
 |Build Status|
 
 .. |Build Status| image:: https://travis-ci.org/rpappalax/ff-tool.svg?branch=dev
-   :target: https://travis-ci.org/rpappalax/ff-tool
+   :target: https://travis-ci.org/rpappalax/ff-tool?branch=dev
 
 .. contents::
 

fftool/configs/prefs.ini

@@ -5,4 +5,4 @@ browser.uitour.enabled = false
 devtools.chrome.enabled = true
 devtools.debugger.remote-enabled = true
 general.warnOnAboutConfig = false
-startup.homepage_welcome_url = about:blank
+startup.homepage_welcome_url = about:config

fftool/firefox_env_handler.py

@@ -64,7 +64,7 @@ class IniHandler(FirefoxEnvHandler):
 
     def load_os_config(self, config_path):
         """Loads INI file based on current OS:
-           "darwin.ini", "cygwin.ini", "linux-gnu.ini", etc.
+           "darwin.ini", "cygwin.ini", "linux(-gnu).ini", etc.
         """
         os_config = os.path.join(config_path, IniHandler.get_os() + '.ini')
         self.load_config(os_config)

requirements.txt

@@ -1,5 +1,3 @@
 outlawg==0.1.0
 mozdownload==1.20.2
 mozprofile==0.28
-tox
-flake8==2.5.4

setup.cfg

@@ -0,0 +1,2 @@
+[flake8]
+exclude = venv/*, dist/*, build/*

tox.ini

@@ -1,12 +0,0 @@
-[tox]
-envlist = py27, flake8
-
-[flake8]
-exclude = venv/*
-
-[testenv]
-deps = -rrequirements.txt
-
-[testenv:flake8]
-exclude = venv/*
-commands = flake8 .