Skip to content

Commit b662a0e

Browse files
authored
Merge branch 'main' into dependabot/pip/aiohttp-3.8.5
2 parents fbdce59 + 30ef579 commit b662a0e

File tree

391 files changed

+8063
-2542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

391 files changed

+8063
-2542
lines changed

.coveragerc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ exclude_lines =
55
def __str__
66
if self.debug:
77
if settings.DEBUG
8+
if t.TYPE_CHECKING
89
raise AssertionError
910
raise NotImplementedError
1011
if 0:

.github/workflows/publish.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
publish:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313
- name: Set up Python
1414
uses: actions/setup-python@v4
1515
with:
@@ -23,5 +23,3 @@ jobs:
2323
FLIT_USERNAME: ${{ secrets.FLIT_USERNAME }}
2424
FLIT_PASSWORD: ${{ secrets.FLIT_PASSWORD }}
2525
run: flit publish
26-
- name: Deploy Documentation
27-
run: make doc-deploy

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- name: Set up Python
1515
uses: actions/setup-python@v4
1616
with:

.github/workflows/test_full.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
13+
python-version: ['3.8', '3.9', '3.10', '3.11']
1414

1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
- name: Set up Python
1818
uses: actions/setup-python@v4
1919
with:
@@ -23,12 +23,12 @@ jobs:
2323
- name: Install Dependencies
2424
run: flit install --symlink
2525
- name: Test
26-
run: pytest tests
26+
run: pytest
2727

2828
codestyle:
2929
runs-on: ubuntu-latest
3030
steps:
31-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3232
- name: Set up Python
3333
uses: actions/setup-python@v4
3434
with:
@@ -38,10 +38,8 @@ jobs:
3838
- name: Install Dependencies
3939
run: flit install --symlink
4040
- name: Black
41-
run: black --check ellar tests
42-
- name: isort
43-
run: isort --check ellar tests
44-
- name: Flake8
45-
run: flake8 ellar tests
41+
run: black --check ellar tests examples
42+
- name: Ruff Linting Check
43+
run: ruff check ellar tests examples
4644
- name: mypy
4745
run: mypy ellar

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,4 +126,4 @@ dist
126126
test.py
127127

128128
docs/site
129-
site/
129+
site/

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ repos:
1414
name: Code Formatting
1515
entry: "make fmt"
1616
types: [python]
17-
language_version: python3.8
17+
language_version: python3.10
1818
language: python
1919
- id: code_linting
2020
args: [ ]
2121
name: Code Linting
2222
entry: "make lint"
2323
types: [ python ]
24-
language_version: python3.8
24+
language_version: python3.10
2525
language: python
2626
- repo: https://github.com/pre-commit/pre-commit-hooks
2727
rev: v2.3.0

Makefile

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,22 @@ install-full: ## Install dependencies
1717
make install
1818
pre-commit install -f
1919

20-
lint: ## Run code linters
21-
black --check ellar tests
22-
isort --check ellar tests
23-
autoflake --remove-unused-variables --remove-unused-variables -r ellar tests
24-
flake8 ellar tests
20+
lint:fmt ## Run code linters
21+
black --check ellar tests examples
22+
ruff check ellar tests examples
2523
mypy ellar
2624

27-
fmt format: ## Run code formatters
28-
black ellar tests
29-
isort ellar tests
25+
fmt format:clean ## Run code formatters
26+
black ellar tests examples
27+
ruff check --fix ellar tests examples
3028

31-
test: ## Run tests
32-
pytest tests
29+
test:clean ## Run tests
30+
pytest
3331

3432
test-cov: ## Run tests with coverage
35-
pytest --cov=ellar --cov-report term-missing tests
33+
pytest --cov=ellar --cov-report term-missing
3634

37-
doc-deploy: ## Run Deploy Documentation
38-
make clean
35+
doc-deploy:clean ## Run Deploy Documentation
3936
mkdocs gh-deploy --force --ignore-version
4037

4138
doc-serve: ## Launch doc local server

0 commit comments

Comments
 (0)