diff --git a/Makefile b/Makefile index 5aca01d..dac627d 100644 --- a/Makefile +++ b/Makefile @@ -8,15 +8,15 @@ endif all: black test typehint lint black: - poetry run isort --multi-line 3 --profile black src/ tests/ - poetry run black --target-version py311 src/ tests/ + rye run isort --multi-line 3 --profile black src/ tests/ + rye run black --target-version py311 src/ tests/ test: rye run coverage run -m --source=stacosys pytest tests rye run coverage report typehint: - rye run mypy --ignore-missing-imports stacosys/ tests/ + rye run mypy --ignore-missing-imports src/ tests/ lint: rye run pylint src/ diff --git a/src/stacosys/__init__.py b/src/stacosys/__init__.py deleted file mode 100644 index cc43c5e..0000000 --- a/src/stacosys/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -# from run import stacosys_server -# -# if __name__ == '__main__': -# parser = argparse.ArgumentParser() -# parser.add_argument("config", help="config path name") -# args = parser.parse_args() -# stacosys_server(args.config) diff --git a/src/stacosys/db/__init__.py b/src/stacosys/db/__init__.py index 01b2a36..fd23efe 100644 --- a/src/stacosys/db/__init__.py +++ b/src/stacosys/db/__init__.py @@ -5,7 +5,6 @@ from pydal import DAL, Field class Database: - db_dal = DAL() def configure(self, db_uri): diff --git a/src/stacosys/service/configuration.py b/src/stacosys/service/configuration.py index 986409e..ef348e9 100644 --- a/src/stacosys/service/configuration.py +++ b/src/stacosys/service/configuration.py @@ -30,7 +30,6 @@ class ConfigParameter(Enum): class Config: - _cfg = configparser.ConfigParser() def load(self, config_pathname): diff --git a/tests/test_db.py b/tests/test_db.py index 9b235b0..f82b389 100644 --- a/tests/test_db.py +++ b/tests/test_db.py @@ -83,13 +83,20 @@ def create_comment(url, author_name, content): def test_find_recent_published_comments(setup_db): - - comments = [create_comment("/post", "Adam", "Comment 1"), create_comment("/post", "Arf", "Comment 2"), - create_comment("/post", "Arwin", "Comment 3"), create_comment("/post", "Bill", "Comment 4"), - create_comment("/post", "Bo", "Comment 5"), create_comment("/post", "Charles", "Comment 6"), - create_comment("/post", "Dan", "Comment 7"), create_comment("/post", "Dwayne", "Comment 8"), - create_comment("/post", "Erl", "Comment 9"), create_comment("/post", "Jay", "Comment 10"), - create_comment("/post", "Kenny", "Comment 11"), create_comment("/post", "Lord", "Comment 12")] + comments = [ + create_comment("/post", "Adam", "Comment 1"), + create_comment("/post", "Arf", "Comment 2"), + create_comment("/post", "Arwin", "Comment 3"), + create_comment("/post", "Bill", "Comment 4"), + create_comment("/post", "Bo", "Comment 5"), + create_comment("/post", "Charles", "Comment 6"), + create_comment("/post", "Dan", "Comment 7"), + create_comment("/post", "Dwayne", "Comment 8"), + create_comment("/post", "Erl", "Comment 9"), + create_comment("/post", "Jay", "Comment 10"), + create_comment("/post", "Kenny", "Comment 11"), + create_comment("/post", "Lord", "Comment 12"), + ] rows = dao.find_recent_published_comments() assert len(rows) == 0