Review response

.circleci/config.yml

@@ -15,6 +15,20 @@
 #
 version: 2
 
+aliases:
+  - &preparation_run_group
+    run:
+      name: Prepare the virtualenv.
+      command:
+        - \"$PYTHON\" --version
+        - \"$PYTHON\" -m pip --version
+        - \"$PYTHON\" -m pip install -q --user --ignore-installed --upgrade virtualenv
+        - \"$PYTHON\" -m virtualenv -p \"$PYTHON\" venv
+        - venv/bin/pip install -U pip
+        - venv/bin/python -m pip install tox
+        - venv/bin/python -m pip freeze
+        - venv/bin/python --version
+
 jobs:
   osx-wheels:
     working_directory: ~/osx-wheels
@@ -26,10 +40,7 @@ jobs:
       # Get the source.
       - checkout
 
-      - run:
-          name: Prepare the environment.
-          command: |
-            bash .circleci/prepare.sh
+      - <<: *preparation_run_group
 
       - run:
           name: Build the OSX wheels.
@@ -50,10 +61,7 @@ jobs:
       - checkout
       - setup_remote_docker
 
-      - run:
-          name: Prepare the environment.
-          command: |
-            bash .circleci/prepare.sh
+      - <<: *preparation_run_group
 
       - run:
           name: Build the Linux wheels.
@@ -73,10 +81,7 @@ jobs:
       # Get the source.
       - checkout
 
-      - run:
-          name: Prepare the environment.
-          command: |
-            bash .circleci/prepare.sh
+      - <<: *preparation_run_group
 
       # Run each checker in a separate step, but always run all steps to get
       # a the results from each step.
@@ -104,10 +109,7 @@ jobs:
       # Get the source.
       - checkout
 
-      - run:
-          name: Prepare the environment.
-          command: |
-            bash .circleci/prepare.sh
+      - <<: *preparation_run_group
 
       - run:
           name: Check the narrative documentation.

.circleci/prepare.sh

@@ -1,8 +0,0 @@
-$PYTHON --version
-$PYTHON -m pip --version
-$PYTHON -m pip install -q --user --ignore-installed --upgrade virtualenv
-$PYTHON -m virtualenv -p $PYTHON venv
-venv/bin/pip install -U pip
-venv/bin/python -m pip install tox
-venv/bin/python -m pip freeze
-venv/bin/python --version

.travis.yml

@@ -5,7 +5,7 @@
 # way to share the same process between Travis-CI and Buildbot.
 #
 language: python
-sudo: false
+dist: xenial
 
 
 # Only run tests on push on a few branches.
@@ -23,8 +23,7 @@ env:
 
 matrix:
   include:
-    - sudo: true
-      services:
+    - services:
         - docker
       env: PIP=pip TOXENV=wheels
     - python: 2.7
@@ -39,15 +38,12 @@ matrix:
       env: TOXENV=py36-alldeps-withcov-posix,codecov-publish
     - python: 3.7
       env: TOXENV=py37-alldeps-withcov-posix,codecov-publish
-      dist: xenial
-      sudo: true
     - python: 3.5
       env: TOXENV=lint
     # We need a builder without IPv6. This is going to be slower than all the
     # others, but that's ok.
     - python: 3.6
       env: TOXENV=py36-alldeps-withcov-posix,codecov-publish DISABLE_IPV6=yes
-      sudo: true
 
 addons:
   apt:

admin/dump_all_version_info.py

@@ -0,0 +1,7 @@
+import sys
+
+print(sys.prefix)
+print(sys.exec_prefix)
+print(sys.executable)
+print(sys.version)
+print(sys.platform)

tox.ini

@@ -70,29 +70,27 @@ deps =
 passenv = *
 
 setenv =
-   ; Enable sub-processes coverage reports and store coverage reports in a
-   ; known location.
-   COVERAGE_PROCESS_START = {toxinidir}/.coveragerc
-   COVERAGE_FILE = {toxinidir}/.coverage
-   # Help tests know where the base directory is.
-   TOX_INI_DIR = {toxinidir}
+    ; Enable sub-processes coverage reports and store coverage reports in a
+    ; known location.
+    COVERAGE_PROCESS_START = {toxinidir}/.coveragerc
+    COVERAGE_FILE = {toxinidir}/.coverage
+    # Help tests know where the base directory is.
+    TOX_INI_DIR = {toxinidir}
 
-   ; Skip twistedchecker warnings that are not yet required in the required run
-   lint: TWISTEDCHECKER_SKIP_WARNINGS = W9208,C0302,C0103,C9302
+    ; Skip twistedchecker warnings that are not yet required in the required run
+    lint: TWISTEDCHECKER_SKIP_WARNINGS = W9208,C0302,C0103,C9302
 
-   wheels: CIBW_BUILD=cp27-* cp34-* cp35-* cp36-* cp37-*
+    ; Configure cibuildwheel to build wheels for:
+    ;       CPython 2.7, 3.4, 3.5, 3.6, and 3.7.
+    ; This includes variants of bit depth, unicode width, etc.
+    wheels: CIBW_BUILD=cp27-* cp34-* cp35-* cp36-* cp37-*
 
 commands =
     ;
     ; Display information about Python interpreter
     ; which will be used in subsequent steps
     ;
-    python -c "import sys; print(sys.prefix)"
-    python -c "import sys; print(sys.exec_prefix)"
-    python -c "import sys; print(sys.executable)"
-    python -c "import sys; print(sys.version)"
-    python -c "import sys; print(sys.platform)"
-    python --version
+    python {toxinidir}/admin/dump_all_version_info.py
 
     # We need to define nodeps *somewhere* so tox recognises it
     nodeps: python -c "print('No dependencies installed...')"