Skip to content

Commit e59b788

Browse files
authored
Merge pull request #189 from python-ellar/package_fix
Lib dependency restructure
2 parents aaad4e8 + 0d3ce0b commit e59b788

Some content is hidden

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

77 files changed

+728
-108
lines changed

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Install Flit
1818
run: pip install flit
1919
- name: Install Dependencies
20-
run: flit install --symlink
20+
run: make install
2121
- name: Install build dependencies
2222
run: pip install build
2323
- name: Build distribution

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Install Flit
1919
run: pip install flit ellar_jwt
2020
- name: Install Dependencies
21-
run: flit install --symlink
21+
run: make install
2222
- name: Test
2323
run: make test-cov
2424
- name: Coverage

.github/workflows/test_full.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Install Flit
2222
run: pip install flit ellar_jwt
2323
- name: Install Dependencies
24-
run: flit install --symlink
24+
run: make install
2525
- name: Test
2626
run: pytest
2727

@@ -36,7 +36,7 @@ jobs:
3636
- name: Install Flit
3737
run: pip install flit
3838
- name: Install Dependencies
39-
run: flit install --symlink
39+
run: make install
4040
- name: Ruff Linting Check
4141
run: ruff check ellar tests samples
4242
- name: mypy

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ clean: ## Removing cached python compiled files
1212
find . -name .ruff_cache | xargs rm -rfv
1313

1414
install: ## Install dependencies
15-
flit install --deps develop --symlink
15+
pip install -r requirements.txt
16+
flit install --symlink
1617

1718
install-full: ## Install dependencies
1819
make install

ellar/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
""" Ellar - Python ASGI web framework for building fast, efficient, and scalable RESTful APIs and server-side applications. """
1+
"""Ellar - Python ASGI web framework for building fast, efficient, and scalable RESTful APIs and server-side applications."""
22

33
__version__ = "0.7.1"

ellar/app/context.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
if t.TYPE_CHECKING:
1414
from ellar.app.main import App
1515

16-
injector_context_var: ContextVar[
17-
t.Optional[t.Union["ApplicationContext", t.Any]]
18-
] = ContextVar("ellar.app.context")
16+
injector_context_var: ContextVar[t.Optional[t.Union["ApplicationContext", t.Any]]] = (
17+
ContextVar("ellar.app.context")
18+
)
1919

2020

2121
class ApplicationContext:

ellar/auth/services/auth_schemes.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ def __init__(self) -> None:
1414
def add_authentication(
1515
self, authentication_scheme: AuthenticationHandlerType
1616
) -> None:
17-
self._authentication_schemes[
18-
authentication_scheme.scheme
19-
] = authentication_scheme
17+
self._authentication_schemes[authentication_scheme.scheme] = (
18+
authentication_scheme
19+
)
2020

2121
def find_authentication_scheme(self, scheme: str) -> AuthenticationHandlerType:
2222
try:

ellar/cache/backends/pylib_cache.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""
22
PyLibMCCacheBackend inspired by Django PyLibMCCache
33
"""
4+
45
import typing as t
56

67
try:

ellar/cache/backends/pymem_cache.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""
22
PyMemcacheCacheBackend inspired by Django PyMemcacheCache
33
"""
4+
45
import typing as t
56

67
try:

ellar/common/models/guard.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99

1010
class GuardCanActivate(ABC, metaclass=ABCMeta):
11-
exception_class: t.Union[
12-
t.Type[HTTPException], t.Type[APIException]
13-
] = HTTPException
11+
exception_class: t.Union[t.Type[HTTPException], t.Type[APIException]] = (
12+
HTTPException
13+
)
1414
status_code: int = HTTP_403_FORBIDDEN
1515
detail: str = "Forbidden"
1616

0 commit comments

Comments
 (0)