From e0f9b327f5f4c89f1a19a7cf046226b515080067 Mon Sep 17 00:00:00 2001 From: cn Date: Wed, 18 Dec 2019 19:57:23 +0100 Subject: [PATCH] module: support Python 3 only --- .github/workflows/ci.yml | 10 +++------- .travis.yml | 13 ------------- Makefile | 11 ----------- README.md | 2 +- pyproject.toml | 2 +- tests/veml6070_test.py | 2 +- veml6070/veml6070.py | 2 +- 7 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1e442f6..9b2694e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,9 +3,9 @@ name: ci on: push: - branches: [master, three] + branches: [master] pull_request: - branches: [master, three] + branches: [master] workflow_dispatch: schedule: - cron: '37 4 * * 4' # weekly on thursday morning @@ -16,12 +16,8 @@ jobs: strategy: 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/Makefile b/Makefile index 8552437..a9fece6 100644 --- a/Makefile +++ b/Makefile @@ -21,17 +21,6 @@ lint: ## Lint all source code test: ## Run all tests poetry run pytest -.PHONY: rebase-three-branch -rebase-three-branch: ## Rebase the py3 branch with master contents - git stash - git checkout master - git pull - git checkout three - git rebase -i origin/master - git push --force-with-lease - git checkout master - git stash pop - .PHONY: help help: ## Print this help text @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-15s\033[0m %s\n", $$1, $$2}' diff --git a/README.md b/README.md index 1e500b2..17ba3ed 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # python-veml6070 -![ci](https://github.com/cmur2/python-veml6070/workflows/ci/badge.svg?branch=master) [![Build Status](https://travis-ci.com/cmur2/python-veml6070.svg?branch=master)](https://travis-ci.com/cmur2/python-veml6070) +![ci](https://github.com/cmur2/python-veml6070/workflows/ci/badge.svg?branch=master) A Python library for accessing the [VEML6070 digital UV light sensor](http://www.vishay.com/docs/84277/veml6070.pdf) from Vishay via `python-smbus` using the I2C interface. diff --git a/pyproject.toml b/pyproject.toml index e4bcb7d..467180e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ license = "MIT" homepage = "https://dev.mycrobase.de/gitea/cn/python-veml6070" [tool.poetry.dependencies] -python = "^2.7 || ^3.4" +python = "^3.7" smbus2 = "*" [tool.poetry.dev-dependencies] diff --git a/tests/veml6070_test.py b/tests/veml6070_test.py index 96a1d9f..f661db7 100644 --- a/tests/veml6070_test.py +++ b/tests/veml6070_test.py @@ -14,7 +14,7 @@ import veml6070 # 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 {} diff --git a/veml6070/veml6070.py b/veml6070/veml6070.py index 06885b9..5a94aa6 100644 --- a/veml6070/veml6070.py +++ b/veml6070/veml6070.py @@ -31,7 +31,7 @@ NORMALIZED_REFRESHTIME = 0.1 NORMALIZED_UVA_SENSITIVITY = 0.05 -class Veml6070(object): # pylint: disable=bad-option-value,useless-object-inheritance +class Veml6070(): def __init__(self, i2c_bus=1, sensor_address=ADDR_L, rset=RSET_270K, integration_time=INTEGRATIONTIME_1T): self.bus = smbus.SMBus(i2c_bus) self.sendor_address = sensor_address