Merge pull request #441 from tlsfuzzer/py33-0.7

revive py33 test coverage

Author: tomato42

.travis.yml

@@ -17,6 +17,9 @@ addons:
     - swig
     # needed for GMPY
     - libgmp-dev
+    # needed for GMPY2
+    - libmpfr-dev
+    - libmpc-dev
 before_cache:
   - rm -f $HOME/.cache/pip/log/debug.log
 
@@ -26,6 +29,8 @@ jobs:
       env: TACKPY=false
     - python: 2.7
       env: TACKPY=false
+    - python: 3.3
+      env: TACKPY=false
     - python: 3.4
       env: TACKPY=false
     - python: 3.5
@@ -60,6 +65,14 @@ jobs:
       dist: xenial
       sudo: true
       env: M2CRYPTO=true
+    - python: 3.8
+      dist: xenial
+      sudo: true
+      env: M2CRYPTO=true
+    - python: 3.9
+      dist: xenial
+      sudo: true
+      env: M2CRYPTO=true
     - python: 2.7
       env: PYCRYPTO=true
     - python: 3.4
@@ -122,7 +135,14 @@ before_install:
 install:
   - if [[ -e build-requirements-${TRAVIS_PYTHON_VERSION}.txt ]]; then travis_retry pip install -r build-requirements-${TRAVIS_PYTHON_VERSION}.txt; else travis_retry pip install -r build-requirements.txt; fi
   - if [[ $TACKPY == 'true' ]]; then travis_retry pip install tackpy; fi
-  - if [[ $M2CRYPTO == 'true' ]]; then travis_retry pip install --pre m2crypto; fi
+  - |
+      if [[ $M2CRYPTO == 'true' ]]; then
+        if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]] || [[ $TRAVIS_PYTHON_VERSION == 3.4 ]] || [[ $TRAVIS_PYTHON_VERSION == 3.5 ]] || [[ $TRAVIS_PYTHON_VERSION == 3.6 ]] ; then
+           travis_retry pip install 'm2crypto<0.37';
+        else
+           travis_retry pip install --pre m2crypto;
+        fi
+      fi
   - if [[ $PYCRYPTO == 'true' ]]; then travis_retry pip install pycrypto; fi
   - if [[ $PYCRYPTODOME == 'true' ]]; then travis_retry pip install pycryptodome; fi
   - if [[ $GMPY == 'true' ]]; then travis_retry pip install gmpy; fi
@@ -138,14 +158,13 @@ script:
       fi
   - make test-local
   # --appends is supported only in the new coverage (>4)
-  - if [[ $TRAVIS_PYTHON_VERSION != '3.2' ]]; then coverage combine --append; fi
+  - coverage combine --append
   - coverage report -m
   - ./setup.py install
   - make test
   # pylint doesn't work on 2.6: https://bitbucket.org/logilab/pylint/issue/390/py26-compatiblity-broken
-  # diff-quality doesn't work on 3.2: https://github.com/edx/diff-cover/issues/94
   - |
-      if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]] && [[ $TRAVIS_PYTHON_VERSION != '3.2' ]]; then
+      if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]]; then
         pylint --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" tlslite > pylint_report.txt || :
         diff-quality --violations=pylint --fail-under=90 pylint_report.txt
       fi

build-requirements-3.2.txt

@@ -0,0 +1,8 @@
+enum34
+coverage<5.0
+hypothesis<3.44
+coveralls
+pylint
+diff_cover<2.5.0
+typed-ast<1.3.0
+inflect<4.0.0

build-requirements-3.3.txt

@@ -35,6 +35,7 @@
             'Programming Language :: Python :: 2.6',
             'Programming Language :: Python :: 2.7',
             "Programming Language :: Python :: 3",
+            'Programming Language :: Python :: 3.3',
             'Programming Language :: Python :: 3.4',
             'Programming Language :: Python :: 3.5',
             'Programming Language :: Python :: 3.6',

setup.py

@@ -19,6 +19,31 @@
 from tlslite.utils.deprecations import deprecated_params, \
         deprecated_attrs
 
+# see https://github.com/pytest-dev/py/issues/110
+# preload the list until the list of loaded modules is static
+try:
+    import py.error
+except ImportError:
+    pass  # ignore
+import sys
+while True:
+    end = True
+    for v in list(sys.modules.values()):
+        old = set(sys.modules.values())
+        _ = getattr(v, '__warningregistry__', None)
+        new = set(sys.modules.values())
+        if new - old:
+            end = False
+    if end:
+        break
+for v in list(sys.modules.values()):
+    old = set(sys.modules.values())
+    _ = getattr(v, '__warningregistry__', None)
+    new = set(sys.modules.values())
+    if new - old:
+        print("changed: {0}".format(new - old))
+
+
 
 class TestDeprecatedParams(unittest.TestCase):
     def test_no_changes(self):