Merge pull request #51 from imWildCat/dev

Security fix and dependencies upgrade
imWildCat · Dec 26, 2018 · aa5133d · aa5133d
2 parents be0e1fe + fc3ff57
commit aa5133d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/docs/requirements-rtfd.txt b/docs/requirements-rtfd.txt
@@ -1,10 +1,10 @@
 tornado==5.0.2
 peewee==3.2.2
-requests==2.18.4
+requests==2.21.0
 requests-html==0.9.0
-pyppeteer==0.0.17
+pyppeteer==0.0.25
 sanic==0.7.0
-sanic-cors==0.9.3
+sanic-cors==0.9.5
 schedule==0.5.0
 six==1.11.0
 mock
diff --git a/requirements.txt b/requirements.txt
@@ -1,10 +1,10 @@
 tornado==5.0.2
 peewee==3.2.2
-requests==2.18.4
+requests==2.21.0
 requests-html==0.9.0
 pycurl==7.43.0.1
-pyppeteer==0.0.17
-sanic==0.7.0
-sanic-cors==0.9.3
+pyppeteer==0.0.25
+sanic==0.8.1
+sanic-cors==0.9.5
 schedule==0.5.0
 six==1.11.0
diff --git a/scylla/_version.py b/scylla/_version.py
@@ -1 +1 @@
-__version__ = '1.1.4'
+__version__ = '1.1.5'
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 import io
 import os
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 import scylla
 
@@ -18,12 +18,7 @@
     name='scylla',
     python_requires='>=3.6.0',
     # If your package is a single module, use this instead of 'packages':
-    packages=[
-        'scylla',
-        'scylla.providers',
-        'scylla.proxy',
-        'scylla.web'
-    ],
+    packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     entry_points={
         'console_scripts': ['scylla = scylla.cli:app_main']
     },

diff --git a/tests/tcpping_test.py b/tests/tcpping_test.py
@@ -8,9 +8,9 @@ def test_ping_class():
 
     assert p.get_maximum() >= p.get_average()
     assert p.get_minimum() <= p.get_average()
-    assert p.get_average() > 0
+    assert p.get_average() >= 0
 
-    assert p.get_success_rate() > 0.0
+    assert p.get_success_rate() >= 0.0
 
 
 def test_ping_func():