From 0be448a0021323fb47734b1c1be27da1ec854e49 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Thu, 13 Mar 2025 14:47:22 +0100
Subject: [PATCH] Finish plomtask to taskplom renaming internally.
---
scripts/pre-commit | 2 +-
src/run.py | 6 +++---
src/{plomtask => taskplom}/__init__.py | 0
src/{plomtask => taskplom}/conditions.py | 6 +++---
src/{plomtask => taskplom}/dating.py | 2 +-
src/{plomtask => taskplom}/days.py | 6 +++---
src/{plomtask => taskplom}/db.py | 2 +-
src/{plomtask => taskplom}/exceptions.py | 0
src/{plomtask => taskplom}/http.py | 16 ++++++++--------
src/{plomtask => taskplom}/misc.py | 0
src/{plomtask => taskplom}/processes.py | 10 +++++-----
src/{plomtask => taskplom}/todos.py | 14 +++++++-------
.../versioned_attributes.py | 4 ++--
tests/conditions.py | 2 +-
tests/days.py | 8 ++++----
tests/misc.py | 4 ++--
tests/processes.py | 4 ++--
tests/todos.py | 6 +++---
tests/utils.py | 16 ++++++++--------
19 files changed, 54 insertions(+), 54 deletions(-)
rename src/{plomtask => taskplom}/__init__.py (100%)
rename src/{plomtask => taskplom}/conditions.py (94%)
rename src/{plomtask => taskplom}/dating.py (95%)
rename src/{plomtask => taskplom}/days.py (96%)
rename src/{plomtask => taskplom}/db.py (99%)
rename src/{plomtask => taskplom}/exceptions.py (100%)
rename src/{plomtask => taskplom}/http.py (98%)
rename src/{plomtask => taskplom}/misc.py (100%)
rename src/{plomtask => taskplom}/processes.py (97%)
rename src/{plomtask => taskplom}/todos.py (97%)
rename src/{plomtask => taskplom}/versioned_attributes.py (97%)
diff --git a/scripts/pre-commit b/scripts/pre-commit
index 532f2dd..3707445 100755
--- a/scripts/pre-commit
+++ b/scripts/pre-commit
@@ -1,5 +1,5 @@
#!/bin/sh
-DIRS='src src/plomtask tests'
+DIRS='src src/taskplom tests'
TOOLS='flake8 pylint mypy'
for dir in $DIRS; do
for tool in $TOOLS; do
diff --git a/src/run.py b/src/run.py
index 6958bb3..9442c0a 100755
--- a/src/run.py
+++ b/src/run.py
@@ -8,9 +8,9 @@ from sys import exit as sys_exit
# non-standard libs
try:
from plomlib.db import PlomDbException
- from plomtask.exceptions import HandledException
- from plomtask.http import TaskHandler, TaskServer
- from plomtask.db import DatabaseFile
+ from taskplom.exceptions import HandledException
+ from taskplom.http import TaskHandler, TaskServer
+ from taskplom.db import DatabaseFile
except ModuleNotFoundError as e:
print(f"Missing dependency: {e}. Please run with 'install_deps' argument.")
sys_exit(1)
diff --git a/src/plomtask/__init__.py b/src/taskplom/__init__.py
similarity index 100%
rename from src/plomtask/__init__.py
rename to src/taskplom/__init__.py
diff --git a/src/plomtask/conditions.py b/src/taskplom/conditions.py
similarity index 94%
rename from src/plomtask/conditions.py
rename to src/taskplom/conditions.py
index 2240baf..456b99a 100644
--- a/src/plomtask/conditions.py
+++ b/src/taskplom/conditions.py
@@ -1,8 +1,8 @@
"""Non-doable elements of ProcessStep/Todo chains."""
from __future__ import annotations
-from plomtask.db import DatabaseConnection, BaseModel
-from plomtask.versioned_attributes import VersionedAttribute
-from plomtask.exceptions import HandledException
+from taskplom.db import DatabaseConnection, BaseModel
+from taskplom.versioned_attributes import VersionedAttribute
+from taskplom.exceptions import HandledException
class Condition(BaseModel):
diff --git a/src/plomtask/dating.py b/src/taskplom/dating.py
similarity index 95%
rename from src/plomtask/dating.py
rename to src/taskplom/dating.py
index 73e0489..4ea9d5a 100644
--- a/src/plomtask/dating.py
+++ b/src/taskplom/dating.py
@@ -1,6 +1,6 @@
"""Various utilities for handling dates."""
from datetime import date as dt_date, timedelta
-from plomtask.exceptions import BadFormatException
+from taskplom.exceptions import BadFormatException
def dt_date_from_str(date_str: str) -> dt_date:
diff --git a/src/plomtask/days.py b/src/taskplom/days.py
similarity index 96%
rename from src/plomtask/days.py
rename to src/taskplom/days.py
index ebd16f1..89eaa2c 100644
--- a/src/plomtask/days.py
+++ b/src/taskplom/days.py
@@ -3,9 +3,9 @@ from __future__ import annotations
from typing import Any, Self
from sqlite3 import Row
from datetime import date as dt_date, timedelta
-from plomtask.db import DatabaseConnection, BaseModel
-from plomtask.todos import Todo
-from plomtask.dating import dt_date_from_days_n, days_n_from_dt_date
+from taskplom.db import DatabaseConnection, BaseModel
+from taskplom.todos import Todo
+from taskplom.dating import dt_date_from_days_n, days_n_from_dt_date
class Day(BaseModel):
diff --git a/src/plomtask/db.py b/src/taskplom/db.py
similarity index 99%
rename from src/plomtask/db.py
rename to src/taskplom/db.py
index 113a95b..1a0f07b 100644
--- a/src/plomtask/db.py
+++ b/src/taskplom/db.py
@@ -5,7 +5,7 @@ from os import listdir
from pathlib import Path
from sqlite3 import Row
from typing import cast, Any, Self, Callable
-from plomtask.exceptions import (HandledException, NotFoundException,
+from taskplom.exceptions import (HandledException, NotFoundException,
BadFormatException)
from plomlib.db import (
PlomDbConn, PlomDbFile, PlomDbMigration, TypePlomDbMigration)
diff --git a/src/plomtask/exceptions.py b/src/taskplom/exceptions.py
similarity index 100%
rename from src/plomtask/exceptions.py
rename to src/taskplom/exceptions.py
diff --git a/src/plomtask/http.py b/src/taskplom/http.py
similarity index 98%
rename from src/plomtask/http.py
rename to src/taskplom/http.py
index 3d969cf..c2522d6 100644
--- a/src/plomtask/http.py
+++ b/src/taskplom/http.py
@@ -6,16 +6,16 @@ from typing import Any, Callable
from base64 import b64encode, b64decode
from binascii import Error as binascii_Exception
from json import dumps as json_dumps
-from plomtask.dating import (
+from taskplom.dating import (
days_n_from_dt_date, dt_date_from_str, date_in_n_days)
-from plomtask.days import Day
-from plomtask.exceptions import (HandledException, BadFormatException,
+from taskplom.days import Day
+from taskplom.exceptions import (HandledException, BadFormatException,
NotFoundException)
-from plomtask.db import DatabaseConnection, DatabaseFile, BaseModel
-from plomtask.processes import Process, ProcessStep, ProcessStepsNode
-from plomtask.conditions import Condition
-from plomtask.todos import Todo, TodoOrProcStepNode
-from plomtask.misc import DictableNode
+from taskplom.db import DatabaseConnection, DatabaseFile, BaseModel
+from taskplom.processes import Process, ProcessStep, ProcessStepsNode
+from taskplom.conditions import Condition
+from taskplom.todos import Todo, TodoOrProcStepNode
+from taskplom.misc import DictableNode
from plomlib.web import PlomHttpServer, PlomHttpHandler, PlomQueryMap
TEMPLATES_DIR = Path('templates')
diff --git a/src/plomtask/misc.py b/src/taskplom/misc.py
similarity index 100%
rename from src/plomtask/misc.py
rename to src/taskplom/misc.py
diff --git a/src/plomtask/processes.py b/src/taskplom/processes.py
similarity index 97%
rename from src/plomtask/processes.py
rename to src/taskplom/processes.py
index e23e97d..9a63fff 100644
--- a/src/plomtask/processes.py
+++ b/src/taskplom/processes.py
@@ -2,11 +2,11 @@
from __future__ import annotations
from typing import Set, Self, Any
from sqlite3 import Row
-from plomtask.misc import DictableNode
-from plomtask.db import DatabaseConnection, BaseModel
-from plomtask.versioned_attributes import VersionedAttribute
-from plomtask.conditions import Condition, ConditionsRelations
-from plomtask.exceptions import (NotFoundException, BadFormatException,
+from taskplom.misc import DictableNode
+from taskplom.db import DatabaseConnection, BaseModel
+from taskplom.versioned_attributes import VersionedAttribute
+from taskplom.conditions import Condition, ConditionsRelations
+from taskplom.exceptions import (NotFoundException, BadFormatException,
HandledException)
diff --git a/src/plomtask/todos.py b/src/taskplom/todos.py
similarity index 97%
rename from src/plomtask/todos.py
rename to src/taskplom/todos.py
index 2be57d4..275115f 100644
--- a/src/plomtask/todos.py
+++ b/src/taskplom/todos.py
@@ -3,14 +3,14 @@ from __future__ import annotations
from datetime import date as dt_date
from typing import Any, Self, Set
from sqlite3 import Row
-from plomtask.misc import DictableNode
-from plomtask.db import DatabaseConnection, BaseModel
-from plomtask.processes import Process, ProcessStepsNode
-from plomtask.versioned_attributes import VersionedAttribute
-from plomtask.conditions import Condition, ConditionsRelations
-from plomtask.exceptions import (NotFoundException, BadFormatException,
+from taskplom.misc import DictableNode
+from taskplom.db import DatabaseConnection, BaseModel
+from taskplom.processes import Process, ProcessStepsNode
+from taskplom.versioned_attributes import VersionedAttribute
+from taskplom.conditions import Condition, ConditionsRelations
+from taskplom.exceptions import (NotFoundException, BadFormatException,
HandledException)
-from plomtask.dating import (
+from taskplom.dating import (
days_n_from_dt_date, dt_date_from_str, dt_date_from_days_n)
diff --git a/src/plomtask/versioned_attributes.py b/src/taskplom/versioned_attributes.py
similarity index 97%
rename from src/plomtask/versioned_attributes.py
rename to src/taskplom/versioned_attributes.py
index f5e17f3..b57a83b 100644
--- a/src/plomtask/versioned_attributes.py
+++ b/src/taskplom/versioned_attributes.py
@@ -3,8 +3,8 @@ from datetime import datetime
from typing import Any
from sqlite3 import Row
from time import sleep
-from plomtask.db import DatabaseConnection
-from plomtask.exceptions import (HandledException, BadFormatException,
+from taskplom.db import DatabaseConnection
+from taskplom.exceptions import (HandledException, BadFormatException,
NotFoundException)
TIMESTAMP_FMT = '%Y-%m-%d %H:%M:%S.%f'
diff --git a/tests/conditions.py b/tests/conditions.py
index b35dc6e..e5306a2 100644
--- a/tests/conditions.py
+++ b/tests/conditions.py
@@ -2,7 +2,7 @@
from typing import Any
from tests.utils import (TestCaseSansDB, TestCaseWithDB, TestCaseWithServer,
Expected)
-from plomtask.conditions import Condition
+from taskplom.conditions import Condition
class TestsSansDB(TestCaseSansDB):
diff --git a/tests/days.py b/tests/days.py
index e5a241f..fa08f91 100644
--- a/tests/days.py
+++ b/tests/days.py
@@ -3,10 +3,10 @@ from datetime import date as dt_date, datetime, timedelta
from typing import Any
from tests.utils import (TestCaseSansDB, TestCaseWithDB, TestCaseWithServer,
Expected, date_and_day_id, dt_date_from_day_id)
-from plomtask.dating import date_in_n_days as tested_date_in_n_days
-from plomtask.days import Day
+from taskplom.dating import date_in_n_days as tested_date_in_n_days
+from taskplom.days import Day
-# Simply the ISO format for dates as used in plomtask.dating, but for testing
+# Simply the ISO format for dates as used in taskplom.dating, but for testing
# purposes we state our expectations here independently and explicitly
TESTING_DATE_FORMAT = '%Y-%m-%d'
@@ -15,7 +15,7 @@ def _testing_date_in_n_days(n: int) -> str:
"""Return in ISO format / TEST_DATE_FORMAT date from today + n days.
As with TESTING_DATE_FORMAT, we assume this equal the original's code
- at plomtask.dating.date_in_n_days, but want to state our expectations
+ at taskplom.dating.date_in_n_days, but want to state our expectations
explicitly to rule out importing issues from the original.
"""
date = dt_date.today() + timedelta(days=n)
diff --git a/tests/misc.py b/tests/misc.py
index c26e83d..86b818d 100644
--- a/tests/misc.py
+++ b/tests/misc.py
@@ -2,8 +2,8 @@
from typing import Callable
from unittest import TestCase
from tests.utils import TestCaseWithServer
-from plomtask.http import InputsParser
-from plomtask.exceptions import BadFormatException
+from taskplom.http import InputsParser
+from taskplom.exceptions import BadFormatException
class TestsSansServer(TestCase):
diff --git a/tests/processes.py b/tests/processes.py
index a762ebe..6b17189 100644
--- a/tests/processes.py
+++ b/tests/processes.py
@@ -2,8 +2,8 @@
from typing import Any
from tests.utils import (TestCaseSansDB, TestCaseWithDB, TestCaseWithServer,
Expected)
-from plomtask.processes import Process, ProcessStep
-from plomtask.exceptions import NotFoundException
+from taskplom.processes import Process, ProcessStep
+from taskplom.exceptions import NotFoundException
class TestsSansDB(TestCaseSansDB):
diff --git a/tests/todos.py b/tests/todos.py
index 759bc12..ef77b81 100644
--- a/tests/todos.py
+++ b/tests/todos.py
@@ -3,9 +3,9 @@ from typing import Any
from datetime import date as dt_date, timedelta
from tests.utils import (TestCaseSansDB, TestCaseWithDB, TestCaseWithServer,
Expected, date_and_day_id)
-from plomtask.todos import Todo
-from plomtask.processes import Process
-from plomtask.exceptions import BadFormatException, HandledException
+from taskplom.todos import Todo
+from taskplom.processes import Process
+from taskplom.exceptions import BadFormatException, HandledException
class TestsWithDB(TestCaseWithDB, TestCaseSansDB):
diff --git a/tests/utils.py b/tests/utils.py
index 071ad1f..55a53c9 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -22,15 +22,15 @@ from uuid import uuid4
NAME_SRC_DIR = 'src'
sys_path[0:0] = [NAME_SRC_DIR]
# pylint: disable=wrong-import-position
-from plomtask.db import DatabaseFile, DatabaseConnection # noqa: E402
-from plomtask.http import TaskHandler, TaskServer # noqa: E402
-from plomtask.processes import Process, ProcessStep # noqa: E402
-from plomtask.conditions import Condition # noqa: E402
-from plomtask.days import Day # noqa: E402
-from plomtask.todos import Todo # noqa: E402
-from plomtask.versioned_attributes import ( # noqa: E402
+from taskplom.db import DatabaseFile, DatabaseConnection # noqa: E402
+from taskplom.http import TaskHandler, TaskServer # noqa: E402
+from taskplom.processes import Process, ProcessStep # noqa: E402
+from taskplom.conditions import Condition # noqa: E402
+from taskplom.days import Day # noqa: E402
+from taskplom.todos import Todo # noqa: E402
+from taskplom.versioned_attributes import ( # noqa: E402
VersionedAttribute, TIMESTAMP_FMT)
-from plomtask.exceptions import ( # noqa: E402
+from taskplom.exceptions import ( # noqa: E402
NotFoundException, HandledException)
--
2.30.2