Skip to content

Commit 1d90469

Browse files
authored
Merge pull request #9 from python-ellar/project_rename
Project Rename
2 parents cc5c5af + e657cb3 commit 1d90469

Some content is hidden

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

84 files changed

+201
-190
lines changed

.github/workflows/test_full.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ jobs:
3838
- name: Install Dependencies
3939
run: flit install --symlink
4040
- name: Linting check
41-
run: ruff check ellar_sqlalchemy tests
41+
run: ruff check ellar_sql tests
4242
- name: mypy
43-
run: mypy ellar_sqlalchemy
43+
run: mypy ellar_sql

Makefile

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,26 @@ install-full: ## Install dependencies
1919
pre-commit install -f
2020

2121
lint:fmt ## Run code linters
22-
ruff check ellar_sqlalchemy tests
23-
mypy ellar_sqlalchemy
22+
ruff check ellar_sql tests
23+
mypy ellar_sql
2424

2525
fmt format:clean ## Run code formatters
26-
ruff format ellar_sqlalchemy tests
27-
ruff check --fix ellar_sqlalchemy tests
26+
ruff format ellar_sql tests
27+
ruff check --fix ellar_sql tests
2828

2929
test: ## Run tests
3030
pytest tests
3131

3232
test-cov: ## Run tests with coverage
33-
pytest --cov=ellar_sqlalchemy --cov-report term-missing tests
33+
pytest --cov=ellar_sql --cov-report term-missing tests
3434

3535
pre-commit-lint: ## Runs Requires commands during pre-commit
3636
make clean
3737
make fmt
3838
make lint
39+
40+
doc-deploy:clean ## Run Deploy Documentation
41+
mkdocs gh-deploy --force --ignore-version
42+
43+
doc-serve: ## Launch doc local server
44+
mkdocs serve

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Then, in `models/base.py` define your model base as shown below:
5252
from datetime import datetime
5353
from sqlalchemy import DateTime, func
5454
from sqlalchemy.orm import Mapped, mapped_column
55-
from ellar_sqlalchemy.model import Model
55+
from ellar_sql.model import Model
5656

5757

5858
class Base(Model):
@@ -89,7 +89,7 @@ from ellar.app import App
8989
from ellar.common import Module, IApplicationStartup
9090
from ellar.core import ModuleBase
9191
from ellar.di import Container
92-
from ellar_sqlalchemy import EllarSQLAlchemyModule, EllarSQLAlchemyService
92+
from ellar_sql import EllarSQLAlchemyModule, EllarSQLService
9393

9494
from .controllers import DbController
9595

@@ -116,7 +116,7 @@ class DbModule(ModuleBase, IApplicationStartup):
116116
"""
117117

118118
async def on_startup(self, app: App) -> None:
119-
db_service = app.injector.get(EllarSQLAlchemyService)
119+
db_service = app.injector.get(EllarSQLService)
120120
db_service.create_all()
121121

122122
def register_providers(self, container: Container) -> None:

ellar_sqlalchemy/__init__.py renamed to ellar_sql/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
__version__ = "0.0.1"
44

5-
from .module import EllarSQLAlchemyModule
5+
from .module import EllarSQLModule
66
from .pagination import LimitOffsetPagination, PageNumberPagination, paginate
77
from .query import (
88
first_or_404,
@@ -13,11 +13,11 @@
1313
one_or_404_async,
1414
)
1515
from .schemas import MigrationOption, SQLAlchemyConfig
16-
from .services import EllarSQLAlchemyService
16+
from .services import EllarSQLService
1717

1818
__all__ = [
19-
"EllarSQLAlchemyModule",
20-
"EllarSQLAlchemyService",
19+
"EllarSQLModule",
20+
"EllarSQLService",
2121
"SQLAlchemyConfig",
2222
"MigrationOption",
2323
"get_or_404_async",
File renamed without changes.

ellar_sqlalchemy/cli/commands.py renamed to ellar_sql/cli/commands.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import ellar_cli.click as click
22
from ellar.app import current_injector
33

4-
from ellar_sqlalchemy.services import EllarSQLAlchemyService
4+
from ellar_sql.services import EllarSQLService
55

66
from .handlers import CLICommandHandlers
77

88

99
def _get_handler_context(ctx: click.Context) -> CLICommandHandlers:
10-
db_service = current_injector.get(EllarSQLAlchemyService)
10+
db_service = current_injector.get(EllarSQLService)
1111
return CLICommandHandlers(db_service)
1212

1313

ellar_sqlalchemy/cli/handlers.py renamed to ellar_sql/cli/handlers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from alembic.util.exc import CommandError
1313
from ellar.app import App
1414

15-
from ellar_sqlalchemy.services import EllarSQLAlchemyService
15+
from ellar_sql.services import EllarSQLService
1616

1717
RevIdType = t.Union[str, t.List[str], t.Tuple[str, ...]]
1818

@@ -35,7 +35,7 @@ def wrapped(*args: t.Any, **kwargs: t.Any) -> None:
3535

3636

3737
class CLICommandHandlers:
38-
def __init__(self, db_service: EllarSQLAlchemyService) -> None:
38+
def __init__(self, db_service: EllarSQLService) -> None:
3939
self.db_service = db_service
4040

4141
def get_config(
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)