Merge 3cb6141 into 9b62c8e

tlsfuzzer · Nov 29, 2019 · d25366c · d25366c
2 parents 9b62c8e + 3cb6141
commit d25366c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -15,6 +15,8 @@ matrix:
         env: TOX_ENV=py26
       - python: 2.7
         env: TOX_ENV=py27
+      - python: 2.7
+        env: TOX_ENV=py27 SIX=1.9.0
       - python: 3.3
         env: TOX_ENV=py33
       - python: 3.4
@@ -67,6 +69,7 @@ before_install:
 
 install:
   - pip list
+  - if [[ $SIX ]]; then travis_retry pip install six==$SIX; fi
   - |
       if [[ -e build-requirements-${TRAVIS_PYTHON_VERSION}.txt ]]; then
         travis_retry pip install -r build-requirements-${TRAVIS_PYTHON_VERSION}.txt;

diff --git a/setup.py b/setup.py
@@ -40,5 +40,5 @@
           "Programming Language :: Python :: 3.7",
           "Programming Language :: Python :: 3.8",
       ],
-      install_requires=['six'],
+      install_requires=['six>=1.9.0'],
       )