Skip to content

Commit

Permalink
Fixed tests. Setup sdist. Deprecated py3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
MisterWil committed Nov 26, 2019
1 parent ac966d9 commit 02ded14
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 17 deletions.
8 changes: 4 additions & 4 deletions requirements_test.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
wheel==0.29.0
tox==2.8.1
flake8==3.4.1
tox==3.14.0
flake8>=3.6.0
flake8-docstrings==1.1.0
pylint==1.8.2
pylint==2.4.4
pydocstyle==2.0.0
pytest>=2.9.2
pytest-cov>=2.3.1
pytest-sugar>=0.8.0
pytest-timeout>=1.0.0
restructuredtext-lint>=1.0.1
pygments>=2.2.0
requests_mock>=1.3.0
requests_mock>=1.3.0
3 changes: 2 additions & 1 deletion skybellpy/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

import argparse

from colorlog import ColoredFormatter

import skybellpy
import skybellpy.helpers.constants as CONST
from skybellpy.exceptions import SkybellException
Expand All @@ -35,7 +37,6 @@ def setup_logging(log_level=logging.INFO):
logging.getLogger('aiohttp.access').setLevel(logging.WARNING)

try:
from colorlog import ColoredFormatter
logging.getLogger().handlers[0].setFormatter(ColoredFormatter(
colorfmt,
datefmt=datefmt,
Expand Down
6 changes: 3 additions & 3 deletions skybellpy/device.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
_LOGGER = logging.getLogger(__name__)


class SkybellDevice(object):
class SkybellDevice():
"""Class to represent each Skybell device."""

def __init__(self, device_json, skybell):
Expand Down Expand Up @@ -121,8 +121,8 @@ def _update_events(self):

if old_event and created_at < old_event.get(CONST.CREATED_AT):
continue
else:
events[event] = activity

events[event] = activity

self._skybell.update_dev_cache(
self,
Expand Down
2 changes: 0 additions & 2 deletions skybellpy/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,3 @@ def __init__(self, error, details=None):

class SkybellAuthenticationException(SkybellException):
"""Class to throw authentication exception."""

pass
6 changes: 3 additions & 3 deletions skybellpy/helpers/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
import os

MAJOR_VERSION = 0
MINOR_VERSION = 4
MINOR_VERSION = 5
PATCH_VERSION = '0'

__version__ = '{}.{}.{}'.format(MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION)

REQUIRED_PYTHON_VER = (3, 4, 2)
REQUIRED_PYTHON_VER = (3, 5, 0)

PROJECT_NAME = 'skybellpy'
PROJECT_PACKAGE_NAME = 'skybellpy'
Expand All @@ -29,7 +29,7 @@
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Topic :: Home Automation'
]

Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = build, py34, py35, py36, lint
envlist = build, py35, py36, py37, lint
skip_missing_interpreters = True
skipsdist = True

Expand All @@ -8,7 +8,7 @@ setenv =
LANG=en_US.UTF-8
PYTHONPATH = {toxinidir}/skybellpy
commands =
py.test --timeout=30 --duration=10 --cov=skybellpy --cov-report term-missing {posargs}
py.test --timeout=30 --cov=skybellpy --cov-report term-missing {posargs}
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/requirements_test.txt
Expand Down Expand Up @@ -36,5 +36,5 @@ deps =
-r{toxinidir}/requirements.txt
commands =
/bin/rm -rf build dist
python setup.py bdist_wheel
/bin/sh -c "pip install --upgrade dist/*.whl"
python setup.py sdist bdist_wheel
/bin/sh -c "pip install --upgrade dist/*.whl"

0 comments on commit 02ded14

Please sign in to comment.