Merge pull request #258 from deniszh/backport/1.1.x/pr-253_pr-254_pr-…

…255_pr-257_pr-257

[1.1.x] Include tests in PyPI distributions | Make rrd2whisper.py run with Python 3 | E722 do not use bare except | Add testing for Python 3.7 in Travis and update languages in setup.py | Run tox from Travis

.gitignore

@@ -9,3 +9,4 @@ htmlcov/*
 ve
 .idea
 *.iml
+*.swp

.travis.yml

@@ -1,34 +1,39 @@
 language: python
 sudo: false
+python: 2.7
 
-python:
-  - 2.7
-  - pypy
-  - 3.2
-  - 3.3
-  - 3.4
-  - 3.5
-  - 3.6
-  - pypy3
+# 3.7 needs xenial and sudo https://github.com/travis-ci/travis-ci/issues/9815
+# This enables 3.7 without globally enabling sudo and dist: xenial for other build jobs
+matrix:
+  include:
+    - python: 2.7
+      env:
+        - TOXENV=py27
+    - python: 3.4
+      env:
+        - TOXENV=py34
+    - python: 3.5
+      env:
+        - TOXENV=py35
+    - python: 3.6
+      env:
+        - TOXENV=py36
+    - python: 3.7
+      dist: xenial
+      sudo: true
+      env:
+        - TOXENV=py37
+    - python: 3.7
+      dist: xenial
+      sudo: true
+      env:
+        - TOXENV=lint
 
 install:
-  - pip install .
-  - (python --version 2>&1 | grep -q "Python 3.2." && pip install "coverage<4" coveralls) || pip install coverage coveralls
+  - pip install tox
 
 script:
-  - bin/whisper-create.py --help
-  - bin/whisper-dump.py --help
-  - bin/whisper-fetch.py --help
-  - bin/whisper-fill.py --help
-  - bin/whisper-info.py --help
-  - bin/whisper-merge.py --help
-  - bin/whisper-resize.py --help
-  - bin/whisper-set-aggregation-method.py --help
-  - bin/whisper-update.py --help
-  - contrib/whisper-auto-update.py --help
-  - contrib/whisper-auto-resize.py --help
-  - "if echo $TRAVIS_PYTHON_VERSION | egrep -q '^pypy$'; then pip install unittest2; fi"
-  # Coverage of tests ensures we don't have dead coded in the tests
-  - coverage run --include='whisper.py,test_whisper.py' test_whisper.py
+  - tox -e $TOXENV
+
 after_success:
   coveralls

MANIFEST.in

@@ -0,0 +1,4 @@
+exclude .* MANIFEST.in
+global-exclude __pycache__
+global-exclude *.py[co]
+include test_whisper.py

bin/rrd2whisper.py

@@ -20,7 +20,7 @@
 # Ignore SIGPIPE
 signal.signal(signal.SIGPIPE, signal.SIG_DFL)
 
-aggregationMethods = whisper.aggregationMethods
+aggregationMethods = list(whisper.aggregationMethods)
 
 # RRD doesn't have a 'sum' or 'total' type
 aggregationMethods.remove('sum')

bin/whisper-dump.py

@@ -45,7 +45,7 @@ def read_header(map):
   try:
     (aggregationType, maxRetention, xFilesFactor, archiveCount) \
       = struct.unpack(whisper.metadataFormat, map[:whisper.metadataSize])
-  except:
+  except (struct.error, ValueError, TypeError):
     raise whisper.CorruptWhisperFile("Unable to unpack header")
 
   archives = []
@@ -57,7 +57,7 @@ def read_header(map):
         whisper.archiveInfoFormat,
         map[archiveOffset:archiveOffset + whisper.archiveInfoSize]
       )
-    except:
+    except (struct.error, ValueError, TypeError):
       raise whisper.CorruptWhisperFile("Unable to read archive %d metadata" % i)
 
     archiveInfo = {

bin/whisper-resize.py

@@ -172,7 +172,7 @@
 try:
   print('Renaming new database to: %s' % path)
   os.rename(tmpfile, path)
-except:
+except (OSError, FileNotFoundError, PermissionError):
   traceback.print_exc()
   print('\nOperation failed, restoring backup')
   os.rename(backup, path)

setup.py

@@ -17,14 +17,12 @@
   install_requires=['six'],
   classifiers=[
     'Programming Language :: Python :: 2',
-    'Programming Language :: Python :: 2.6',
     'Programming Language :: Python :: 2.7',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.2',
-    'Programming Language :: Python :: 3.3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: Implementation :: CPython',
     'Programming Language :: Python :: Implementation :: PyPy',
   ],

tox.ini

@@ -4,17 +4,33 @@ envlist =
   py34,
   py35,
   py36,
+  py37,
   pypy,
+  pypy3,
   lint,
 
 [testenv]
 commands =
-  coverage run --branch --omit=.tox/* -m unittest discover
+  sh -c 'bin/whisper-create.py --help >/dev/null'
+  sh -c 'bin/whisper-create.py --help >/dev/null'
+  sh -c 'bin/whisper-dump.py --help >/dev/null'
+  sh -c 'bin/whisper-fetch.py --help >/dev/null'
+  sh -c 'bin/whisper-fill.py --help >/dev/null'
+  sh -c 'bin/whisper-info.py --help >/dev/null'
+  sh -c 'bin/whisper-merge.py --help >/dev/null'
+  sh -c 'bin/whisper-resize.py --help >/dev/null'
+  sh -c 'bin/whisper-set-aggregation-method.py --help >/dev/null'
+  sh -c 'bin/whisper-update.py --help >/dev/null'
+  sh -c 'contrib/whisper-auto-update.py --help >/dev/null'
+  sh -c 'contrib/whisper-auto-resize.py --help >/dev/null'
+  coverage run --branch --include='whisper.py,test_whisper.py' test_whisper.py
   coverage xml
   coverage report
 deps =
   coverage
   mock
+whitelist_externals =
+  sh
 
 [testenv:lint]
 deps = flake8

whisper.py

@@ -285,12 +285,12 @@ def __readHeader(fh):
   try:
     (aggregationType, maxRetention, xff, archiveCount) \
         = struct.unpack(metadataFormat, packedMetadata)
-  except:
+  except (struct.error, ValueError, TypeError):
     raise CorruptWhisperFile("Unable to read header", fh.name)
 
   try:
     aggregationTypeToMethod[aggregationType]
-  except:
+  except KeyError:
     raise CorruptWhisperFile("Unable to read header", fh.name)
 
   if not 0 <= xff <= 1:
@@ -398,7 +398,7 @@ def __writeHeaderMetadata(fh, aggregationMethod, maxRetention, xFilesFactor, arc
 
   try:
     xFilesFactor = float(xFilesFactor)
-  except:
+  except ValueError:
     raise InvalidXFilesFactor("Invalid xFilesFactor %s, not a float" %
                               xFilesFactor)