From c5fd84e4b9ebbca90ed1ac40e17f935bf296fabb Mon Sep 17 00:00:00 2001 From: cn Date: Sun, 15 Dec 2019 23:12:15 +0100 Subject: [PATCH] module: support Python 3 only --- .github/workflows/ci.yml | 13 ++++--------- .travis.yml | 13 ------------- bme280/bme280.py | 4 ++-- pyproject.toml | 2 +- tests/bme280_test.py | 2 +- 5 files changed, 8 insertions(+), 26 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8d37f95..22b518b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,26 +3,21 @@ name: ci on: push: - branches: [master, three] + branches: [master] pull_request: - branches: [master, three] + branches: [master] workflow_dispatch: schedule: - cron: '41 4 * * 4' # weekly on thursday morning jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest strategy: - fail-fast: false matrix: python-version: - - '2.7' - # Python 3.4 on GHA doesn't work due to fastdiff==0.2.0 failing with: - # pkg_resources.DistributionNotFound: The 'setuptools_scm>=1.15.0' distribution was not found and is required by the application - #- '3.4' - - '3.5' - '3.7' + - '3.8' - '3.9' steps: - uses: actions/checkout@v2 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2a7716a..0000000 --- a/.travis.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -os: linux -language: python -python: -- "3.4" - -install: -- pip install poetry==1.0.10 -- poetry install - -script: -- make lint -- make test diff --git a/bme280/bme280.py b/bme280/bme280.py index 1680d89..93e6afb 100644 --- a/bme280/bme280.py +++ b/bme280/bme280.py @@ -52,7 +52,7 @@ FILTER_8 = 0x03 FILTER_16 = 0x04 # and all higher -class Bme280(object): # pylint: disable=bad-option-value,useless-object-inheritance +class Bme280(): def __init__(self, i2c_bus=1, sensor_address=ADDR): self.bus = smbus.SMBus(i2c_bus) self.sensor_address = sensor_address @@ -179,7 +179,7 @@ class Bme280(object): # pylint: disable=bad-option-value,useless-object-inherit for i in range(0xE1, 0xE1 + 7): calibration_regs.append(self.bus.read_byte_data(self.sensor_address, i)) - # pylint: disable=bad-whitespace + # pylint: disable=bad-option-value,bad-whitespace # reorganize 8-bit words into compensation words (without correct sign) self.digT = [] diff --git a/pyproject.toml b/pyproject.toml index eab7dee..a3a92a3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ license = "MIT" homepage = "https://dev.mycrobase.de/gitea/cn/python-bme280" [tool.poetry.dependencies] -python = "^2.7 || ^3.4" +python = "^3.7" smbus2 = "*" [tool.poetry.dev-dependencies] diff --git a/tests/bme280_test.py b/tests/bme280_test.py index 2122ce4..585da68 100644 --- a/tests/bme280_test.py +++ b/tests/bme280_test.py @@ -14,7 +14,7 @@ import bme280 # pylint: disable=wrong-import-position # inspired by https://github.com/adafruit/Adafruit_Python_GPIO/blob/master/Adafruit_GPIO/I2C.py -class MockSMBus(object): # pylint: disable=bad-option-value,useless-object-inheritance +class MockSMBus(): def __init__(self, initial_read=None): self._log = [] self.initial_read = initial_read or {}