diff --git a/CHANGES.txt b/CHANGES.txt index 9ceda5fa..f819da3e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,6 @@ +8.1.7 (Jan 23, 2020) + - Removed enum34 dependency for python versions > 3.4 + 8.1.6 (Oct 31, 2019) - Fixed input validation performance issue. diff --git a/setup.cfg b/setup.cfg index 18ba96e2..164be372 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,7 +13,7 @@ test=pytest [tool:pytest] ignore_glob=./splitio/_OLD/* -addopts = --cov=splitio --verbose +addopts = --verbose --cov=splitio --cov-report xml python_classes=*Tests [build_sphinx] diff --git a/setup.py b/setup.py index 2525428a..e3082bc6 100644 --- a/setup.py +++ b/setup.py @@ -3,20 +3,25 @@ from setuptools import setup, find_packages from os import path -from sys import version_info -tests_require = ['flake8', 'pytest', 'pytest-mock', 'coverage', 'pytest-cov'] +tests_require = [ + 'flake8', + 'pytest', + 'pytest-mock', + 'coverage', + 'pytest-cov', + 'mock;python_version<"3"' +] install_requires = [ 'requests>=2.9.1', 'pyyaml>=5.1', 'future>=0.15.2', 'docopt>=0.6.2', + 'enum34;python_version<"3.4"', + 'six>=1.10.0;python_version<"3"', + 'futures>=3.0.5;python_version<"3"' ] -if version_info < (3,): - tests_require += ['mock'] - install_requires += ['six>=1.10.0', 'futures>=3.0.5', 'enum34>=1.1.5'] - with open(path.join(path.abspath(path.dirname(__file__)), 'splitio', 'version.py')) as f: exec(f.read()) diff --git a/sonar-scanner.sh b/sonar-scanner.sh index d6bffa3f..284a4c25 100644 --- a/sonar-scanner.sh +++ b/sonar-scanner.sh @@ -10,6 +10,7 @@ sonar_scanner() { -Dsonar.sources='splitio' \ -Dsonar.projectName='python-client' \ -Dsonar.projectKey='python-client' \ + -Dsonar.python.coverage.reportPaths='coverage.xml' \ -Dsonar.links.ci='https://travis-ci.com/splitio/python-client' \ -Dsonar.links.scm='https://github.com/splitio/python-client' \ ${params} diff --git a/splitio/version.py b/splitio/version.py index 99f4cbb4..03256494 100644 --- a/splitio/version.py +++ b/splitio/version.py @@ -1 +1 @@ -__version__ = '8.1.6' +__version__ = '8.1.7'