diff options
| author | Eugene Triguba <eugenetriguba@gmail.com> | 2022-11-25 12:14:19 -0500 |
|---|---|---|
| committer | Eugene Triguba <eugenetriguba@gmail.com> | 2022-11-25 12:14:19 -0500 |
| commit | 034f2e5f1a7e07311230ca042be328f1ba48b4ac (patch) | |
| tree | 58405d2f3bb24795f7ef340ec70def8f1b5a402b | |
| parent | Fix pytest ci command (diff) | |
| download | lirc-034f2e5f1a7e07311230ca042be328f1ba48b4ac.zip | |
Add requirements-311 override for installing newer coverage version
| -rw-r--r-- | .github/workflows/python-package-ci.yml | 1 | ||||
| -rw-r--r-- | poetry.lock | 34 | ||||
| -rw-r--r-- | pyproject.toml | 14 | ||||
| -rw-r--r-- | requirements-311.txt | 5 |
4 files changed, 27 insertions, 27 deletions
diff --git a/.github/workflows/python-package-ci.yml b/.github/workflows/python-package-ci.yml index d6b3b7d..813602f 100644 --- a/.github/workflows/python-package-ci.yml +++ b/.github/workflows/python-package-ci.yml @@ -21,6 +21,7 @@ jobs: run: | pip install poetry poetry install -v + pip install -r requirements-311.txt - name: Install system LIRC run: | diff --git a/poetry.lock b/poetry.lock index 615212d..4734c71 100644 --- a/poetry.lock +++ b/poetry.lock @@ -137,6 +137,9 @@ category = "dev" optional = false python-versions = ">=3.6" +[package.dependencies] +tomli = {version = "*", optional = true, markers = "extra == \"toml\""} + [package.extras] toml = ["tomli"] @@ -374,7 +377,7 @@ diagrams = ["jinja2", "railroad-diagrams"] [[package]] name = "pytest" -version = "6.2.5" +version = "7.0.1" description = "pytest: simple powerful testing with Python" category = "dev" optional = false @@ -389,23 +392,22 @@ iniconfig = "*" packaging = "*" pluggy = ">=0.12,<2.0" py = ">=1.8.2" -toml = "*" +tomli = ">=1.0.0" [package.extras] -testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"] +testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "xmlschema"] [[package]] name = "pytest-cov" -version = "2.12.1" +version = "4.0.0" description = "Pytest plugin for measuring coverage." category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=3.6" [package.dependencies] -coverage = ">=5.2.1" +coverage = {version = ">=5.2.1", extras = ["toml"]} pytest = ">=4.6" -toml = "*" [package.extras] testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"] @@ -661,11 +663,11 @@ python-versions = ">=3.6" [[package]] name = "urllib3" -version = "1.26.12" +version = "1.26.13" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [package.extras] brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"] @@ -687,7 +689,7 @@ testing = ["func-timeout", "jaraco.itertools", "pytest (>=4.6)", "pytest-black ( [metadata] lock-version = "1.1" python-versions = "^3.6" -content-hash = "2b97ee302759a5096b2d48937a4b3a44e351109c477b8fb55c0d82b8d9435d2d" +content-hash = "969f2daa4407a5dffc0f18fb2e3ffb2c80daf41d48485c66eadff4e0e0666f66" [metadata.files] alabaster = [ @@ -957,12 +959,12 @@ pyparsing = [ {file = "pyparsing-3.0.7.tar.gz", hash = "sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea"}, ] pytest = [ - {file = "pytest-6.2.5-py3-none-any.whl", hash = "sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134"}, - {file = "pytest-6.2.5.tar.gz", hash = "sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"}, + {file = "pytest-7.0.1-py3-none-any.whl", hash = "sha256:9ce3ff477af913ecf6321fe337b93a2c0dcf2a0a1439c43f5452112c1e4280db"}, + {file = "pytest-7.0.1.tar.gz", hash = "sha256:e30905a0c131d3d94b89624a1cc5afec3e0ba2fbdb151867d8e0ebd49850f171"}, ] pytest-cov = [ - {file = "pytest-cov-2.12.1.tar.gz", hash = "sha256:261ceeb8c227b726249b376b8526b600f38667ee314f910353fa318caa01f4d7"}, - {file = "pytest_cov-2.12.1-py2.py3-none-any.whl", hash = "sha256:261bb9e47e65bd099c89c3edf92972865210c36813f80ede5277dceb77a4a62a"}, + {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"}, + {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"}, ] pytz = [ {file = "pytz-2022.6-py2.py3-none-any.whl", hash = "sha256:222439474e9c98fced559f1709d89e6c9cbf8d79c794ff3eb9f8800064291427"}, @@ -1155,8 +1157,8 @@ typing-extensions = [ {file = "typing_extensions-4.1.1.tar.gz", hash = "sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42"}, ] urllib3 = [ - {file = "urllib3-1.26.12-py2.py3-none-any.whl", hash = "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"}, - {file = "urllib3-1.26.12.tar.gz", hash = "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e"}, + {file = "urllib3-1.26.13-py2.py3-none-any.whl", hash = "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc"}, + {file = "urllib3-1.26.13.tar.gz", hash = "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"}, ] zipp = [ {file = "zipp-3.6.0-py3-none-any.whl", hash = "sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc"}, diff --git a/pyproject.toml b/pyproject.toml index d5184a6..c2120ea 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,10 +6,7 @@ authors = ["Eugene Triguba <eugenetriguba@gmail.com>"] license = "MIT" readme = "README.rst" repository = "https://github.com/eugenetriguba/lirc" -keywords = [ - "LIRC", - "IR" -] +keywords = ["LIRC", "IR"] classifiers = [ "Development Status :: 5 - Production/Stable", "License :: OSI Approved :: MIT License", @@ -26,11 +23,6 @@ classifiers = [ "Topic :: Software Development :: Libraries :: Python Modules", ] -packages = [ - { include = "lirc" }, - { include = "tests", format = "sdist" } -] - [tool.taskipy.tasks] test = "task test_cov_missing" test_unit = "pytest tests/" @@ -44,8 +36,8 @@ python = "^3.6" [tool.poetry.dev-dependencies] flake8 = "^3.8.3" isort = "^5.0.4" -pytest = "^6.0" -pytest-cov = "^2.10.0" +pytest = "^7" +pytest-cov = "^4" bump2version = "^1.0.0" taskipy = "^1.2.1" black = "^20.8b1" diff --git a/requirements-311.txt b/requirements-311.txt new file mode 100644 index 0000000..232ccfa --- /dev/null +++ b/requirements-311.txt @@ -0,0 +1,5 @@ +# We need <6.3 for Python 3.6 but >=6.3 for Python 3.11
+# Because the poetry lockfile resolves to one version, we're
+# overriding it here for Python 3.11 in a bit of a hacky way
+# where this is being installed on CI after the `poetry install`.
+coverage>=6.5,<7; python_version >= "3.11"
|