Skip to content

Commit

Permalink
Drop Python 3.7, test on 3.12-dev and update deps (#44)
Browse files Browse the repository at this point in the history
  • Loading branch information
adriangb authored Jul 9, 2023
1 parent a31912d commit 85ad9b6
Show file tree
Hide file tree
Showing 8 changed files with 91 additions and 122 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11-dev']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12-dev']

runs-on: ubuntu-latest

Expand All @@ -30,7 +30,7 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- run: pip install -r requirements/testing.txt
- run: pip install -r requirements/all.txt

- run: pip install .

Expand All @@ -53,7 +53,7 @@ jobs:
with:
python-version: '3.10'

- run: pip install -r requirements/linting.txt
- run: pip install -r requirements/all.txt

- uses: pre-commit/action@v3.0.0
with:
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ install:

.PHONY: generate-dependencies
generate-dependencies:
pip-compile --resolver backtracking --output-file=requirements/linting.txt requirements/linting.in
pip-compile --resolver backtracking --output-file=requirements/testing.txt requirements/testing.in
pip-compile --output-file=requirements/all.txt --resolver=backtracking requirements/all.in

.PHONY: format
format:
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ classifiers = [
"Environment :: MacOS X",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Software Development :: Libraries :: Python Modules",
"Typing :: Typed",
]

requires-python = ">=3.7"
requires-python = ">=3.8"
dependencies = ["typing-extensions>=4.0.0; python_version<'3.9'"]
dynamic = ["version"]

Expand Down
2 changes: 2 additions & 0 deletions requirements/all.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-r ./linting.in
-r ./testing.in
84 changes: 82 additions & 2 deletions requirements/all.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,82 @@
-r ./linting.txt
-r ./testing.txt
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --config=pyproject.toml --output-file=requirements/all.txt --resolver=backtracking requirements/all.in
#
black==23.3.0
# via -r requirements/./linting.in
cfgv==3.3.1
# via pre-commit
click==8.1.4
# via black
colorama==0.4.6
# via isort
coverage==7.2.7
# via -r requirements/./testing.in
distlib==0.3.6
# via virtualenv
filelock==3.12.2
# via virtualenv
flake8==6.0.0
# via
# -r requirements/./linting.in
# flake8-pyproject
flake8-pyproject==1.2.3
# via -r requirements/./linting.in
identify==2.5.24
# via pre-commit
iniconfig==2.0.0
# via pytest
isort[colors]==5.12.0
# via -r requirements/./linting.in
mccabe==0.7.0
# via flake8
mypy==1.4.1
# via -r requirements/./linting.in
mypy-extensions==1.0.0
# via
# black
# mypy
nodeenv==1.8.0
# via pre-commit
packaging==23.1
# via
# black
# pytest
# pytest-sugar
pathspec==0.11.1
# via black
platformdirs==3.8.1
# via
# black
# virtualenv
pluggy==1.2.0
# via pytest
pre-commit==3.3.3
# via -r requirements/./linting.in
pycodestyle==2.10.0
# via flake8
pyflakes==3.0.1
# via flake8
pytest==7.4.0
# via
# -r requirements/./linting.in
# -r requirements/./testing.in
# pytest-mock
# pytest-sugar
pytest-mock==3.11.1
# via -r requirements/./testing.in
pytest-sugar==0.9.7
# via -r requirements/./testing.in
pyyaml==6.0
# via pre-commit
termcolor==2.3.0
# via pytest-sugar
typing-extensions==4.7.1
# via mypy
virtualenv==20.23.1
# via pre-commit

# The following packages are considered to be unsafe in a requirements file:
# setuptools
77 changes: 0 additions & 77 deletions requirements/linting.txt

This file was deleted.

35 changes: 0 additions & 35 deletions requirements/testing.txt

This file was deleted.

2 changes: 1 addition & 1 deletion tests/test_grouped_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Foo1(GroupedMetadata):

class Foo2(GroupedMetadata):
def __iter__(self) -> Iterator[BaseMetadata]:
return super().__iter__()
raise NotImplementedError

with pytest.raises(NotImplementedError):
for _ in Foo2():
Expand Down

0 comments on commit 85ad9b6

Please sign in to comment.