Merge cd2c306 into f22541d

.travis.yml

@@ -1,52 +1,73 @@
 language: python
 
-env:
-  # earliest and latest supported; last release of every year; 14.0 for txi2p.plugins
-  - TOX_ENV=py27-tw102
-  - TOX_ENV=py27-tw111
-  - TOX_ENV=py27-tw120
-  - TOX_ENV=py27-tw123
-  - TOX_ENV=py27-tw132
-  - TOX_ENV=py27-tw140
-  - TOX_ENV=py27-tw152
-  - TOX_ENV=py27-tw162
-  - TOX_ENV=py27-tw163
-  - TOX_ENV=py27-tw164
-  - TOX_ENV=py27-twcurrent
-  - TOX_ENV=py27-twtrunk
-  - TOX_ENV=pypy-tw102
-  - TOX_ENV=pypy-tw111
-  - TOX_ENV=pypy-tw120
-  - TOX_ENV=pypy-tw123
-  - TOX_ENV=pypy-tw132
-  - TOX_ENV=pypy-tw140
-  - TOX_ENV=pypy-tw152
-  - TOX_ENV=pypy-tw162
-  - TOX_ENV=pypy-tw163
-  - TOX_ENV=pypy-tw164
-  - TOX_ENV=pypy-twcurrent
-  - TOX_ENV=pypy-twtrunk
+# earliest and latest supported; last release of every year; 14.0 for txi2p.plugins
+matrix:
+  include:
+    - python: 2.7
+      env: TOX_ENV=py27-tw102
+    - python: 2.7
+      env: TOX_ENV=py27-tw111
+    - python: 2.7
+      env: TOX_ENV=py27-tw120
+    - python: 2.7
+      env: TOX_ENV=py27-tw123
+    - python: 2.7
+      env: TOX_ENV=py27-tw132
+    - python: 2.7
+      env: TOX_ENV=py27-tw140
+    - python: 2.7
+      env: TOX_ENV=py27-tw155
+    - python: 2.7
+      env: TOX_ENV=py27-tw166
+    - python: 2.7
+      env: TOX_ENV=py27-tw179
+    - python: 2.7
+      env: TOX_ENV=py27-tw189
+    - python: 2.7
+      env: TOX_ENV=py27-twcurrent
 
-install:
-  - pip install tox
+    - python: pypy
+      env: TOX_ENV=pypy-tw102
+    - python: pypy
+      env: TOX_ENV=pypy-tw111
+    - python: pypy
+      env: TOX_ENV=pypy-tw120
+    - python: pypy
+      env: TOX_ENV=pypy-tw123
+    - python: pypy
+      env: TOX_ENV=pypy-tw132
+    - python: pypy
+      env: TOX_ENV=pypy-tw140
+    - python: pypy
+      env: TOX_ENV=pypy-tw155
+    - python: pypy
+      env: TOX_ENV=pypy-tw166
+    - python: pypy
+      env: TOX_ENV=pypy-tw179
+    - python: pypy
+      env: TOX_ENV=pypy-tw189
+    - python: pypy
+      env: TOX_ENV=pypy-twcurrent
 
-script:
-  - tox -e $TOX_ENV
+    # Ubuntu Xenial packages Twisted 16.0.0
+    - python: 2.7
+      env: TOX_ENV=py27-tw160
+
+    # Test against Twisted trunk to detect potential future breakage early.
+    - python: 2.7
+      env: TOX_ENV=py27-twtrunk
+    - python: pypy
+      env: TOX_ENV=pypy-twtrunk
 
-matrix:
   allow_failures:
     # Don't fail on trunk versions.
     - env: TOX_ENV=py27-twtrunk
     - env: TOX_ENV=pypy-twtrunk
     # pypy is a bit sporadic
-    - env: TOX_ENV=pypy-tw102
-    - env: TOX_ENV=pypy-tw111
-    - env: TOX_ENV=pypy-tw120
-    - env: TOX_ENV=pypy-tw123
-    - env: TOX_ENV=pypy-tw132
-    - env: TOX_ENV=pypy-tw140
-    - env: TOX_ENV=pypy-tw152
-    - env: TOX_ENV=pypy-tw162
-    - env: TOX_ENV=pypy-tw163
-    - env: TOX_ENV=pypy-tw164
-    - env: TOX_ENV=pypy-twcurrent
+    - python: pypy
+
+install:
+  - pip install tox
+
+script:
+  - tox -e $TOX_ENV

tox.ini

@@ -4,7 +4,7 @@
 # tox -i http://localhost:3141/root/pypi
 
 [tox]
-envlist = py27-tw{102,111,120,123,132,140,152,162,163,164,current,trunk}
+envlist = py{27,py}-tw{102,111,120,123,132,140,155,160,166,179,189,current,trunk}
 
 [testenv]
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
@@ -22,10 +22,11 @@ deps =
     tw123: Twisted==12.3
     tw132: Twisted==13.2
     tw140: Twisted==14.0
-    tw152: Twisted==15.2
-    tw162: Twisted==16.2
-    tw163: Twisted==16.3
-    tw164: Twisted==16.4
+    tw155: Twisted==15.5
+    tw160: Twisted==16.0.0
+    tw166: Twisted==16.6
+    tw179: Twisted==17.9
+    tw189: Twisted==18.9
     twcurrent: Twisted
     twtrunk: git+https://github.com/twisted/twisted.git
     coverage

txi2p/bob/protocol.py

@@ -50,7 +50,7 @@ def sendNewkeys(self):
 
     def sendOption(self, options={}):
         msg = 'option'
-        for key in options:
+        for key in sorted(options):
             msg += ' %s=%s' % (key, options[key])
         msg += '\n'
         self.transport.write(msg)