tpeetz/kontor
1
0
Fork 0
Code Issues 6 Pull Requests 2 Actions Packages Projects Releases 2 Wiki Activity

remove obsolete kontor.py #61

Merged
tpeetz merged 166 commits from develop/0.1.0 into main 2025-04-30 15:31:19 +00:00
Conversation 2 Commits 166 Files Changed 1043
+2 -13
4 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 525d82cbda - Show all commits
kontor-scripts/export.py
+2 -1
View File
@@ -9,7 +9,8 @@ from sqlalchemy.orm import sessionmaker
from platformdirs import PlatformDirs from platformdirs import PlatformDirs
from pathlib import Path from pathlib import Path
from schema import Base, KontorDB from schema.base import Base
from schema.database import KontorDB
from config import get_logger from config import get_logger
from schema.database import ExportType from schema.database import ExportType
kontor-scripts/schema/comic.py
-4
View File
@@ -1,9 +1,5 @@
<<<<<<<< HEAD:kontor-scripts/schema/comic.py
from sqlalchemy import Column, ForeignKey, Integer, String from sqlalchemy import Column, ForeignKey, Integer, String
from sqlalchemy.dialects.mysql import BIT from sqlalchemy.dialects.mysql import BIT
========
from sqlalchemy import Boolean, Column, ForeignKey, Integer, String
>>>>>>>> 934ef82 (Resolve "evaluate uv"):kontor-api/src/schema/comic.py
from sqlalchemy.orm import relationship from sqlalchemy.orm import relationship
from .base import Base, BaseMixin from .base import Base, BaseMixin
kontor-scripts/schema/metadata.py
-4
View File
@@ -1,9 +1,5 @@
<<<<<<<< HEAD:kontor-scripts/schema/metadata.py
from sqlalchemy import Column, String, ForeignKey, Integer from sqlalchemy import Column, String, ForeignKey, Integer
from sqlalchemy.dialects.mysql import BIT from sqlalchemy.dialects.mysql import BIT
========
from sqlalchemy import Column, String, ForeignKey, Integer, Boolean
>>>>>>>> 934ef82 (Resolve "evaluate uv"):kontor-api/src/schema/metadata.py
from sqlalchemy.orm import relationship from sqlalchemy.orm import relationship
from .base import Base, BaseMixin from .base import Base, BaseMixin
kontor-scripts/schema/tysc.py
-4
View File
@@ -1,9 +1,5 @@
<<<<<<<< HEAD:kontor-scripts/schema/tysc.py
from sqlalchemy import Column, Integer, String, ForeignKey, UniqueConstraint from sqlalchemy import Column, Integer, String, ForeignKey, UniqueConstraint
from sqlalchemy.dialects.mysql import BIT from sqlalchemy.dialects.mysql import BIT
========
from sqlalchemy import Boolean, Column, Integer, String, ForeignKey, UniqueConstraint
>>>>>>>> 934ef82 (Resolve "evaluate uv"):kontor-api/src/schema/tysc.py
from sqlalchemy.orm import relationship from sqlalchemy.orm import relationship
from .base import Base, BaseMixin from .base import Base, BaseMixin