Merge branch 'walles/tox' into python

.gitignore

@@ -1,26 +1,27 @@
 /env/
 /build/
-/dist/
+/dist2/
+/dist3/
+/.tox/
 /.eggs/
 /.vscode/
 /.coverage
 /.mypy_cache/
 /.pytest_cache/
 /.pytest-avoidance/
 
-# See: https://packaging.python.org/distributing/#uploading-your-project-to-pypi
-/.pypirc
-
-/.*-env/
-
 *.egg-info
 *.pyc
 __pycache__/
 
+# See: https://packaging.python.org/distributing/#uploading-your-project-to-pypi
+/.pypirc
+
 # Auto generated by setup.py
 /px/version.py
 
-px.pex
+# tox.sh end result
+/px.pex
 
 # For regenerating the animated-gif ptop screenshot
 /node_modules/

.travis.yml

@@ -17,9 +17,9 @@ before_install:
 install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install python3.5 python3.5-dev --force-yes -y ; fi
 
-  - sudo -H pip2 install coveralls coverage
+  - sudo -H pip2 install coveralls coverage tox
 
-script: ./ci.sh
+script: tox
 
 after_success:
   - coveralls

README.rst

@@ -187,15 +187,15 @@ information; the command will work without it but might miss some information.
 
 Development
 ===========
-Note that before editing any code, you need to run ``ci.sh`` first to create
+Note that before editing any code, you need to run ``tox.sh`` once to create
 the ``px/version.py`` file.
 
 Note that the build infrastructure here is designed to create a ``px.pex`` file
 that works on both Python 2 and Python 3, and on "all" machines with Python
 interpreters (tested on Linux and OS X).
 
 * Clone: ``git clone git@github.com:walles/px.git ; cd px``
-* Build and test: ``./ci.sh``
+* Build and test: ``./tox.sh``
 * Run: ``./px.pex``
 * To add dependencies, edit ``requirements.txt``
 

px/px.py

@@ -152,7 +152,7 @@ def _main(argv):
         return
 
     if arg == '--version':
-        # If this fails, run "ci.sh" once and the "version.py" file will be created for you.
+        # If this fails, run "tox.sh" once and the "version.py" file will be created for you.
         #
         # NOTE: If we "import version" at the top of this file, we will depend on it even if
         # we don't use it. And this will make test avoidance fail to avoid px.py tests every

px/px_commandline.py

@@ -167,6 +167,7 @@ def get_python_command(commandline):
         '-t', '-tt',
         '-u',
         '-v',
+        '-Werror',
         '-x',
         '-3'
     ]

release.sh

@@ -84,7 +84,7 @@ cd "$(dirname "$0")"
 find . -name 'px*.whl' -delete
 
 # Build the release
-./ci.sh
+tox
 
 # Make a relelase virtualenv
 ENVDIR="$(mktemp -d)"

requirements.txt

@@ -1,12 +1,8 @@
 # These are runtime dependencies, we want them weak to improve
 # co-existence with other packages if installed globally using
 # pip.
-#
-# Fox exact versions that we like, check requirements-dev.txt.
-#
-# If making changes here make sure they don't clash!
 
-# We're only using text_type from six, any version works
+# We're six simpletons, any version works
 six
 
 # 2.6.1 is what we started out using, older is probably fine