From b712eda001961d59e24dc0764b5cc376b193dcfe Mon Sep 17 00:00:00 2001 From: mtakaki Date: Sun, 19 Jan 2020 14:25:29 -0800 Subject: [PATCH] Coveralls (#79) * Trying to fix coveralls and upgrading the packages * Trying to fix coveralls and upgrading the packages --- .circleci/config.yml | 3 +-- dev_requirements.txt | 13 +++++++------ requirements.txt | 2 +- setup.py | 7 ++++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b736040..a908a1b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,6 @@ jobs: source bin/activate pip3 install -r dev_requirements.txt pip3 install -r requirements.txt - python3 setup.py install pip3 install coveralls - save_cache: @@ -42,7 +41,7 @@ jobs: name: run tests command: | . bin/activate - py.test tests --junitxml=test-reports/junit.xml --cov=cachet_url_monitor + python -m pytest tests --junitxml=test-reports/junit.xml --cov=cachet_url_monitor coveralls coverage xml python-codacy-coverage -r coverage.xml diff --git a/dev_requirements.txt b/dev_requirements.txt index 7f56348..960b412 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,8 +1,9 @@ codacy-coverage==1.3.11 -ipython==7.8.0 -mock==2.0.0 -pudb==2016.1 -pytest==5.2.2 +coverage==5.0.3 +coveralls==1.10.0 +ipython==7.11.1 +mock==3.0.5 +pudb==2019.2 +pytest==5.3.3 pytest-cov==2.8.1 -coverage==4.5.2 -requests-mock==1.7.0 \ No newline at end of file +requests-mock==1.7.0 diff --git a/requirements.txt b/requirements.txt index 0c761a5..c7a9e06 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -PyYAML==5.1.2 +PyYAML==5.3 requests==2.22.0 schedule==0.6.0 Click==7.0 diff --git a/setup.py b/setup.py index bd525c8..0089754 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python #from distutils.core import setup -from setuptools import setup +from setuptools import setup, find_packages setup(name='cachet-url-monitor', version='0.6.3', @@ -8,13 +8,14 @@ setup(name='cachet-url-monitor', author='Mitsuo Takaki', author_email='mitsuotakaki@gmail.com', url='https://github.com/mtakaki/cachet-url-monitor', - packages=['cachet_url_monitor'], + packages=find_packages(), license='MIT', requires=[ 'requests', 'yaml', 'schedule', + 'Click', ], setup_requires=["pytest-runner"], - tests_require=["pytest"] + tests_require=["pytest", "requests-mock"] )