From 36b7972b26d940566b45dd3be8ed7b7e276264a9 Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Tue, 17 Nov 2026 20:26:53 +0200 Subject: [PATCH] style: add more pylint checks and update code for them --- .pylint.toml | 43 ++++---- .../application/application/application.py | 2 +- .../application/application_properties.py | 4 +- .../application/application_repository.py | 13 ++- .../src/ahriman/application/handlers/add.py | 2 +- .../ahriman/application/handlers/archives.py | 6 +- .../ahriman/application/handlers/change.py | 8 +- .../src/ahriman/application/handlers/copy.py | 4 +- .../src/ahriman/application/handlers/hold.py | 8 +- .../src/ahriman/application/handlers/patch.py | 16 +-- .../ahriman/application/handlers/pkgbuild.py | 8 +- .../ahriman/application/handlers/rebuild.py | 2 +- .../ahriman/application/handlers/rollback.py | 2 +- .../application/handlers/service_updates.py | 2 +- .../application/handlers/statistics.py | 2 +- .../application/handlers/status_update.py | 16 +-- .../src/ahriman/application/handlers/users.py | 14 +-- ahriman-core/src/ahriman/application/lock.py | 4 +- ahriman-core/src/ahriman/core/alpm/pacman.py | 2 +- .../src/ahriman/core/alpm/pkgbuild_parser.py | 104 +++++++++--------- .../src/ahriman/core/gitremote/remote_pull.py | 2 +- .../src/ahriman/core/gitremote/remote_push.py | 2 +- .../src/ahriman/core/log/log_loader.py | 12 +- .../src/ahriman/core/report/jinja_template.py | 4 +- .../src/ahriman/core/report/report.py | 8 +- ahriman-core/src/ahriman/core/report/rss.py | 2 +- .../ahriman/core/repository/event_logger.py | 4 +- .../src/ahriman/core/repository/executor.py | 4 +- .../src/ahriman/core/repository/repository.py | 4 +- .../core/repository/repository_properties.py | 4 +- .../ahriman/core/repository/update_handler.py | 14 +-- ahriman-core/src/ahriman/core/sign/gpg.py | 8 +- .../src/ahriman/core/status/client.py | 10 +- .../src/ahriman/core/status/watcher.py | 12 +- .../src/ahriman/core/upload/upload.py | 6 +- ahriman-core/src/ahriman/models/action.py | 12 +- .../src/ahriman/models/auth_settings.py | 20 ++-- ahriman-core/src/ahriman/models/build_plan.py | 36 +++--- .../src/ahriman/models/build_status.py | 22 ++-- ahriman-core/src/ahriman/models/event.py | 32 +++--- .../src/ahriman/models/log_handler.py | 12 +- ahriman-core/src/ahriman/models/log_record.py | 7 +- ahriman-core/src/ahriman/models/package.py | 12 +- .../src/ahriman/models/package_source.py | 38 +++---- .../ahriman/models/pacman_synchronization.py | 12 +- .../src/ahriman/models/pkgbuild_patch.py | 3 +- .../src/ahriman/models/remote_source.py | 2 +- .../src/ahriman/models/report_settings.py | 30 ++--- .../src/ahriman/models/sign_settings.py | 18 +-- .../src/ahriman/models/smtp_ssl_settings.py | 6 +- .../src/ahriman/models/upload_settings.py | 24 ++-- ahriman-core/src/ahriman/models/user.py | 4 +- .../src/ahriman/models/user_access.py | 16 +-- .../application/test_application.py | 12 +- .../application/test_application_packages.py | 8 +- .../application/handlers/test_handler.py | 2 +- .../application/handlers/test_handler_add.py | 2 +- .../handlers/test_handler_archives.py | 2 +- .../handlers/test_handler_change.py | 4 +- .../application/handlers/test_handler_copy.py | 4 +- .../application/handlers/test_handler_hold.py | 4 +- .../handlers/test_handler_patch.py | 8 +- .../handlers/test_handler_pkgbuild.py | 4 +- .../handlers/test_handler_rebuild.py | 10 +- .../handlers/test_handler_setup.py | 2 +- .../handlers/test_handler_statistics.py | 2 +- .../handlers/test_handler_status.py | 14 +-- .../handlers/test_handler_status_update.py | 6 +- .../handlers/test_handler_update.py | 6 +- .../handlers/test_handler_users.py | 10 +- .../tests/ahriman/application/test_ahriman.py | 36 +++--- .../tests/ahriman/application/test_lock.py | 4 +- ahriman-core/tests/ahriman/conftest.py | 2 +- .../tests/ahriman/core/alpm/test_pacman.py | 4 +- .../ahriman/core/build_tools/test_sources.py | 2 +- .../operations/test_auth_operations.py | 26 ++--- .../operations/test_event_operations.py | 6 +- .../tests/ahriman/core/formatters/conftest.py | 2 +- .../core/formatters/test_update_printer.py | 4 +- .../tests/ahriman/core/log/test_log_loader.py | 14 +-- .../tests/ahriman/core/report/test_email.py | 2 +- .../tests/ahriman/core/report/test_report.py | 2 +- .../tests/ahriman/core/report/test_rss.py | 8 +- .../tests/ahriman/core/repository/conftest.py | 6 +- .../core/repository/test_event_logger.py | 10 +- .../repository/test_repository_properties.py | 4 +- .../core/repository/test_update_handler.py | 24 ++-- .../tests/ahriman/core/sign/test_gpg.py | 30 ++--- .../tests/ahriman/core/status/test_client.py | 16 +-- .../ahriman/core/status/test_event_bus.py | 28 ++--- .../ahriman/core/status/test_local_client.py | 10 +- .../tests/ahriman/core/status/test_watcher.py | 40 +++---- .../ahriman/core/status/test_web_client.py | 34 +++--- .../tests/ahriman/core/upload/test_upload.py | 2 +- ahriman-core/tests/ahriman/models/conftest.py | 2 +- .../ahriman/models/test_auth_settings.py | 28 ++--- .../tests/ahriman/models/test_build_plan.py | 16 +-- .../tests/ahriman/models/test_build_status.py | 6 +- .../tests/ahriman/models/test_counters.py | 4 +- .../tests/ahriman/models/test_event.py | 2 +- .../ahriman/models/test_package_source.py | 18 +-- .../ahriman/models/test_remote_source.py | 4 +- .../ahriman/models/test_report_settings.py | 22 ++-- .../ahriman/models/test_sign_settings.py | 16 +-- .../ahriman/models/test_smtp_ssl_settings.py | 2 +- .../ahriman/models/test_upload_settings.py | 18 +-- .../tests/ahriman/models/test_user.py | 24 ++-- .../tests/ahriman/models/test_user_access.py | 36 +++--- .../core/support/test_package_creator.py | 2 +- ahriman-web/src/ahriman/core/auth/auth.py | 8 +- ahriman-web/src/ahriman/core/auth/mapping.py | 4 +- ahriman-web/src/ahriman/core/auth/oauth.py | 4 +- ahriman-web/src/ahriman/core/auth/pam.py | 4 +- .../src/ahriman/web/apispec/decorators.py | 2 +- ahriman-web/src/ahriman/web/apispec/info.py | 4 +- ahriman-web/src/ahriman/web/keys.py | 20 ++-- .../ahriman/web/middlewares/auth_handler.py | 10 +- .../web/schemas/event_bus_filter_schema.py | 2 +- .../src/ahriman/web/schemas/event_schema.py | 2 +- .../web/schemas/event_search_schema.py | 2 +- .../src/ahriman/web/schemas/sse_schema.py | 2 +- ahriman-web/src/ahriman/web/views/api/docs.py | 2 +- .../src/ahriman/web/views/api/swagger.py | 2 +- ahriman-web/src/ahriman/web/views/base.py | 16 +-- ahriman-web/src/ahriman/web/views/index.py | 2 +- ahriman-web/src/ahriman/web/views/static.py | 2 +- .../web/views/v1/auditlog/event_bus.py | 20 ++-- .../ahriman/web/views/v1/auditlog/events.py | 2 +- .../web/views/v1/distributed/workers.py | 2 +- .../ahriman/web/views/v1/packages/archives.py | 2 +- .../ahriman/web/views/v1/packages/changes.py | 4 +- .../web/views/v1/packages/dependencies.py | 4 +- .../src/ahriman/web/views/v1/packages/hold.py | 2 +- .../src/ahriman/web/views/v1/packages/logs.py | 4 +- .../ahriman/web/views/v1/packages/package.py | 4 +- .../ahriman/web/views/v1/packages/packages.py | 4 +- .../ahriman/web/views/v1/packages/patch.py | 4 +- .../ahriman/web/views/v1/packages/patches.py | 4 +- .../src/ahriman/web/views/v1/service/add.py | 2 +- .../ahriman/web/views/v1/service/config.py | 2 +- .../src/ahriman/web/views/v1/service/logs.py | 2 +- .../src/ahriman/web/views/v1/service/pgp.py | 4 +- .../ahriman/web/views/v1/service/process.py | 2 +- .../ahriman/web/views/v1/service/rebuild.py | 2 +- .../ahriman/web/views/v1/service/remove.py | 2 +- .../ahriman/web/views/v1/service/request.py | 2 +- .../ahriman/web/views/v1/service/rollback.py | 2 +- .../ahriman/web/views/v1/service/search.py | 2 +- .../ahriman/web/views/v1/service/update.py | 2 +- .../ahriman/web/views/v1/service/upload.py | 2 +- .../src/ahriman/web/views/v1/status/info.py | 2 +- .../ahriman/web/views/v1/status/metrics.py | 2 +- .../web/views/v1/status/repositories.py | 2 +- .../src/ahriman/web/views/v1/status/status.py | 4 +- .../src/ahriman/web/views/v1/user/login.py | 2 +- .../src/ahriman/web/views/v1/user/logout.py | 2 +- .../src/ahriman/web/views/v2/packages/logs.py | 2 +- .../src/ahriman/web/views/v2/status/info.py | 2 +- ahriman-web/src/ahriman/web/web.py | 18 +-- .../handlers/web/test_handler_web.py | 2 +- .../tests/ahriman/core/auth/test_auth.py | 2 +- .../tests/ahriman/core/auth/test_mapping.py | 2 +- .../tests/ahriman/core/auth/test_pam.py | 8 +- .../ahriman/web/apispec/test_decorators.py | 14 +-- .../tests/ahriman/web/apispec/test_info.py | 4 +- ahriman-web/tests/ahriman/web/conftest.py | 6 +- .../web/middlewares/test_auth_handler.py | 28 ++--- ahriman-web/tests/ahriman/web/test_cors.py | 6 +- ahriman-web/tests/ahriman/web/test_web.py | 22 ++-- .../web/views/api/test_view_api_docs.py | 2 +- .../web/views/api/test_view_api_swagger.py | 2 +- .../tests/ahriman/web/views/test_view_base.py | 8 +- .../ahriman/web/views/test_view_index.py | 2 +- .../ahriman/web/views/test_view_static.py | 2 +- .../test_view_v1_auditlog_event_bus.py | 46 ++++---- .../auditlog/test_view_v1_auditlog_events.py | 2 +- .../test_view_v1_distributed_workers.py | 2 +- .../test_view_v1_packages_archives.py | 4 +- .../packages/test_view_v1_packages_changes.py | 8 +- .../test_view_v1_packages_dependencies.py | 8 +- .../v1/packages/test_view_v1_packages_hold.py | 4 +- .../v1/packages/test_view_v1_packages_logs.py | 12 +- .../packages/test_view_v1_packages_package.py | 24 ++-- .../test_view_v1_packages_packages.py | 12 +- .../packages/test_view_v1_packages_patch.py | 12 +- .../packages/test_view_v1_packages_patches.py | 12 +- .../v1/service/test_view_v1_service_add.py | 2 +- .../v1/service/test_view_v1_service_config.py | 4 +- .../v1/service/test_view_v1_service_logs.py | 6 +- .../v1/service/test_view_v1_service_pgp.py | 4 +- .../service/test_view_v1_service_process.py | 2 +- .../service/test_view_v1_service_rebuild.py | 2 +- .../v1/service/test_view_v1_service_remove.py | 2 +- .../service/test_view_v1_service_request.py | 2 +- .../service/test_view_v1_service_rollback.py | 2 +- .../v1/service/test_view_v1_service_search.py | 2 +- .../v1/service/test_view_v1_service_update.py | 2 +- .../v1/service/test_view_v1_service_upload.py | 2 +- .../v1/status/test_view_v1_status_info.py | 2 +- .../v1/status/test_view_v1_status_metrics.py | 2 +- .../test_view_v1_status_repositories.py | 2 +- .../v1/status/test_view_v1_status_status.py | 12 +- .../views/v1/user/test_view_v1_user_login.py | 12 +- .../views/v1/user/test_view_v1_user_logout.py | 2 +- .../v2/packages/test_view_v2_packages_logs.py | 12 +- .../v2/status/test_view_v2_status_info.py | 2 +- docs/advanced-usage/index.rst | 2 +- docs/advanced-usage/views.rst | 4 +- .../definition_order/__init__.py | 52 ++++----- tools/pylint_plugins/import_order/__init__.py | 24 ++-- .../ahriman_fixtures/__init__.py | 4 +- 211 files changed, 951 insertions(+), 955 deletions(-) diff --git a/.pylint.toml b/.pylint.toml index 95f4628c..06390614 100644 --- a/.pylint.toml +++ b/.pylint.toml @@ -1,8 +1,11 @@ [tool.pylint.main] init-hook = "sys.path.append('tools')" load-plugins = [ - "pylint.extensions.docparams", "pylint.extensions.bad_builtin", + "pylint.extensions.check_elif", + "pylint.extensions.docparams", + "pylint.extensions.overlapping_exceptions", + "pylint.extensions.typing", "pylint_plugins.definition_order", "pylint_plugins.import_order", ] @@ -17,29 +20,23 @@ max-parents = 15 [tool.pylint."messages control"] disable = [ - "raw-checker-failed", - "bad-inline-option", - "locally-disabled", - "file-ignored", - "suppressed-message", - "useless-suppression", - "deprecated-pragma", - "use-symbolic-message-instead", - "use-implicit-booleaness-not-comparison-to-string", - "use-implicit-booleaness-not-comparison-to-zero", - "missing-module-docstring", - "line-too-long", - "no-name-in-module", - "import-outside-toplevel", - "invalid-name", - "raise-missing-from", - "wrong-import-order", - "too-few-public-methods", - "too-many-instance-attributes", "broad-exception-caught", - "fixme", - "too-many-arguments", - "duplicate-code", "cyclic-import", + "duplicate-code", + "fixme", + "import-outside-toplevel", + "line-too-long", + "missing-module-docstring", + "no-name-in-module", + "raise-missing-from", + "raw-checker-failed", + "suppressed-message", + "too-few-public-methods", + "too-many-arguments", + "too-many-instance-attributes", "too-many-positional-arguments", + "wrong-import-order", ] + +[tool.pylint.string] +check-quote-consistency = true diff --git a/ahriman-core/src/ahriman/application/application/application.py b/ahriman-core/src/ahriman/application/application/application.py index c666fe1e..0e636fcc 100644 --- a/ahriman-core/src/ahriman/application/application/application.py +++ b/ahriman-core/src/ahriman/application/application/application.py @@ -175,6 +175,6 @@ class Application(ApplicationPackages, ApplicationRepository): # update existing package plan.add(packages.pop(package.base)) # append dependencies - plan.update(packages.values(), BuildPlanReason.RequiredBy, package.base) + plan.update(packages.values(), BuildPlanReason.REQUIRED_BY, package.base) return plan diff --git a/ahriman-core/src/ahriman/application/application/application_properties.py b/ahriman-core/src/ahriman/application/application/application_properties.py index bc7703a9..ad12a71f 100644 --- a/ahriman-core/src/ahriman/application/application/application_properties.py +++ b/ahriman-core/src/ahriman/application/application/application_properties.py @@ -38,14 +38,14 @@ class ApplicationProperties(LazyLogging): """ def __init__(self, repository_id: RepositoryId, configuration: Configuration, *, report: bool, - refresh_pacman_database: PacmanSynchronization = PacmanSynchronization.Disabled) -> None: + refresh_pacman_database: PacmanSynchronization = PacmanSynchronization.DISABLED) -> None: """ Args: repository_id(RepositoryId): repository unique identifier configuration(Configuration): configuration instance report(bool): force enable or disable reporting refresh_pacman_database(PacmanSynchronization, optional): pacman database synchronization level - (Default value = PacmanSynchronization.Disabled) + (Default value = PacmanSynchronization.DISABLED) """ self.configuration = configuration self.repository_id = repository_id diff --git a/ahriman-core/src/ahriman/application/application/application_repository.py b/ahriman-core/src/ahriman/application/application/application_repository.py index 6770dc81..b17ee194 100644 --- a/ahriman-core/src/ahriman/application/application/application_repository.py +++ b/ahriman-core/src/ahriman/application/application/application_repository.py @@ -200,15 +200,18 @@ class ApplicationRepository(ApplicationProperties): plan = BuildPlan() # always add already built packages, because they will be always added - plan.update(self.repository.load_archives(self.repository.packages_built()), BuildPlanReason.PreBuilt) + plan.update(self.repository.load_archives(self.repository.packages_built()), BuildPlanReason.PRE_BUILT) if manual: - plan.update(self.repository.updates_manual(), BuildPlanReason.ManualRequest) + plan.update(self.repository.updates_manual(), BuildPlanReason.MANUAL_REQUEST) if aur: - plan.update(self.repository.updates_aur(filter_packages, vcs=vcs), BuildPlanReason.RegularUpdate) + plan.update(self.repository.updates_aur(filter_packages, vcs=vcs), BuildPlanReason.REGULAR_UPDATE) if local: - plan.update(self.repository.updates_local(vcs=vcs), BuildPlanReason.LocalSourceUpdate) + plan.update(self.repository.updates_local(vcs=vcs), BuildPlanReason.LOCAL_SOURCE_UPDATE) if check_files: - plan.update(self.repository.updates_dependencies(filter_packages), BuildPlanReason.BrokenImplicitDependency) + plan.update( + self.repository.updates_dependencies(filter_packages), + BuildPlanReason.BROKEN_IMPLICIT_DEPENDENCY, + ) return plan diff --git a/ahriman-core/src/ahriman/application/handlers/add.py b/ahriman-core/src/ahriman/application/handlers/add.py index 74e23d9c..e53f9c31 100644 --- a/ahriman-core/src/ahriman/application/handlers/add.py +++ b/ahriman-core/src/ahriman/application/handlers/add.py @@ -85,7 +85,7 @@ class Add(Handler): action=argparse.BooleanOptionalAction, default=True) parser.add_argument("-n", "--now", help="run update function after", action="store_true") parser.add_argument("-s", "--source", help="explicitly specify the package source for this command", - type=PackageSource, choices=tuple(PackageSource), default=PackageSource.Auto) + type=PackageSource, choices=tuple(PackageSource), default=PackageSource.AUTO) parser.add_argument("-u", "--username", help="build as user", default=extract_user()) parser.add_argument("-v", "--variable", help="apply specified makepkg variables to the next build", action="append") diff --git a/ahriman-core/src/ahriman/application/handlers/archives.py b/ahriman-core/src/ahriman/application/handlers/archives.py index 61c3104f..66a86137 100644 --- a/ahriman-core/src/ahriman/application/handlers/archives.py +++ b/ahriman-core/src/ahriman/application/handlers/archives.py @@ -50,10 +50,10 @@ class Archives(Handler): application = Application(repository_id, configuration, report=True) match args.action: - case Action.List: + case Action.LIST: archives = application.repository.package_archives(args.package) for package in archives: - PackagePrinter(package, BuildStatus(BuildStatusEnum.Success))(verbose=args.info) + PackagePrinter(package, BuildStatus(BuildStatusEnum.SUCCESS))(verbose=args.info) Archives.check_status(args.exit_code, bool(archives)) @@ -75,7 +75,7 @@ class Archives(Handler): action="store_true") parser.add_argument("--info", help="show additional package information", action=argparse.BooleanOptionalAction, default=False) - parser.set_defaults(action=Action.List, lock=None, quiet=True, report=False, unsafe=True) + parser.set_defaults(action=Action.LIST, lock=None, quiet=True, report=False, unsafe=True) return parser arguments = [_set_package_archives_parser] diff --git a/ahriman-core/src/ahriman/application/handlers/change.py b/ahriman-core/src/ahriman/application/handlers/change.py index 2371d4aa..b573322f 100644 --- a/ahriman-core/src/ahriman/application/handlers/change.py +++ b/ahriman-core/src/ahriman/application/handlers/change.py @@ -50,11 +50,11 @@ class Change(Handler): client = Application(repository_id, configuration, report=True).reporter match args.action: - case Action.List: + case Action.LIST: changes = client.package_changes_get(args.package) ChangesPrinter(changes)(verbose=True, separator="") Change.check_status(args.exit_code, changes.changes is not None) - case Action.Remove: + case Action.REMOVE: client.package_changes_update(args.package, Changes()) @staticmethod @@ -75,7 +75,7 @@ class Change(Handler): parser.add_argument("package", help="package base") parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true") - parser.set_defaults(action=Action.List, lock=None, quiet=True, report=False, unsafe=True) + parser.set_defaults(action=Action.LIST, lock=None, quiet=True, report=False, unsafe=True) return parser @staticmethod @@ -92,7 +92,7 @@ class Change(Handler): parser = root.add_parser("package-changes-remove", help="remove package changes", description="remove the package changes stored remotely") parser.add_argument("package", help="package base") - parser.set_defaults(action=Action.Remove, exit_code=False, lock=None, quiet=True, report=False, unsafe=True) + parser.set_defaults(action=Action.REMOVE, exit_code=False, lock=None, quiet=True, report=False, unsafe=True) return parser arguments = [_set_package_changes_parser, _set_package_changes_remove_parser] diff --git a/ahriman-core/src/ahriman/application/handlers/copy.py b/ahriman-core/src/ahriman/application/handlers/copy.py index c17aaf1a..9800bd5f 100644 --- a/ahriman-core/src/ahriman/application/handlers/copy.py +++ b/ahriman-core/src/ahriman/application/handlers/copy.py @@ -103,7 +103,7 @@ class Copy(Handler): for source in package.packages.values() if source.filename is not None ] - application.add(source_paths, PackageSource.Archive) + application.add(source_paths, PackageSource.ARCHIVE) # copy metadata application.reporter.package_changes_update( @@ -112,6 +112,6 @@ class Copy(Handler): application.reporter.package_dependencies_update( package.base, source_application.reporter.package_dependencies_get(package.base) ) - application.reporter.package_update(package, BuildStatusEnum.Pending) + application.reporter.package_update(package, BuildStatusEnum.PENDING) arguments = [_set_package_copy_parser] diff --git a/ahriman-core/src/ahriman/application/handlers/hold.py b/ahriman-core/src/ahriman/application/handlers/hold.py index 7b053d22..c766732f 100644 --- a/ahriman-core/src/ahriman/application/handlers/hold.py +++ b/ahriman-core/src/ahriman/application/handlers/hold.py @@ -46,10 +46,10 @@ class Hold(Handler): client = Application(repository_id, configuration, report=True).reporter match args.action: - case Action.Remove: + case Action.REMOVE: for package in args.package: client.package_hold_update(package, enabled=False) - case Action.Update: + case Action.UPDATE: for package in args.package: client.package_hold_update(package, enabled=True) @@ -67,7 +67,7 @@ class Hold(Handler): parser = root.add_parser("package-hold", help="hold package", description="hold package from automatic updates") parser.add_argument("package", help="package base", nargs="+") - parser.set_defaults(action=Action.Update, lock=None, quiet=True, report=False, unsafe=True) + parser.set_defaults(action=Action.UPDATE, lock=None, quiet=True, report=False, unsafe=True) return parser @staticmethod @@ -84,7 +84,7 @@ class Hold(Handler): parser = root.add_parser("package-unhold", help="unhold package", description="remove package hold, allowing automatic updates") parser.add_argument("package", help="package base", nargs="+") - parser.set_defaults(action=Action.Remove, lock=None, quiet=True, report=False, unsafe=True) + parser.set_defaults(action=Action.REMOVE, lock=None, quiet=True, report=False, unsafe=True) return parser arguments = [ diff --git a/ahriman-core/src/ahriman/application/handlers/patch.py b/ahriman-core/src/ahriman/application/handlers/patch.py index e42c7afe..0c4c9b47 100644 --- a/ahriman-core/src/ahriman/application/handlers/patch.py +++ b/ahriman-core/src/ahriman/application/handlers/patch.py @@ -56,15 +56,15 @@ class Patch(Handler): application.on_start() match args.action: - case Action.Update if args.variable is not None: + case Action.UPDATE if args.variable is not None: patch = Patch.patch_create_from_function(args.variable, args.patch) Patch.patch_set_create(application, args.package, patch) - case Action.Update: + case Action.UPDATE: package_base, patch = Patch.patch_create_from_diff(args.package, repository_id.architecture, args.track) Patch.patch_set_create(application, package_base, patch) - case Action.List: + case Action.LIST: Patch.patch_set_list(application, args.package, args.variable, args.exit_code) - case Action.Remove: + case Action.REMOVE: Patch.patch_set_remove(application, args.package, args.variable) @staticmethod @@ -89,7 +89,7 @@ class Patch(Handler): "it must end with ()") parser.add_argument("patch", help="path to file which contains function or variable value. If not set, " "the value will be read from stdin", type=Path, nargs="?") - parser.set_defaults(action=Action.Update, architecture="", exit_code=False, lock=None, report=False, + parser.set_defaults(action=Action.UPDATE, architecture="", exit_code=False, lock=None, report=False, repository="") return parser @@ -111,7 +111,7 @@ class Patch(Handler): action="store_true") parser.add_argument("-v", "--variable", help="if set, show only patches for specified PKGBUILD variables", action="append") - parser.set_defaults(action=Action.List, architecture="", lock=None, report=False, repository="", unsafe=True) + parser.set_defaults(action=Action.LIST, architecture="", lock=None, report=False, repository="", unsafe=True) return parser @staticmethod @@ -132,7 +132,7 @@ class Patch(Handler): "to remove only specified PKGBUILD variables. In case if not set, " "it will remove all patches related to the package", action="append") - parser.set_defaults(action=Action.Remove, architecture="", exit_code=False, lock=None, report=False, + parser.set_defaults(action=Action.REMOVE, architecture="", exit_code=False, lock=None, report=False, repository="") return parser @@ -157,7 +157,7 @@ class Patch(Handler): parser.add_argument("package", help="path to directory with changed files for patch addition/update", type=Path) parser.add_argument("-t", "--track", help="files which has to be tracked", action="append", default=["*.diff", "*.patch"]) - parser.set_defaults(action=Action.Update, architecture="", exit_code=False, lock=None, report=False, + parser.set_defaults(action=Action.UPDATE, architecture="", exit_code=False, lock=None, report=False, repository="", variable=None) return parser diff --git a/ahriman-core/src/ahriman/application/handlers/pkgbuild.py b/ahriman-core/src/ahriman/application/handlers/pkgbuild.py index 0350f713..6b95f45a 100644 --- a/ahriman-core/src/ahriman/application/handlers/pkgbuild.py +++ b/ahriman-core/src/ahriman/application/handlers/pkgbuild.py @@ -51,11 +51,11 @@ class Pkgbuild(Handler): client = Application(repository_id, configuration, report=True).reporter match args.action: - case Action.List: + case Action.LIST: changes = client.package_changes_get(args.package) PkgbuildPrinter(changes)(verbose=True, separator="") Pkgbuild.check_status(args.exit_code, changes.pkgbuild is not None) - case Action.Remove: + case Action.REMOVE: changes = client.package_changes_get(args.package) client.package_changes_update(args.package, replace(changes, pkgbuild=None)) @@ -77,7 +77,7 @@ class Pkgbuild(Handler): parser.add_argument("package", help="package base") parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true") - parser.set_defaults(action=Action.List, lock=None, quiet=True, report=False, unsafe=True) + parser.set_defaults(action=Action.LIST, lock=None, quiet=True, report=False, unsafe=True) return parser @staticmethod @@ -94,7 +94,7 @@ class Pkgbuild(Handler): parser = root.add_parser("package-pkgbuild-remove", help="remove package pkgbuild", description="remove the package PKGBUILD stored remotely") parser.add_argument("package", help="package base") - parser.set_defaults(action=Action.Remove, exit_code=False, lock=None, quiet=True, report=False, unsafe=True) + parser.set_defaults(action=Action.REMOVE, exit_code=False, lock=None, quiet=True, report=False, unsafe=True) return parser arguments = [_set_package_pkgbuild_parser, _set_package_pkgbuild_remove_parser] diff --git a/ahriman-core/src/ahriman/application/handlers/rebuild.py b/ahriman-core/src/ahriman/application/handlers/rebuild.py index 90eaf67d..67b10dee 100644 --- a/ahriman-core/src/ahriman/application/handlers/rebuild.py +++ b/ahriman-core/src/ahriman/application/handlers/rebuild.py @@ -54,7 +54,7 @@ class Rebuild(Handler): packages = Rebuild.extract_packages(application, args.status, from_database=args.from_database) packages = application.repository.packages_depend_on(packages, args.depends_on) - plan = BuildPlan().update(packages, BuildPlanReason.Rebuild) + plan = BuildPlan().update(packages, BuildPlanReason.REBUILD) application.print_updates(plan, Update.log_fn(application, dry_run=args.dry_run), bump_pkgrel=args.increment) if args.dry_run: diff --git a/ahriman-core/src/ahriman/application/handlers/rollback.py b/ahriman-core/src/ahriman/application/handlers/rollback.py index 98f78d0d..55bbd562 100644 --- a/ahriman-core/src/ahriman/application/handlers/rollback.py +++ b/ahriman-core/src/ahriman/application/handlers/rollback.py @@ -82,7 +82,7 @@ class Rollback(Handler): parser.add_argument("-u", "--username", help="build as user", default=extract_user()) parser.set_defaults(aur=False, changes=False, check_files=False, dependencies=False, dry_run=False, exit_code=True, increment=False, now=True, local=False, manual=False, refresh=False, - source=PackageSource.Archive, variable=None, vcs=False) + source=PackageSource.ARCHIVE, variable=None, vcs=False) return parser @staticmethod diff --git a/ahriman-core/src/ahriman/application/handlers/service_updates.py b/ahriman-core/src/ahriman/application/handlers/service_updates.py index b1ce807e..beb0f1ed 100644 --- a/ahriman-core/src/ahriman/application/handlers/service_updates.py +++ b/ahriman-core/src/ahriman/application/handlers/service_updates.py @@ -57,7 +57,7 @@ class ServiceUpdates(Handler): if same_version: return - plan = BuildPlan().update([remote], BuildPlanReason.RegularUpdate) + plan = BuildPlan().update([remote], BuildPlanReason.REGULAR_UPDATE) UpdatePrinter(plan, {remote.base: local_version})(verbose=True) ServiceUpdates.check_status(args.exit_code, same_version) diff --git a/ahriman-core/src/ahriman/application/handlers/statistics.py b/ahriman-core/src/ahriman/application/handlers/statistics.py index 996b741a..8bc8dd73 100644 --- a/ahriman-core/src/ahriman/application/handlers/statistics.py +++ b/ahriman-core/src/ahriman/application/handlers/statistics.py @@ -85,7 +85,7 @@ class Statistics(Handler): parser.add_argument("package", help="fetch only events for the specified package", nargs="?") parser.add_argument("--chart", help="create updates chart and save it to the specified path", type=Path) parser.add_argument("-e", "--event", help="event type filter", - type=EventType, choices=tuple(EventType), default=EventType.PackageUpdated) + type=EventType, choices=tuple(EventType), default=EventType.PACKAGE_UPDATED) parser.add_argument("--from-date", help="only fetch events which are newer than the date") parser.add_argument("--limit", help="limit response by specified amount of events", type=int, default=-1) parser.add_argument("--offset", help="skip specified amount of events", type=int, default=0) diff --git a/ahriman-core/src/ahriman/application/handlers/status_update.py b/ahriman-core/src/ahriman/application/handlers/status_update.py index b77b0876..fb483da4 100644 --- a/ahriman-core/src/ahriman/application/handlers/status_update.py +++ b/ahriman-core/src/ahriman/application/handlers/status_update.py @@ -49,14 +49,14 @@ class StatusUpdate(Handler): client = Application(repository_id, configuration, report=True).reporter match args.action: - case Action.Update if args.package: + case Action.UPDATE if args.package: # update packages statuses for package in args.package: client.package_status_update(package, args.status) - case Action.Update: + case Action.UPDATE: # update service status client.status_update(args.status) - case Action.Remove: + case Action.REMOVE: for package in args.package: client.package_remove(package) @@ -76,7 +76,7 @@ class StatusUpdate(Handler): epilog="Please note that this subcommand does not remove the package itself, it just " "clears the status page.") parser.add_argument("package", help="remove specified packages from status page", nargs="+") - parser.set_defaults(action=Action.Remove, lock=None, quiet=True, report=False, unsafe=True) + parser.set_defaults(action=Action.REMOVE, lock=None, quiet=True, report=False, unsafe=True) return parser @staticmethod @@ -96,8 +96,8 @@ class StatusUpdate(Handler): "If no packages supplied, service status will be updated", nargs="*") parser.add_argument("-s", "--status", help="new package build status", - type=BuildStatusEnum, choices=tuple(BuildStatusEnum), default=BuildStatusEnum.Success) - parser.set_defaults(action=Action.Update, lock=None, quiet=True, report=False, unsafe=True) + type=BuildStatusEnum, choices=tuple(BuildStatusEnum), default=BuildStatusEnum.SUCCESS) + parser.set_defaults(action=Action.UPDATE, lock=None, quiet=True, report=False, unsafe=True) return parser @staticmethod @@ -114,8 +114,8 @@ class StatusUpdate(Handler): parser = root.add_parser("repo-status-update", help="update repository status", description="update repository status on the status page") parser.add_argument("-s", "--status", help="new status", - type=BuildStatusEnum, choices=tuple(BuildStatusEnum), default=BuildStatusEnum.Success) - parser.set_defaults(action=Action.Update, lock=None, package=[], quiet=True, report=False, unsafe=True) + type=BuildStatusEnum, choices=tuple(BuildStatusEnum), default=BuildStatusEnum.SUCCESS) + parser.set_defaults(action=Action.UPDATE, lock=None, package=[], quiet=True, report=False, unsafe=True) return parser arguments = [ diff --git a/ahriman-core/src/ahriman/application/handlers/users.py b/ahriman-core/src/ahriman/application/handlers/users.py index 1ad9c9ce..79f02c10 100644 --- a/ahriman-core/src/ahriman/application/handlers/users.py +++ b/ahriman-core/src/ahriman/application/handlers/users.py @@ -53,17 +53,17 @@ class Users(Handler): database = SQLite.load(configuration) match args.action: - case Action.Update: + case Action.UPDATE: user = Users.user_create(args) # if password is left blank we are not going to require salt to be set salt = configuration.get("auth", "salt", fallback="") if user.password else "" database.user_update(user.hash_password(salt)) - case Action.List: + case Action.LIST: users = database.user_list(args.username, args.role) for user in users: UserPrinter(user)(verbose=True) Users.check_status(args.exit_code, users) - case Action.Remove: + case Action.REMOVE: database.user_remove(args.username) @staticmethod @@ -88,8 +88,8 @@ class Users(Handler): "-p", "--password", help="user password. Blank password will be treated as empty password, " "which is in particular must be used for OAuth2 authorization type.") parser.add_argument("-R", "--role", help="user access level", - type=UserAccess, choices=tuple(UserAccess), default=UserAccess.Read) - parser.set_defaults(action=Action.Update, architecture="", exit_code=False, lock=None, quiet=True, + type=UserAccess, choices=tuple(UserAccess), default=UserAccess.READ) + parser.set_defaults(action=Action.UPDATE, architecture="", exit_code=False, lock=None, quiet=True, report=False, repository="") return parser @@ -110,7 +110,7 @@ class Users(Handler): parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true") parser.add_argument("-R", "--role", help="filter users by role", type=UserAccess, choices=tuple(UserAccess)) - parser.set_defaults(action=Action.List, architecture="", lock=None, quiet=True, report=False, repository="", + parser.set_defaults(action=Action.LIST, architecture="", lock=None, quiet=True, report=False, repository="", unsafe=True) return parser @@ -128,7 +128,7 @@ class Users(Handler): parser = root.add_parser("user-remove", help="remove user", description="remove user from the user mapping and update the configuration") parser.add_argument("username", help="username for web service") - parser.set_defaults(action=Action.Remove, architecture="", exit_code=False, lock=None, quiet=True, + parser.set_defaults(action=Action.REMOVE, architecture="", exit_code=False, lock=None, quiet=True, report=False, repository="") return parser diff --git a/ahriman-core/src/ahriman/application/lock.py b/ahriman-core/src/ahriman/application/lock.py index 3767a443..77eca7b0 100644 --- a/ahriman-core/src/ahriman/application/lock.py +++ b/ahriman-core/src/ahriman/application/lock.py @@ -209,7 +209,7 @@ class Lock(LazyLogging): self.check_user() self.check_version() self.lock() - self.reporter.status_update(BuildStatusEnum.Building) + self.reporter.status_update(BuildStatusEnum.BUILDING) return self def __exit__(self, exc_type: type[Exception] | None, exc_val: Exception | None, @@ -226,6 +226,6 @@ class Lock(LazyLogging): Literal[False]: always ``False`` (do not suppress any exception) """ self.clear() - status = BuildStatusEnum.Success if exc_val is None else BuildStatusEnum.Failed + status = BuildStatusEnum.SUCCESS if exc_val is None else BuildStatusEnum.FAILED self.reporter.status_update(status) return False diff --git a/ahriman-core/src/ahriman/core/alpm/pacman.py b/ahriman-core/src/ahriman/core/alpm/pacman.py index 224e9db2..d4c8e920 100644 --- a/ahriman-core/src/ahriman/core/alpm/pacman.py +++ b/ahriman-core/src/ahriman/core/alpm/pacman.py @@ -96,7 +96,7 @@ class Pacman(LazyLogging): self.database_init(handle, self.repository_id.name, self.repository_id.architecture) if use_ahriman_cache and refresh_database: - self.database_sync(handle, force=refresh_database == PacmanSynchronization.Force) + self.database_sync(handle, force=refresh_database == PacmanSynchronization.FORCE) return handle diff --git a/ahriman-core/src/ahriman/core/alpm/pkgbuild_parser.py b/ahriman-core/src/ahriman/core/alpm/pkgbuild_parser.py index cd2b5bd5..4b2cf6b1 100644 --- a/ahriman-core/src/ahriman/core/alpm/pkgbuild_parser.py +++ b/ahriman-core/src/ahriman/core/alpm/pkgbuild_parser.py @@ -35,32 +35,32 @@ class PkgbuildNodeType(StrEnum): tree-sitter node types used by parser Attributes: - Append(PkgbuildNodeType): append node - Array(PkgbuildNodeType): array node - Comment(PkgbuildNodeType): comment node - Concatenation(PkgbuildNodeType): concatenation node - Error(PkgbuildNodeType): syntax error node - FunctionDefinition(PkgbuildNodeType): function definition node - Number(PkgbuildNodeType): numeric word node - RawString(PkgbuildNodeType): single-quoted string node - String(PkgbuildNodeType): double-quoted string node - StringContent(PkgbuildNodeType): string content node - VariableAssignment(PkgbuildNodeType): assignment node - Word(PkgbuildNodeType): word node + APPEND(PkgbuildNodeType): append node + ARRAY(PkgbuildNodeType): array node + COMMENT(PkgbuildNodeType): comment node + CONCATENATION(PkgbuildNodeType): concatenation node + ERROR(PkgbuildNodeType): syntax error node + FUNCTION_DEFINITION(PkgbuildNodeType): function definition node + NUMBER(PkgbuildNodeType): numeric word node + RAW_STRING(PkgbuildNodeType): single-quoted string node + STRING(PkgbuildNodeType): double-quoted string node + STRING_CONTENT(PkgbuildNodeType): string content node + VARIABLE_ASSIGNMENT(PkgbuildNodeType): assignment node + WORD(PkgbuildNodeType): word node """ - Append = "+=" - Array = "array" - Comment = "comment" - Concatenation = "concatenation" - Error = "ERROR" - FunctionDefinition = "function_definition" - Number = "number" - RawString = "raw_string" - String = "string" - StringContent = "string_content" - VariableAssignment = "variable_assignment" - Word = "word" + APPEND = "+=" + ARRAY = "array" + COMMENT = "comment" + CONCATENATION = "concatenation" + ERROR = "ERROR" + FUNCTION_DEFINITION = "function_definition" + NUMBER = "number" + RAW_STRING = "raw_string" + STRING = "string" + STRING_CONTENT = "string_content" + VARIABLE_ASSIGNMENT = "variable_assignment" + WORD = "word" class PkgbuildNodeField(StrEnum): @@ -68,14 +68,14 @@ class PkgbuildNodeField(StrEnum): tree-sitter node fields used by parser Attributes: - Body(PkgbuildNodeField): function body field - Name(PkgbuildNodeField): variable or function name field - Value(PkgbuildNodeField): assignment value field + BODY(PkgbuildNodeField): function body field + NAME(PkgbuildNodeField): variable or function name field + VALUE(PkgbuildNodeField): assignment value field """ - Body = "body" - Name = "name" - Value = "value" + BODY = "body" + NAME = "name" + VALUE = "value" class PkgbuildParser(Iterable[PkgbuildPatch]): @@ -169,17 +169,17 @@ class PkgbuildParser(Iterable[PkgbuildPatch]): source = source.replace(original, replacement) return source - if node.type == PkgbuildNodeType.Concatenation: + if node.type == PkgbuildNodeType.CONCATENATION: return "".join(PkgbuildParser.value(child) for child in node.named_children) value = PkgbuildParser.text(node) match node.type: - case PkgbuildNodeType.String | PkgbuildNodeType.StringContent: - if node.type == PkgbuildNodeType.String: + case PkgbuildNodeType.STRING | PkgbuildNodeType.STRING_CONTENT: + if node.type == PkgbuildNodeType.STRING: value = PkgbuildParser.unquote(value) # protect escaped backslashes from being interpreted a second time. return "\\".join(unescape(part) for part in value.split("\\\\")) - case PkgbuildNodeType.Number | PkgbuildNodeType.RawString | PkgbuildNodeType.Word: + case PkgbuildNodeType.NUMBER | PkgbuildNodeType.RAW_STRING | PkgbuildNodeType.WORD: return PkgbuildParser.unquote(value) case _: return value @@ -194,17 +194,17 @@ class PkgbuildParser(Iterable[PkgbuildPatch]): Returns: PkgbuildPatch: parsed assignment """ - key = self.text(cast(Node, node.child_by_field_name(PkgbuildNodeField.Name))) - value = node.child_by_field_name(PkgbuildNodeField.Value) + key = self.text(cast(Node, node.child_by_field_name(PkgbuildNodeField.NAME))) + value = node.child_by_field_name(PkgbuildNodeField.VALUE) # bash permits assignments without a value (for example ``IFS=``). # tree-sitter represents those assignments without a value node. if value is None: return PkgbuildPatch(key, "") match value.type: - case PkgbuildNodeType.Array: + case PkgbuildNodeType.ARRAY: values = [] - for element in filter(lambda child: child.type != PkgbuildNodeType.Comment, value.named_children): + for element in filter(lambda child: child.type != PkgbuildNodeType.COMMENT, value.named_children): values.extend(self._expand_array(element)) return PkgbuildPatch(key, values) @@ -221,7 +221,7 @@ class PkgbuildParser(Iterable[PkgbuildPatch]): Returns: list[str]: expanded element values """ - if node.type != PkgbuildNodeType.Concatenation: + if node.type != PkgbuildNodeType.CONCATENATION: return [self.value(node)] values = [""] @@ -229,9 +229,9 @@ class PkgbuildParser(Iterable[PkgbuildPatch]): while children: match children[:3]: case [ - Node(type=PkgbuildNodeType.Word, text=b"{"), - Node(type=PkgbuildNodeType.Word) as content, - Node(type=PkgbuildNodeType.Word, text=b"}"), + Node(type=PkgbuildNodeType.WORD, text=b"{"), + Node(type=PkgbuildNodeType.WORD) as content, + Node(type=PkgbuildNodeType.WORD, text=b"}"), ] if "," in (escaped := self.text(content).replace("\\,", ShellInterpolator.DATA_LINK_ESCAPE)): parts = [ self.unquote(part).replace(ShellInterpolator.DATA_LINK_ESCAPE, ",") @@ -258,7 +258,7 @@ class PkgbuildParser(Iterable[PkgbuildPatch]): PkgbuildPatch: parsed entries """ match node.type: - case PkgbuildNodeType.VariableAssignment if any(child.type == PkgbuildNodeType.Append for child in node.children): + case PkgbuildNodeType.VARIABLE_ASSIGNMENT if any(child.type == PkgbuildNodeType.APPEND for child in node.children): patch = self._assignment(node) match values.get(patch.key), patch.value: case PkgbuildPatch(value=str() as previous), str() as appended: @@ -270,25 +270,25 @@ class PkgbuildParser(Iterable[PkgbuildPatch]): values[patch.key] = patch yield patch - case PkgbuildNodeType.VariableAssignment: + case PkgbuildNodeType.VARIABLE_ASSIGNMENT: patch = self._assignment(node) values[patch.key] = patch yield patch - case PkgbuildNodeType.FunctionDefinition: - name = cast(Node, node.child_by_field_name(PkgbuildNodeField.Name)) - body = cast(Node, node.child_by_field_name(PkgbuildNodeField.Body)) + case PkgbuildNodeType.FUNCTION_DEFINITION: + name = cast(Node, node.child_by_field_name(PkgbuildNodeField.NAME)) + body = cast(Node, node.child_by_field_name(PkgbuildNodeField.BODY)) yield PkgbuildPatch(f"{self.text(name)}()", self.text(body)) case _: # descend into statements, but skip command arguments and values for child in node.named_children: if child.type not in ( - PkgbuildNodeType.Array, - PkgbuildNodeType.Comment, - PkgbuildNodeType.RawString, - PkgbuildNodeType.String, - PkgbuildNodeType.Word, + PkgbuildNodeType.ARRAY, + PkgbuildNodeType.COMMENT, + PkgbuildNodeType.RAW_STRING, + PkgbuildNodeType.STRING, + PkgbuildNodeType.WORD, ): yield from self._read(child, values) diff --git a/ahriman-core/src/ahriman/core/gitremote/remote_pull.py b/ahriman-core/src/ahriman/core/gitremote/remote_pull.py index e43a54fd..e8143c20 100644 --- a/ahriman-core/src/ahriman/core/gitremote/remote_pull.py +++ b/ahriman-core/src/ahriman/core/gitremote/remote_pull.py @@ -55,7 +55,7 @@ class RemotePull(LazyLogging): web_url="", path=".", branch=configuration.get(section, "pull_branch", fallback="master"), - source=PackageSource.Local, + source=PackageSource.LOCAL, ) self.architecture = repository_id.architecture self.repository_paths = configuration.repository_paths diff --git a/ahriman-core/src/ahriman/core/gitremote/remote_push.py b/ahriman-core/src/ahriman/core/gitremote/remote_push.py index 90a70240..4e920491 100644 --- a/ahriman-core/src/ahriman/core/gitremote/remote_push.py +++ b/ahriman-core/src/ahriman/core/gitremote/remote_push.py @@ -62,7 +62,7 @@ class RemotePush(LazyLogging): web_url="", path=".", branch=configuration.get(section, "push_branch", fallback="master"), - source=PackageSource.Local, + source=PackageSource.LOCAL, ) def package_update(self, package: Package, target_dir: Path) -> str: diff --git a/ahriman-core/src/ahriman/core/log/log_loader.py b/ahriman-core/src/ahriman/core/log/log_loader.py index 9db4bc50..0fdd0667 100644 --- a/ahriman-core/src/ahriman/core/log/log_loader.py +++ b/ahriman-core/src/ahriman/core/log/log_loader.py @@ -52,9 +52,9 @@ class LogLoader: """ try to guess default log handler. In case if ``selected`` is set, it will return specified value with appended _handler suffix. Otherwise, it will try to import journald handler and returns - :attr:`ahriman.models.log_handler.LogHandler.Journald` if library is available. Otherwise, it will check if - there is ``/dev/log`` device and returns :attr:`ahriman.models.log_handler.LogHandler.Syslog` in this - case. And, finally, it will fall back to :attr:`ahriman.models.log_handler.LogHandler.Console` + :attr:`ahriman.models.log_handler.LogHandler.JOURNALD` if library is available. Otherwise, it will check if + there is ``/dev/log`` device and returns :attr:`ahriman.models.log_handler.LogHandler.SYSLOG` in this + case. And, finally, it will fall back to :attr:`ahriman.models.log_handler.LogHandler.CONSOLE` if none were found Args: @@ -67,10 +67,10 @@ class LogLoader: return selected if optional_module("systemd.journal"): - return LogHandler.Journald # journald import was found + return LogHandler.JOURNALD # journald import was found if LogLoader.DEFAULT_SYSLOG_DEVICE.exists(): - return LogHandler.Syslog - return LogHandler.Console + return LogHandler.SYSLOG + return LogHandler.CONSOLE @staticmethod def load(repository_id: RepositoryId, configuration: Configuration, handler: LogHandler, *, diff --git a/ahriman-core/src/ahriman/core/report/jinja_template.py b/ahriman-core/src/ahriman/core/report/jinja_template.py index 6a58ef19..ce4a4040 100644 --- a/ahriman-core/src/ahriman/core/report/jinja_template.py +++ b/ahriman-core/src/ahriman/core/report/jinja_template.py @@ -155,8 +155,8 @@ class JinjaTemplate: homepage=self.homepage, last_update=self.format_datetime(utcnow()), link_path=self.link_path, - has_package_signed=SignSettings.Packages in self.sign_targets, - has_repo_signed=SignSettings.Repository in self.sign_targets, + has_package_signed=SignSettings.PACKAGES in self.sign_targets, + has_repo_signed=SignSettings.REPOSITORY in self.sign_targets, packages=self.sort_content(content), pgp_key=self.default_pgp_key, repository=self.name, diff --git a/ahriman-core/src/ahriman/core/report/report.py b/ahriman-core/src/ahriman/core/report/report.py index a09f46b9..e6412648 100644 --- a/ahriman-core/src/ahriman/core/report/report.py +++ b/ahriman-core/src/ahriman/core/report/report.py @@ -81,19 +81,19 @@ class Report(LazyLogging): case ReportSettings.HTML: from ahriman.core.report.html import HTML return HTML(repository_id, configuration, section) - case ReportSettings.Email: + case ReportSettings.EMAIL: from ahriman.core.report.email import Email return Email(repository_id, configuration, section) - case ReportSettings.Console: + case ReportSettings.CONSOLE: from ahriman.core.report.console import Console return Console(repository_id, configuration, section) - case ReportSettings.Telegram: + case ReportSettings.TELEGRAM: from ahriman.core.report.telegram import Telegram return Telegram(repository_id, configuration, section) case ReportSettings.RSS: from ahriman.core.report.rss import RSS return RSS(repository_id, configuration, section) - case ReportSettings.RemoteCall: + case ReportSettings.REMOTE_CALL: from ahriman.core.report.remote_call import RemoteCall return RemoteCall(repository_id, configuration, section) case _: diff --git a/ahriman-core/src/ahriman/core/report/rss.py b/ahriman-core/src/ahriman/core/report/rss.py index 114f8997..48433d1b 100644 --- a/ahriman-core/src/ahriman/core/report/rss.py +++ b/ahriman-core/src/ahriman/core/report/rss.py @@ -103,7 +103,7 @@ class RSS(Report, JinjaTemplate): """ ctx = context.get() reporter = ctx.get(Client) - events = reporter.event_get(EventType.PackageUpdated, None, limit=self.max_entries) + events = reporter.event_get(EventType.PACKAGE_UPDATED, None, limit=self.max_entries) known_packages = {package.base: package for package in packages} diff --git a/ahriman-core/src/ahriman/core/repository/event_logger.py b/ahriman-core/src/ahriman/core/repository/event_logger.py index 889a10dc..2a46a421 100644 --- a/ahriman-core/src/ahriman/core/repository/event_logger.py +++ b/ahriman-core/src/ahriman/core/repository/event_logger.py @@ -49,7 +49,7 @@ class EventLogger: This method must be used as simple wrapper for :class:`ahriman.core.status.Client` methods, e.g.:: >>> do_something() - >>> self.event(package_base, EventType.PackageUpdated) + >>> self.event(package_base, EventType.PACKAGE_UPDATED) """ self.reporter.event_add(Event(event, package_base, message)) @@ -68,7 +68,7 @@ class EventLogger: Examples: This method must be used to perform action in context with time measurement:: - >>> with self.in_event(package_base, EventType.PackageUpdated): + >>> with self.in_event(package_base, EventType.PACKAGE_UPDATED): >>> do_something() Additional parameter ``failure`` can be set in order to emit an event on exception occurred. If none set diff --git a/ahriman-core/src/ahriman/core/repository/executor.py b/ahriman-core/src/ahriman/core/repository/executor.py index 8b20ea73..b4736a28 100644 --- a/ahriman-core/src/ahriman/core/repository/executor.py +++ b/ahriman-core/src/ahriman/core/repository/executor.py @@ -117,7 +117,7 @@ class Executor(PackageInfo, Cleaner): package_base(str): package base name """ try: - with self.in_event(package_base, EventType.PackageRemoved): + with self.in_event(package_base, EventType.PACKAGE_REMOVED): self.reporter.package_remove(package_base) except Exception: self.logger.exception("could not remove base %s", package_base) @@ -169,7 +169,7 @@ class Executor(PackageInfo, Cleaner): with self.in_package_context(single.base, local_versions.get(single.base)), \ TemporaryDirectory(ignore_cleanup_errors=True) as dir_name: try: - with self.in_event(single.base, EventType.PackageUpdated, failure=EventType.PackageUpdateFailed): + with self.in_event(single.base, EventType.PACKAGE_UPDATED, failure=EventType.PACKAGE_UPDATE_FAILED): packager = self.packager(packagers, single.base) local_version = local_versions.get(single.base) if bump_pkgrel else None commit_sha = self._package_build(single, Path(dir_name), packager.packager_id, local_version) diff --git a/ahriman-core/src/ahriman/core/repository/repository.py b/ahriman-core/src/ahriman/core/repository/repository.py index 7d223278..5df84e42 100644 --- a/ahriman-core/src/ahriman/core/repository/repository.py +++ b/ahriman-core/src/ahriman/core/repository/repository.py @@ -57,7 +57,7 @@ class Repository(Executor, UpdateHandler): @classmethod def load(cls, repository_id: RepositoryId, configuration: Configuration, database: SQLite, *, report: bool, - refresh_pacman_database: PacmanSynchronization = PacmanSynchronization.Disabled) -> Self: + refresh_pacman_database: PacmanSynchronization = PacmanSynchronization.DISABLED) -> Self: """ load instance from argument list @@ -67,7 +67,7 @@ class Repository(Executor, UpdateHandler): database(SQLite): database instance report(bool): force enable or disable reporting refresh_pacman_database(PacmanSynchronization, optional): pacman database synchronization level - (Default value = PacmanSynchronization.Disabled) + (Default value = PacmanSynchronization.DISABLED) Returns: Self: fully loaded repository class instance diff --git a/ahriman-core/src/ahriman/core/repository/repository_properties.py b/ahriman-core/src/ahriman/core/repository/repository_properties.py index ab31a731..53e82de0 100644 --- a/ahriman-core/src/ahriman/core/repository/repository_properties.py +++ b/ahriman-core/src/ahriman/core/repository/repository_properties.py @@ -90,9 +90,9 @@ class RepositoryProperties(EventLogger, LazyLogging): """ username = packagers.for_base(package_base) if username is None: # none to search - return User(username="", password="", access=UserAccess.Read, packager_id=None, key=None) # nosec + return User(username="", password="", access=UserAccess.READ, packager_id=None, key=None) # nosec if (user := self.database.user_get(username)) is not None: # found user return user # empty user with the username - return User(username=username, password="", access=UserAccess.Read, packager_id=None, key=None) # nosec + return User(username=username, password="", access=UserAccess.READ, packager_id=None, key=None) # nosec diff --git a/ahriman-core/src/ahriman/core/repository/update_handler.py b/ahriman-core/src/ahriman/core/repository/update_handler.py index 620b20f7..19a79642 100644 --- a/ahriman-core/src/ahriman/core/repository/update_handler.py +++ b/ahriman-core/src/ahriman/core/repository/update_handler.py @@ -62,7 +62,7 @@ class UpdateHandler(PackageInfo, Cleaner): # try to load package from base and if none found try to load by separated packages for probe in [package.base] + sorted(package.packages.keys()): try: - if package.remote.source == PackageSource.Repository: + if package.remote.source == PackageSource.REPOSITORY: return Package.from_official(probe, self.pacman, None) return Package.from_aur(probe, None) except UnknownPackageError: @@ -85,10 +85,10 @@ class UpdateHandler(PackageInfo, Cleaner): if PackageVersion(local).is_outdated(remote, self.configuration, calculate_version=vcs): self.reporter.set_pending(local.base) - self.event(local.base, EventType.PackageOutdated, "Remote version is newer than local") + self.event(local.base, EventType.PACKAGE_OUTDATED, "Remote version is newer than local") result.append(remote) else: - self.reporter.package_status_update(local.base, BuildStatusEnum.Success) + self.reporter.package_status_update(local.base, BuildStatusEnum.SUCCESS) except Exception: self.reporter.set_failed(local.base) self.logger.exception("could not load remote package %s", local.base) @@ -136,7 +136,7 @@ class UpdateHandler(PackageInfo, Cleaner): # there are no packages found in filesystem with the same paths self.reporter.set_pending(local.base) - self.event(local.base, EventType.PackageOutdated, "Implicit dependencies are broken") + self.event(local.base, EventType.PACKAGE_OUTDATED, "Implicit dependencies are broken") result.append(local) break @@ -165,7 +165,7 @@ class UpdateHandler(PackageInfo, Cleaner): with self.in_package_context(cache_dir.name, local_versions.get(cache_dir.name)): try: source = RemoteSource( - source=PackageSource.Local, + source=PackageSource.LOCAL, git_url=cache_dir.absolute().as_uri(), web_url="", path=".", @@ -186,7 +186,7 @@ class UpdateHandler(PackageInfo, Cleaner): if PackageVersion(local).is_outdated(remote, self.configuration, calculate_version=vcs): self.reporter.set_pending(local.base) - self.event(local.base, EventType.PackageOutdated, "Locally pulled sources are outdated") + self.event(local.base, EventType.PACKAGE_OUTDATED, "Locally pulled sources are outdated") result.append(remote) except Exception: @@ -211,7 +211,7 @@ class UpdateHandler(PackageInfo, Cleaner): self.reporter.set_unknown(local) else: self.reporter.set_pending(local.base) - self.event(local.base, EventType.PackageOutdated, "Manual update is requested") + self.event(local.base, EventType.PACKAGE_OUTDATED, "Manual update is requested") except Exception: self.logger.exception("could not load packages from database") diff --git a/ahriman-core/src/ahriman/core/sign/gpg.py b/ahriman-core/src/ahriman/core/sign/gpg.py index 70c8f413..2ecbc4c3 100644 --- a/ahriman-core/src/ahriman/core/sign/gpg.py +++ b/ahriman-core/src/ahriman/core/sign/gpg.py @@ -53,7 +53,7 @@ class GPG(SyncHttpClient): Returns: list[str]: command line arguments for repo-add command to sign database """ - if SignSettings.Repository not in self.targets: + if SignSettings.REPOSITORY not in self.targets: return [] if self.default_key is None: self.logger.error("no default key set, skip repository sign") @@ -88,7 +88,7 @@ class GPG(SyncHttpClient): targets: set[SignSettings] = set() for option in configuration.getlist("sign", "target", fallback=[]): target = SignSettings.from_option(option) - if target == SignSettings.Disabled: + if target == SignSettings.DISABLED: continue targets.add(target) default_key = configuration.get("sign", "key") if targets else None @@ -204,7 +204,7 @@ class GPG(SyncHttpClient): # the file was already signed before, just use its signature return [path, signature] - if SignSettings.Packages not in self.targets: + if SignSettings.PACKAGES not in self.targets: return [path] key = packager_key or self.default_key @@ -226,7 +226,7 @@ class GPG(SyncHttpClient): Returns: list[Path]: list of generated files including original file """ - if SignSettings.Repository not in self.targets: + if SignSettings.REPOSITORY not in self.targets: return [path] if self.default_key is None: self.logger.error("no default key set, skip repository sign") diff --git a/ahriman-core/src/ahriman/core/status/client.py b/ahriman-core/src/ahriman/core/status/client.py index 4ba7925f..1539f8bc 100644 --- a/ahriman-core/src/ahriman/core/status/client.py +++ b/ahriman-core/src/ahriman/core/status/client.py @@ -341,7 +341,7 @@ class Client: Args: package_base(str): package base to update """ - self.package_status_update(package_base, BuildStatusEnum.Building) + self.package_status_update(package_base, BuildStatusEnum.BUILDING) def set_failed(self, package_base: str) -> None: """ @@ -350,7 +350,7 @@ class Client: Args: package_base(str): package base to update """ - self.package_status_update(package_base, BuildStatusEnum.Failed) + self.package_status_update(package_base, BuildStatusEnum.FAILED) def set_pending(self, package_base: str) -> None: """ @@ -359,7 +359,7 @@ class Client: Args: package_base(str): package base to update """ - self.package_status_update(package_base, BuildStatusEnum.Pending) + self.package_status_update(package_base, BuildStatusEnum.PENDING) def set_success(self, package: Package) -> None: """ @@ -368,7 +368,7 @@ class Client: Args: package(Package): current package properties """ - self.package_update(package, BuildStatusEnum.Success) + self.package_update(package, BuildStatusEnum.SUCCESS) def set_unknown(self, package: Package) -> None: """ @@ -380,7 +380,7 @@ class Client: """ if self.package_get(package.base): return # skip update in case if package is already known - self.package_update(package, BuildStatusEnum.Unknown) + self.package_update(package, BuildStatusEnum.UNKNOWN) def statistics(self) -> RepositoryStats: """ diff --git a/ahriman-core/src/ahriman/core/status/watcher.py b/ahriman-core/src/ahriman/core/status/watcher.py index 7edf3d43..13b1df38 100644 --- a/ahriman-core/src/ahriman/core/status/watcher.py +++ b/ahriman-core/src/ahriman/core/status/watcher.py @@ -197,7 +197,7 @@ class Watcher(LazyLogging): self._known[package_base] = (package, replace(status, is_held=enabled)) self.client.package_hold_update(package_base, enabled=enabled) - await self.event_bus.broadcast(EventType.PackageHeld, package_base, is_held=enabled) + await self.event_bus.broadcast(EventType.PACKAGE_HELD, package_base, is_held=enabled) async def package_logs_add(self, log_record: LogRecord) -> None: """ @@ -208,7 +208,7 @@ class Watcher(LazyLogging): """ self.client.package_logs_add(log_record) - await self.event_bus.broadcast(EventType.BuildLog, log_record.log_record_id.package_base, **log_record.view()) + await self.event_bus.broadcast(EventType.BUILD_LOG, log_record.log_record_id.package_base, **log_record.view()) async def package_logs_get(self, package_base: str, version: str | None = None, process_id: str | None = None, limit: int = -1, offset: int = 0) -> list[LogRecord]: @@ -281,7 +281,7 @@ class Watcher(LazyLogging): self._known.pop(package_base, None) self.client.package_remove(package_base) - await self.event_bus.broadcast(EventType.PackageRemoved, package_base) + await self.event_bus.broadcast(EventType.PACKAGE_REMOVED, package_base) async def package_status_update(self, package_base: str, status: BuildStatusEnum) -> None: """ @@ -296,7 +296,7 @@ class Watcher(LazyLogging): self._known[package_base] = (package, BuildStatus(status, is_held=current_status.is_held)) self.client.package_status_update(package_base, status) - await self.event_bus.broadcast(EventType.PackageStatusChanged, package_base, status=status.value) + await self.event_bus.broadcast(EventType.PACKAGE_STATUS_CHANGED, package_base, status=status.value) async def package_update(self, package: Package, status: BuildStatusEnum) -> None: """ @@ -312,7 +312,7 @@ class Watcher(LazyLogging): self.client.package_update(package, status) await self.event_bus.broadcast( - EventType.PackageUpdated, package.base, status=status.value, version=package.version, + EventType.PACKAGE_UPDATED, package.base, status=status.value, version=package.version, ) async def packages(self) -> list[tuple[Package, BuildStatus]]: @@ -340,7 +340,7 @@ class Watcher(LazyLogging): """ self.status = BuildStatus(status) - await self.event_bus.broadcast(EventType.ServiceStatusChanged, None, status=status.value) + await self.event_bus.broadcast(EventType.SERVICE_STATUS_CHANGED, None, status=status.value) def __call__(self, package_base: str | None) -> Self: """ diff --git a/ahriman-core/src/ahriman/core/upload/upload.py b/ahriman-core/src/ahriman/core/upload/upload.py index 6bf2e39f..44cc950c 100644 --- a/ahriman-core/src/ahriman/core/upload/upload.py +++ b/ahriman-core/src/ahriman/core/upload/upload.py @@ -79,16 +79,16 @@ class Upload(LazyLogging): """ section, provider_name = configuration.gettype(target, repository_id) match UploadSettings.from_option(provider_name): - case UploadSettings.Rsync: + case UploadSettings.RSYNC: from ahriman.core.upload.rsync import Rsync return Rsync(repository_id, configuration, section) case UploadSettings.S3: from ahriman.core.upload.s3 import S3 return S3(repository_id, configuration, section) - case UploadSettings.GitHub: + case UploadSettings.GITHUB: from ahriman.core.upload.github import GitHub return GitHub(repository_id, configuration, section) - case UploadSettings.RemoteService: + case UploadSettings.REMOTE_SERVICE: from ahriman.core.upload.remote_service import RemoteService return RemoteService(repository_id, configuration, section) case _: diff --git a/ahriman-core/src/ahriman/models/action.py b/ahriman-core/src/ahriman/models/action.py index 8e6a2ba9..77cc5dda 100644 --- a/ahriman-core/src/ahriman/models/action.py +++ b/ahriman-core/src/ahriman/models/action.py @@ -25,11 +25,11 @@ class Action(StrEnum): base action enumeration Attributes: - List(Action): list available values - Remove(Action): remove everything from local storage - Update(Action): update local storage or add to + LIST(Action): list available values + REMOVE(Action): remove everything from local storage + UPDATE(Action): update local storage or add to """ - List = "list" - Remove = "remove" - Update = "update" + LIST = "list" + REMOVE = "remove" + UPDATE = "update" diff --git a/ahriman-core/src/ahriman/models/auth_settings.py b/ahriman-core/src/ahriman/models/auth_settings.py index 99403694..89ad5c34 100644 --- a/ahriman-core/src/ahriman/models/auth_settings.py +++ b/ahriman-core/src/ahriman/models/auth_settings.py @@ -27,15 +27,15 @@ class AuthSettings(StrEnum): web authorization type Attributes: - Disabled(AuthSettings): authorization is disabled - Configuration(AuthSettings): configuration based authorization - OAuth(AuthSettings): OAuth based provider + DISABLED(AuthSettings): authorization is disabled + CONFIGURATION(AuthSettings): configuration based authorization + OAUTH(AuthSettings): OAuth based provider PAM(AuthSettings): PAM based provider """ - Disabled = "disabled" - Configuration = "configuration" - OAuth = "oauth2" + DISABLED = "disabled" + CONFIGURATION = "configuration" + OAUTH = "oauth2" PAM = "pam" @property @@ -46,7 +46,7 @@ class AuthSettings(StrEnum): Returns: bool: ``False`` in case if authorization is disabled and ``True`` otherwise """ - return self != AuthSettings.Disabled + return self != AuthSettings.DISABLED @staticmethod def from_option(value: str) -> AuthSettings: @@ -61,10 +61,10 @@ class AuthSettings(StrEnum): """ match value.lower(): case "configuration" | "mapping": - return AuthSettings.Configuration + return AuthSettings.CONFIGURATION case "oauth" | "oauth2": - return AuthSettings.OAuth + return AuthSettings.OAUTH case "pam": return AuthSettings.PAM case _: - return AuthSettings.Disabled + return AuthSettings.DISABLED diff --git a/ahriman-core/src/ahriman/models/build_plan.py b/ahriman-core/src/ahriman/models/build_plan.py index 24714790..954c8815 100644 --- a/ahriman-core/src/ahriman/models/build_plan.py +++ b/ahriman-core/src/ahriman/models/build_plan.py @@ -30,22 +30,22 @@ class BuildPlanReason(StrEnum): reason why package was selected for a build plan Attributes: - BrokenImplicitDependency(BuildPlanReason): package has a broken implicit dependency - LocalSourceUpdate(BuildPlanReason): locally sourced package has an update - ManualRequest(BuildPlanReason): package was manually queued - PreBuilt(BuildPlanReason): package has already been built - Rebuild(BuildPlanReason): package was selected for rebuild - RegularUpdate(BuildPlanReason): package has an AUR update - RequiredBy(BuildPlanReason): package is required by another selected package + BROKEN_IMPLICIT_DEPENDENCY(BuildPlanReason): package has a broken implicit dependency + LOCAL_SOURCE_UPDATE(BuildPlanReason): locally sourced package has an update + MANUAL_REQUEST(BuildPlanReason): package was manually queued + PRE_BUILT(BuildPlanReason): package has already been built + REBUILD(BuildPlanReason): package was selected for rebuild + REGULAR_UPDATE(BuildPlanReason): package has an AUR update + REQUIRED_BY(BuildPlanReason): package is required by another selected package """ - BrokenImplicitDependency = "broken implicit dependency" - LocalSourceUpdate = "local source update" - ManualRequest = "manual request" - PreBuilt = "pre-built" - Rebuild = "rebuild" - RegularUpdate = "regular update" - RequiredBy = "required by" + BROKEN_IMPLICIT_DEPENDENCY = "broken implicit dependency" + LOCAL_SOURCE_UPDATE = "local source update" + MANUAL_REQUEST = "manual request" + PRE_BUILT = "pre-built" + REBUILD = "rebuild" + REGULAR_UPDATE = "regular update" + REQUIRED_BY = "required by" @dataclass(frozen=True) @@ -95,14 +95,14 @@ class BuildPlan(Iterable[Package]): """ return [item.package for item in self.items] - def add(self, package: Package, reason: BuildPlanReason = BuildPlanReason.ManualRequest, + def add(self, package: Package, reason: BuildPlanReason = BuildPlanReason.MANUAL_REQUEST, requester: str | None = None) -> BuildPlanItem: """ add or update a package while preserving its first reason and requester Args: package(Package): package selected for the plan - reason(BuildPlanReason, optional): reason for selecting it (Default value = BuildPlanReason.ManualRequest) + reason(BuildPlanReason, optional): reason for selecting it (Default value = BuildPlanReason.MANUAL_REQUEST) requester(str | None, optional): package requiring this dependency (Default value = None) Returns: @@ -125,14 +125,14 @@ class BuildPlan(Iterable[Package]): """ return self._items[package_base] - def update(self, packages: Iterable[Package], reason: BuildPlanReason = BuildPlanReason.ManualRequest, + def update(self, packages: Iterable[Package], reason: BuildPlanReason = BuildPlanReason.MANUAL_REQUEST, requester: str | None = None) -> Self: """ bulk update packages with the same reason Args: packages(Iterable[Package]): list of new packages to be added - reason(BuildPlanReason, optional): reason for selecting it (Default value = BuildPlanReason.ManualRequest) + reason(BuildPlanReason, optional): reason for selecting it (Default value = BuildPlanReason.MANUAL_REQUEST) requester(str | None, optional): package requiring these dependencies (Default value = None) Returns: diff --git a/ahriman-core/src/ahriman/models/build_status.py b/ahriman-core/src/ahriman/models/build_status.py index e000dfae..87d6ddcc 100644 --- a/ahriman-core/src/ahriman/models/build_status.py +++ b/ahriman-core/src/ahriman/models/build_status.py @@ -29,18 +29,18 @@ class BuildStatusEnum(StrEnum): build status enumeration Attributes: - Unknown(BuildStatusEnum): build status is unknown - Pending(BuildStatusEnum): package is out-of-dated and will be built soon - Building(BuildStatusEnum): package is building right now - Failed(BuildStatusEnum): package build failed - Success(BuildStatusEnum): package has been built without errors + UNKNOWN(BuildStatusEnum): build status is unknown + PENDING(BuildStatusEnum): package is out-of-dated and will be built soon + BUILDING(BuildStatusEnum): package is building right now + FAILED(BuildStatusEnum): package build failed + SUCCESS(BuildStatusEnum): package has been built without errors """ - Unknown = "unknown" - Pending = "pending" - Building = "building" - Failed = "failed" - Success = "success" + UNKNOWN = "unknown" + PENDING = "pending" + BUILDING = "building" + FAILED = "failed" + SUCCESS = "success" @dataclass(frozen=True) @@ -54,7 +54,7 @@ class BuildStatus: is_held(bool | None): whether package held or not """ - status: BuildStatusEnum = BuildStatusEnum.Unknown + status: BuildStatusEnum = BuildStatusEnum.UNKNOWN timestamp: int = field(default_factory=lambda: int(utcnow().timestamp())) is_held: bool | None = field(default=None, kw_only=True) diff --git a/ahriman-core/src/ahriman/models/event.py b/ahriman-core/src/ahriman/models/event.py index cbda6180..ec8b97f9 100644 --- a/ahriman-core/src/ahriman/models/event.py +++ b/ahriman-core/src/ahriman/models/event.py @@ -28,24 +28,24 @@ class EventType(StrEnum): predefined event types Attributes: - BuildLog(EventType): new build log line - PackageHeld(EventType): package hold status has been changed - PackageOutdated(EventType): package has been marked as out-of-date - PackageRemoved(EventType): package has been removed - PackageStatusChanged(EventType): package build status has been changed - PackageUpdateFailed(EventType): package update has been failed - PackageUpdated(EventType): package has been updated - ServiceStatusChanged(EventType): service status has been changed + BUILD_LOG(EventType): new build log line + PACKAGE_HELD(EventType): package hold status has been changed + PACKAGE_OUTDATED(EventType): package has been marked as out-of-date + PACKAGE_REMOVED(EventType): package has been removed + PACKAGE_STATUS_CHANGED(EventType): package build status has been changed + PACKAGE_UPDATE_FAILED(EventType): package update has been failed + PACKAGE_UPDATED(EventType): package has been updated + SERVICE_STATUS_CHANGED(EventType): service status has been changed """ - BuildLog = "build-log" - PackageHeld = "package-held" - PackageOutdated = "package-outdated" - PackageRemoved = "package-removed" - PackageStatusChanged = "package-status-changed" - PackageUpdateFailed = "package-update-failed" - PackageUpdated = "package-updated" - ServiceStatusChanged = "service-status-changed" + BUILD_LOG = "build-log" + PACKAGE_HELD = "package-held" + PACKAGE_OUTDATED = "package-outdated" + PACKAGE_REMOVED = "package-removed" + PACKAGE_STATUS_CHANGED = "package-status-changed" + PACKAGE_UPDATE_FAILED = "package-update-failed" + PACKAGE_UPDATED = "package-updated" + SERVICE_STATUS_CHANGED = "service-status-changed" class Event: diff --git a/ahriman-core/src/ahriman/models/log_handler.py b/ahriman-core/src/ahriman/models/log_handler.py index 2deb2c83..e2314d13 100644 --- a/ahriman-core/src/ahriman/models/log_handler.py +++ b/ahriman-core/src/ahriman/models/log_handler.py @@ -25,11 +25,11 @@ class LogHandler(StrEnum): log handler as described by default configuration Attributes: - Console(LogHandler): write logs to console - Syslog(LogHandler): write logs to syslog device /dev/null - Journald(LogHandler): write logs to journald directly + CONSOLE(LogHandler): write logs to console + SYSLOG(LogHandler): write logs to syslog device /dev/null + JOURNALD(LogHandler): write logs to journald directly """ - Console = "console" - Syslog = "syslog" - Journald = "journald" + CONSOLE = "console" + SYSLOG = "syslog" + JOURNALD = "journald" diff --git a/ahriman-core/src/ahriman/models/log_record.py b/ahriman-core/src/ahriman/models/log_record.py index f89894be..bfc2ab04 100644 --- a/ahriman-core/src/ahriman/models/log_record.py +++ b/ahriman-core/src/ahriman/models/log_record.py @@ -50,13 +50,8 @@ class LogRecord: Returns: Self: log record object """ - if "process_id" in dump: - log_record_id = LogRecordId(package_base, dump["version"], dump["process_id"]) - else: - log_record_id = LogRecordId(package_base, dump["version"]) - return cls( - log_record_id=log_record_id, + log_record_id=LogRecordId(package_base, dump["version"], dump.get("process_id", "")), created=dump["created"], message=dump["message"], ) diff --git a/ahriman-core/src/ahriman/models/package.py b/ahriman-core/src/ahriman/models/package.py index be0286be..e776c86f 100644 --- a/ahriman-core/src/ahriman/models/package.py +++ b/ahriman-core/src/ahriman/models/package.py @@ -62,10 +62,10 @@ class Package(LazyLogging): The specific class load method must be defined based on the source provided. The following methods (mostly) must be used: :func:`from_archive()`, :func:`from_aur()`, :func:`from_build()`, :func:`from_official()` for sources - :attr:`ahriman.models.package_source.PackageSource.Archive`, + :attr:`ahriman.models.package_source.PackageSource.ARCHIVE`, :attr:`ahriman.models.package_source.PackageSource.AUR`, - :attr:`ahriman.models.package_source.PackageSource.Local` and - :attr:`ahriman.models.package_source.PackageSource.Repository` respectively: + :attr:`ahriman.models.package_source.PackageSource.LOCAL` and + :attr:`ahriman.models.package_source.PackageSource.REPOSITORY` respectively: >>> ahriman_package = Package.from_aur("ahriman") >>> pacman_package = Package.from_official("pacman", pacman) @@ -192,7 +192,7 @@ class Package(LazyLogging): return cls( base=package.base or package.name, version=package.version, - remote=RemoteSource(source=PackageSource.Archive), + remote=RemoteSource(source=PackageSource.ARCHIVE), packages={package.name: description}, packager=package.packager, ) @@ -255,7 +255,7 @@ class Package(LazyLogging): version = full_version(pkgbuild.get("epoch"), pkgbuild["pkgver"], pkgbuild["pkgrel"]) remote = RemoteSource( - source=PackageSource.Local, + source=PackageSource.LOCAL, git_url=path.absolute().as_uri(), web_url=None, path=".", @@ -315,7 +315,7 @@ class Package(LazyLogging): package = impl.info(name, pacman=pacman, include_provides=include_provides) remote = RemoteSource( - source=PackageSource.Repository, + source=PackageSource.REPOSITORY, git_url=Official.remote_git_url(package.package_base, package.repository), web_url=Official.remote_web_url(package.package_base), path=".", diff --git a/ahriman-core/src/ahriman/models/package_source.py b/ahriman-core/src/ahriman/models/package_source.py index 2adb6956..0315d821 100644 --- a/ahriman-core/src/ahriman/models/package_source.py +++ b/ahriman-core/src/ahriman/models/package_source.py @@ -32,31 +32,31 @@ class PackageSource(StrEnum): package source for addition enumeration Attributes: - Auto(PackageSource): automatically determine type of the source - Archive(PackageSource): source is a package archive + AUTO(PackageSource): automatically determine type of the source + ARCHIVE(PackageSource): source is a package archive AUR(PackageSource): source is an AUR package for which it should search - Directory(PackageSource): source is a directory which contains packages - Local(PackageSource): source is locally stored PKGBUILD - Remote(PackageSource): source is remote (http, ftp etc...) link - Repository(PackageSource): source is official repository + DIRECTORY(PackageSource): source is a directory which contains packages + LOCAL(PackageSource): source is locally stored PKGBUILD + REMOTE(PackageSource): source is remote (http, ftp etc...) link + REPOSITORY(PackageSource): source is official repository Examples: In case if source is unknown the :func:`resolve()` and the source descriptor is available method must be used:: - >>> real_source = PackageSource.Auto.resolve("ahriman", configuration.repository_paths) + >>> real_source = PackageSource.AUTO.resolve("ahriman", configuration.repository_paths) - the code above will ensure that the presudo-source :attr:`Auto` + the code above will ensure that the presudo-source :attr:`AUTO` will not be processed later. """ - Auto = "auto" - Archive = "archive" + AUTO = "auto" + ARCHIVE = "archive" AUR = "aur" - Directory = "directory" - Local = "local" - Remote = "remote" - Repository = "repository" + DIRECTORY = "directory" + LOCAL = "local" + REMOTE = "remote" + REPOSITORY = "repository" def resolve(self, source: str, paths: RepositoryPaths) -> PackageSource: """ @@ -69,21 +69,21 @@ class PackageSource(StrEnum): Returns: PackageSource: non-auto type of the package source """ - if self != PackageSource.Auto: + if self != PackageSource.AUTO: return self maybe_url = urlparse(source) # handle file:// like paths maybe_path = Path(maybe_url.path) if maybe_url.scheme and maybe_url.scheme not in ("data", "file") and package_like(maybe_path): - return PackageSource.Remote + return PackageSource.REMOTE try: if (maybe_path / "PKGBUILD").is_file() or paths.cache_for(source).is_dir(): - return PackageSource.Local + return PackageSource.LOCAL if maybe_path.is_dir(): - return PackageSource.Directory + return PackageSource.DIRECTORY if maybe_path.is_file() and package_like(maybe_path): - return PackageSource.Archive + return PackageSource.ARCHIVE except PermissionError: # in some cases (e.g. if you run from your home directory with sudo) # it will try to read files to which it has no access. diff --git a/ahriman-core/src/ahriman/models/pacman_synchronization.py b/ahriman-core/src/ahriman/models/pacman_synchronization.py index 5ed2216a..ba67bed0 100644 --- a/ahriman-core/src/ahriman/models/pacman_synchronization.py +++ b/ahriman-core/src/ahriman/models/pacman_synchronization.py @@ -25,11 +25,11 @@ class PacmanSynchronization(IntEnum): pacman database synchronization flag Attributes: - Disabled(PacmanSynchronization): do not synchronize local database - Enabled(PacmanSynchronization): synchronize local database (same as pacman -Sy) - Force(PacmanSynchronization): force synchronize local database (same as pacman -Syy) + DISABLED(PacmanSynchronization): do not synchronize local database + ENABLED(PacmanSynchronization): synchronize local database (same as pacman -Sy) + FORCE(PacmanSynchronization): force synchronize local database (same as pacman -Syy) """ - Disabled = 0 - Enabled = 1 - Force = 2 + DISABLED = 0 + ENABLED = 1 + FORCE = 2 diff --git a/ahriman-core/src/ahriman/models/pkgbuild_patch.py b/ahriman-core/src/ahriman/models/pkgbuild_patch.py index ece281ab..ab3f4f4c 100644 --- a/ahriman-core/src/ahriman/models/pkgbuild_patch.py +++ b/ahriman-core/src/ahriman/models/pkgbuild_patch.py @@ -20,9 +20,10 @@ import json import shlex +from collections.abc import Iterator from dataclasses import dataclass, fields from pathlib import Path -from typing import Any, Iterator, Self +from typing import Any, Self from ahriman.core.configuration.shell_template import ShellTemplate from ahriman.core.utils import dataclass_view, filter_json diff --git a/ahriman-core/src/ahriman/models/remote_source.py b/ahriman-core/src/ahriman/models/remote_source.py index 843a513d..d833a954 100644 --- a/ahriman-core/src/ahriman/models/remote_source.py +++ b/ahriman-core/src/ahriman/models/remote_source.py @@ -59,7 +59,7 @@ class RemoteSource: Returns: bool: ``True`` in case if package is well-known remote source (e.g. AUR) and ``False`` otherwise """ - return self.source in (PackageSource.AUR, PackageSource.Repository) + return self.source in (PackageSource.AUR, PackageSource.REPOSITORY) @property def pkgbuild_dir(self) -> Path | None: diff --git a/ahriman-core/src/ahriman/models/report_settings.py b/ahriman-core/src/ahriman/models/report_settings.py index 32811598..8e69c8dd 100644 --- a/ahriman-core/src/ahriman/models/report_settings.py +++ b/ahriman-core/src/ahriman/models/report_settings.py @@ -27,22 +27,22 @@ class ReportSettings(StrEnum): report targets enumeration Attributes: - Disabled(ReportSettings): option which generates no report for testing purpose + DISABLED(ReportSettings): option which generates no report for testing purpose HTML(ReportSettings): HTML report generation - Email(ReportSettings): email report generation - Console(ReportSettings): print result to console - Telegram(ReportSettings): Markdown report to telegram channel + EMAIL(ReportSettings): email report generation + CONSOLE(ReportSettings): print result to console + TELEGRAM(ReportSettings): Markdown report to telegram channel RSS(ReportSettings): RSS report generation - RemoteCall(ReportSettings): remote ahriman server call + REMOTE_CALL(ReportSettings): remote ahriman server call """ - Disabled = "disabled" # for testing purpose + DISABLED = "disabled" # for testing purpose HTML = "html" - Email = "email" - Console = "console" - Telegram = "telegram" + EMAIL = "email" + CONSOLE = "console" + TELEGRAM = "telegram" RSS = "rss" - RemoteCall = "remote-call" + REMOTE_CALL = "remote-call" @staticmethod def from_option(value: str) -> ReportSettings: # pylint: disable=too-many-return-statements @@ -59,14 +59,14 @@ class ReportSettings(StrEnum): case "html": return ReportSettings.HTML case "email": - return ReportSettings.Email + return ReportSettings.EMAIL case "console": - return ReportSettings.Console + return ReportSettings.CONSOLE case "telegram": - return ReportSettings.Telegram + return ReportSettings.TELEGRAM case "rss": return ReportSettings.RSS case "ahriman" | "remote-call": - return ReportSettings.RemoteCall + return ReportSettings.REMOTE_CALL case _: - return ReportSettings.Disabled + return ReportSettings.DISABLED diff --git a/ahriman-core/src/ahriman/models/sign_settings.py b/ahriman-core/src/ahriman/models/sign_settings.py index 67b54de8..6865537d 100644 --- a/ahriman-core/src/ahriman/models/sign_settings.py +++ b/ahriman-core/src/ahriman/models/sign_settings.py @@ -27,14 +27,14 @@ class SignSettings(StrEnum): sign targets enumeration Attributes: - Disabled(SignSettings): option which generates no report for testing purpose - Packages(SignSettings): sign each package - Repository(SignSettings): sign repository database file + DISABLED(SignSettings): option which generates no report for testing purpose + PACKAGES(SignSettings): sign each package + REPOSITORY(SignSettings): sign repository database file """ - Disabled = "disabled" - Packages = "packages" - Repository = "repository" + DISABLED = "disabled" + PACKAGES = "packages" + REPOSITORY = "repository" @staticmethod def from_option(value: str) -> SignSettings: @@ -49,8 +49,8 @@ class SignSettings(StrEnum): """ match value.lower(): case "package" | "packages" | "sign-package": - return SignSettings.Packages + return SignSettings.PACKAGES case "repository" | "sign-repository": - return SignSettings.Repository + return SignSettings.REPOSITORY case _: - return SignSettings.Disabled + return SignSettings.DISABLED diff --git a/ahriman-core/src/ahriman/models/smtp_ssl_settings.py b/ahriman-core/src/ahriman/models/smtp_ssl_settings.py index bf1fef8e..7e75bbee 100644 --- a/ahriman-core/src/ahriman/models/smtp_ssl_settings.py +++ b/ahriman-core/src/ahriman/models/smtp_ssl_settings.py @@ -27,12 +27,12 @@ class SmtpSSLSettings(StrEnum): SMTP SSL mode enumeration Attributes: - Disabled(SmtpSSLSettings): no SSL enabled + DISABLED(SmtpSSLSettings): no SSL enabled SSL(SmtpSSLSettings): use SMTP_SSL instead of normal SMTP client STARTTLS(SmtpSSLSettings): use STARTTLS in normal SMTP client """ - Disabled = "disabled" + DISABLED = "disabled" SSL = "ssl" STARTTLS = "starttls" @@ -53,4 +53,4 @@ class SmtpSSLSettings(StrEnum): case "starttls": return SmtpSSLSettings.STARTTLS case _: - return SmtpSSLSettings.Disabled + return SmtpSSLSettings.DISABLED diff --git a/ahriman-core/src/ahriman/models/upload_settings.py b/ahriman-core/src/ahriman/models/upload_settings.py index 43f264c1..ccaa7188 100644 --- a/ahriman-core/src/ahriman/models/upload_settings.py +++ b/ahriman-core/src/ahriman/models/upload_settings.py @@ -27,18 +27,18 @@ class UploadSettings(StrEnum): remote synchronization targets enumeration Attributes: - Disabled(UploadSettings): no sync will be performed, required for testing purpose - Rsync(UploadSettings): sync via rsync + DISABLED(UploadSettings): no sync will be performed, required for testing purpose + RSYNC(UploadSettings): sync via rsync S3(UploadSettings): sync to Amazon S3 - GitHub(UploadSettings): sync to GitHub releases page - RemoteService(UploadSettings): sync to another ahriman instance + GITHUB(UploadSettings): sync to GitHub releases page + REMOTE_SERVICE(UploadSettings): sync to another ahriman instance """ - Disabled = "disabled" # for testing purpose - Rsync = "rsync" + DISABLED = "disabled" # for testing purpose + RSYNC = "rsync" S3 = "s3" - GitHub = "github" - RemoteService = "remote-service" + GITHUB = "github" + REMOTE_SERVICE = "remote-service" @staticmethod def from_option(value: str) -> UploadSettings: @@ -53,12 +53,12 @@ class UploadSettings(StrEnum): """ match value.lower(): case "rsync": - return UploadSettings.Rsync + return UploadSettings.RSYNC case "s3": return UploadSettings.S3 case "github": - return UploadSettings.GitHub + return UploadSettings.GITHUB case "ahriman" | "remote-service": - return UploadSettings.RemoteService + return UploadSettings.REMOTE_SERVICE case _: - return UploadSettings.Disabled + return UploadSettings.DISABLED diff --git a/ahriman-core/src/ahriman/models/user.py b/ahriman-core/src/ahriman/models/user.py index ddfd19fd..6426055e 100644 --- a/ahriman-core/src/ahriman/models/user.py +++ b/ahriman-core/src/ahriman/models/user.py @@ -43,7 +43,7 @@ class User: Simply create user from database data and perform required validation:: >>> password = User.generate_password(24) - >>> user = User(username="ahriman", password=password, access=UserAccess.Full) + >>> user = User(username="ahriman", password=password, access=UserAccess.FULL) Since the password supplied may be plain text, the :func:`hash_password()` method can be used to hash the password:: @@ -59,7 +59,7 @@ class User: ...and finally access can be verified:: - >>> if user.verify_access(UserAccess.Read): + >>> if user.verify_access(UserAccess.READ): >>> print(f"user {user.username} has read access") """ diff --git a/ahriman-core/src/ahriman/models/user_access.py b/ahriman-core/src/ahriman/models/user_access.py index 3fc70a7d..0f8fd709 100644 --- a/ahriman-core/src/ahriman/models/user_access.py +++ b/ahriman-core/src/ahriman/models/user_access.py @@ -27,17 +27,17 @@ class UserAccess(StrEnum): web user access enumeration Attributes: - Unauthorized(UserAccess): user can access specific resources which are marked as available + UNAUTHORIZED(UserAccess): user can access specific resources which are marked as available without authorization (e.g. login, logout, static) - Read(UserAccess): user can read the page - Reporter(UserAccess): user can read everything and is able to perform some modifications - Full(UserAccess): user has full access + READ(UserAccess): user can read the page + REPORTER(UserAccess): user can read everything and is able to perform some modifications + FULL(UserAccess): user has full access """ - Unauthorized = "unauthorized" - Read = "read" - Reporter = "reporter" - Full = "full" + UNAUTHORIZED = "unauthorized" + READ = "read" + REPORTER = "reporter" + FULL = "full" def permits(self, other: UserAccess) -> bool: """ diff --git a/ahriman-core/tests/ahriman/application/application/test_application.py b/ahriman-core/tests/ahriman/application/application/test_application.py index 400cd28c..ac33262e 100644 --- a/ahriman-core/tests/ahriman/application/application/test_application.py +++ b/ahriman-core/tests/ahriman/application/application/test_application.py @@ -59,7 +59,7 @@ def test_print_updates(application: Application, package_ahriman: Package, mocke mocker.patch("ahriman.core.repository.repository.Repository.packages", return_value=[package_ahriman]) print_mock = mocker.patch("ahriman.core.formatters.Printer.print") - application.print_updates(BuildPlan().update([package_ahriman], BuildPlanReason.RegularUpdate), log_fn=print) + application.print_updates(BuildPlan().update([package_ahriman], BuildPlanReason.REGULAR_UPDATE), log_fn=print) print_mock.assert_called_once_with(verbose=True, log_fn=print, separator=": ") @@ -99,7 +99,7 @@ def test_with_dependencies(application: Application, package_ahriman: Package, p return_value={"devtools", "python-build", "python-pytest"}) status_client_mock = mocker.patch("ahriman.core.status.Client.set_unknown") - plan = BuildPlan().update([package_ahriman], BuildPlanReason.RegularUpdate) + plan = BuildPlan().update([package_ahriman], BuildPlanReason.REGULAR_UPDATE) result = application.with_dependencies(plan, process_dependencies=True) assert {package.base: package for package in result} == packages assert result.item(package_ahriman.base).requester is None @@ -144,7 +144,7 @@ def test_with_dependencies_split(application: Application, package_ahriman: Pack plan = BuildPlan().update([ package("ahriman", "ahriman", ["ahriman-core", "ahriman-web"]) - ], BuildPlanReason.ManualRequest) + ], BuildPlanReason.MANUAL_REQUEST) result = application.with_dependencies(plan, process_dependencies=True) assert [[item.base for item in level] for level in Tree.resolve(result)] == [ ["python-tree-sitter-bash"], ["ahriman"], @@ -152,7 +152,7 @@ def test_with_dependencies_split(application: Application, package_ahriman: Pack plan_item = result.item("ahriman") assert plan_item.package.packages.keys() == {"ahriman", "ahriman-core", "ahriman-web"} - assert plan_item.reason == BuildPlanReason.ManualRequest + assert plan_item.reason == BuildPlanReason.MANUAL_REQUEST assert plan_item.requester is None @@ -188,7 +188,7 @@ def test_with_dependencies_exception(application: Application, package_ahriman: return_value={"devtools", "python-build", "python-pytest"}) plan = BuildPlan() - plan.add(package_ahriman, BuildPlanReason.RegularUpdate) + plan.add(package_ahriman, BuildPlanReason.REGULAR_UPDATE) assert application.with_dependencies(plan, process_dependencies=True) is plan assert plan.packages == [package_ahriman] @@ -199,7 +199,7 @@ def test_with_dependencies_skip(application: Application, package_ahriman: Packa """ packages_mock = mocker.patch("ahriman.application.application.Application._known_packages") - plan = BuildPlan().update([package_ahriman], BuildPlanReason.RegularUpdate) + plan = BuildPlan().update([package_ahriman], BuildPlanReason.REGULAR_UPDATE) assert application.with_dependencies(plan, process_dependencies=False).packages == [package_ahriman] packages_mock.assert_not_called() diff --git a/ahriman-core/tests/ahriman/application/application/test_application_packages.py b/ahriman-core/tests/ahriman/application/application/test_application_packages.py index ec8e2553..c9e74b9e 100644 --- a/ahriman-core/tests/ahriman/application/application/test_application_packages.py +++ b/ahriman-core/tests/ahriman/application/application/test_application_packages.py @@ -167,7 +167,7 @@ def test_add_add_archive(application_packages: ApplicationPackages, package_ahri """ add_mock = mocker.patch("ahriman.application.application.application_packages.ApplicationPackages._add_archive") - application_packages.add([package_ahriman.base], PackageSource.Archive, "packager") + application_packages.add([package_ahriman.base], PackageSource.ARCHIVE, "packager") add_mock.assert_called_once_with(package_ahriman.base, "packager") @@ -189,7 +189,7 @@ def test_add_add_directory(application_packages: ApplicationPackages, package_ah """ add_mock = mocker.patch("ahriman.application.application.application_packages.ApplicationPackages._add_directory") - application_packages.add([package_ahriman.base], PackageSource.Directory, "packager") + application_packages.add([package_ahriman.base], PackageSource.DIRECTORY, "packager") add_mock.assert_called_once_with(package_ahriman.base, "packager") @@ -200,7 +200,7 @@ def test_add_add_local(application_packages: ApplicationPackages, package_ahrima """ add_mock = mocker.patch("ahriman.application.application.application_packages.ApplicationPackages._add_local") - application_packages.add([package_ahriman.base], PackageSource.Local, "packager") + application_packages.add([package_ahriman.base], PackageSource.LOCAL, "packager") add_mock.assert_called_once_with(package_ahriman.base, "packager") @@ -212,7 +212,7 @@ def test_add_add_remote(application_packages: ApplicationPackages, package_descr add_mock = mocker.patch("ahriman.application.application.application_packages.ApplicationPackages._add_remote") url = f"https://host/{package_description_ahriman.filename}" - application_packages.add([url], PackageSource.Remote, "packager") + application_packages.add([url], PackageSource.REMOTE, "packager") add_mock.assert_called_once_with(url, "packager") diff --git a/ahriman-core/tests/ahriman/application/handlers/test_handler.py b/ahriman-core/tests/ahriman/application/handlers/test_handler.py index 52e8ff00..52f37b37 100644 --- a/ahriman-core/tests/ahriman/application/handlers/test_handler.py +++ b/ahriman-core/tests/ahriman/application/handlers/test_handler.py @@ -16,7 +16,7 @@ def test_call(args: argparse.Namespace, configuration: Configuration, mocker: Mo must call inside lock """ args.configuration = Path("") - args.log_handler = LogHandler.Console + args.log_handler = LogHandler.CONSOLE args.quiet = False args.report = False mocker.patch("ahriman.application.handlers.handler.Handler.run") diff --git a/ahriman-core/tests/ahriman/application/handlers/test_handler_add.py b/ahriman-core/tests/ahriman/application/handlers/test_handler_add.py index 17d82aeb..b21a2a75 100644 --- a/ahriman-core/tests/ahriman/application/handlers/test_handler_add.py +++ b/ahriman-core/tests/ahriman/application/handlers/test_handler_add.py @@ -24,7 +24,7 @@ def _default_args(args: argparse.Namespace) -> argparse.Namespace: args.package = ["ahriman"] args.now = False args.refresh = 0 - args.source = PackageSource.Auto + args.source = PackageSource.AUTO args.username = "username" args.variable = None return args diff --git a/ahriman-core/tests/ahriman/application/handlers/test_handler_archives.py b/ahriman-core/tests/ahriman/application/handlers/test_handler_archives.py index b584eafa..9992a32a 100644 --- a/ahriman-core/tests/ahriman/application/handlers/test_handler_archives.py +++ b/ahriman-core/tests/ahriman/application/handlers/test_handler_archives.py @@ -21,7 +21,7 @@ def _default_args(args: argparse.Namespace) -> argparse.Namespace: Returns: argparse.Namespace: generated arguments for these test cases """ - args.action = Action.List + args.action = Action.LIST args.exit_code = False args.info = False args.package = "package" diff --git a/ahriman-core/tests/ahriman/application/handlers/test_handler_change.py b/ahriman-core/tests/ahriman/application/handlers/test_handler_change.py index 9e17456f..f0431d39 100644 --- a/ahriman-core/tests/ahriman/application/handlers/test_handler_change.py +++ b/ahriman-core/tests/ahriman/application/handlers/test_handler_change.py @@ -21,7 +21,7 @@ def _default_args(args: argparse.Namespace) -> argparse.Namespace: Returns: argparse.Namespace: generated arguments for these test cases """ - args.action = Action.List + args.action = Action.LIST args.exit_code = False args.package = "package" return args @@ -68,7 +68,7 @@ def test_run_remove(args: argparse.Namespace, configuration: Configuration, repo must remove package changes """ args = _default_args(args) - args.action = Action.Remove + args.action = Action.REMOVE mocker.patch("ahriman.core.repository.Repository.load", return_value=repository) update_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_changes_update") diff --git a/ahriman-core/tests/ahriman/application/handlers/test_handler_copy.py b/ahriman-core/tests/ahriman/application/handlers/test_handler_copy.py index c0796db9..112b7948 100644 --- a/ahriman-core/tests/ahriman/application/handlers/test_handler_copy.py +++ b/ahriman-core/tests/ahriman/application/handlers/test_handler_copy.py @@ -102,9 +102,9 @@ def test_copy_package(package_ahriman: Package, application: Application, mocker path = application.repository.paths.repository / package_ahriman.packages[package_ahriman.base].filename Copy.copy_package(package_ahriman, application, application) - add_mock.assert_called_once_with([str(path)], PackageSource.Archive) + add_mock.assert_called_once_with([str(path)], PackageSource.ARCHIVE) changes_get_mock.assert_called_once_with(package_ahriman.base) changes_update_mock.assert_called_once_with(package_ahriman.base, changes_get_mock.return_value) deps_get_mock.assert_called_once_with(package_ahriman.base) deps_update_mock.assert_called_once_with(package_ahriman.base, deps_get_mock.return_value) - package_update_mock.assert_called_once_with(package_ahriman, BuildStatusEnum.Pending) + package_update_mock.assert_called_once_with(package_ahriman, BuildStatusEnum.PENDING) diff --git a/ahriman-core/tests/ahriman/application/handlers/test_handler_hold.py b/ahriman-core/tests/ahriman/application/handlers/test_handler_hold.py index 48072cdd..f63e3f8c 100644 --- a/ahriman-core/tests/ahriman/application/handlers/test_handler_hold.py +++ b/ahriman-core/tests/ahriman/application/handlers/test_handler_hold.py @@ -29,7 +29,7 @@ def test_run(args: argparse.Namespace, configuration: Configuration, repository: must run command """ args = _default_args(args) - args.action = Action.Update + args.action = Action.UPDATE mocker.patch("ahriman.core.repository.Repository.load", return_value=repository) hold_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_hold_update") @@ -44,7 +44,7 @@ def test_run_remove(args: argparse.Namespace, configuration: Configuration, repo must remove held status """ args = _default_args(args) - args.action = Action.Remove + args.action = Action.REMOVE mocker.patch("ahriman.core.repository.Repository.load", return_value=repository) hold_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_hold_update") diff --git a/ahriman-core/tests/ahriman/application/handlers/test_handler_patch.py b/ahriman-core/tests/ahriman/application/handlers/test_handler_patch.py index 46aabd7f..3e6c9ff6 100644 --- a/ahriman-core/tests/ahriman/application/handlers/test_handler_patch.py +++ b/ahriman-core/tests/ahriman/application/handlers/test_handler_patch.py @@ -38,7 +38,7 @@ def test_run(args: argparse.Namespace, configuration: Configuration, repository: must run command """ args = _default_args(args) - args.action = Action.Update + args.action = Action.UPDATE mocker.patch("ahriman.core.repository.Repository.load", return_value=repository) patch_mock = mocker.patch("ahriman.application.handlers.patch.Patch.patch_create_from_diff", return_value=(args.package, PkgbuildPatch(None, "patch"))) @@ -56,7 +56,7 @@ def test_run_function(args: argparse.Namespace, configuration: Configuration, re must run command with patch function flag """ args = _default_args(args) - args.action = Action.Update + args.action = Action.UPDATE args.patch = "patch" args.variable = "version" patch = PkgbuildPatch(args.variable, args.patch) @@ -77,7 +77,7 @@ def test_run_list(args: argparse.Namespace, configuration: Configuration, reposi must run command with list flag """ args = _default_args(args) - args.action = Action.List + args.action = Action.LIST args.variable = ["version"] mocker.patch("ahriman.core.repository.Repository.load", return_value=repository) application_mock = mocker.patch("ahriman.application.handlers.patch.Patch.patch_set_list") @@ -93,7 +93,7 @@ def test_run_remove(args: argparse.Namespace, configuration: Configuration, repo must run command with remove flag """ args = _default_args(args) - args.action = Action.Remove + args.action = Action.REMOVE args.variable = ["version"] mocker.patch("ahriman.core.repository.Repository.load", return_value=repository) application_mock = mocker.patch("ahriman.application.handlers.patch.Patch.patch_set_remove") diff --git a/ahriman-core/tests/ahriman/application/handlers/test_handler_pkgbuild.py b/ahriman-core/tests/ahriman/application/handlers/test_handler_pkgbuild.py index d6a2b8bd..7d718a5d 100644 --- a/ahriman-core/tests/ahriman/application/handlers/test_handler_pkgbuild.py +++ b/ahriman-core/tests/ahriman/application/handlers/test_handler_pkgbuild.py @@ -21,7 +21,7 @@ def _default_args(args: argparse.Namespace) -> argparse.Namespace: Returns: argparse.Namespace: generated arguments for these test cases """ - args.action = Action.List + args.action = Action.LIST args.exit_code = False args.package = "package" return args @@ -68,7 +68,7 @@ def test_run_remove(args: argparse.Namespace, configuration: Configuration, repo must remove package pkgbuild """ args = _default_args(args) - args.action = Action.Remove + args.action = Action.REMOVE mocker.patch("ahriman.core.repository.Repository.load", return_value=repository) changes = Changes("sha", "change", "pkgbuild content") mocker.patch("ahriman.core.status.local_client.LocalClient.package_changes_get", return_value=changes) diff --git a/ahriman-core/tests/ahriman/application/handlers/test_handler_rebuild.py b/ahriman-core/tests/ahriman/application/handlers/test_handler_rebuild.py index bcb7f531..12cbbae3 100644 --- a/ahriman-core/tests/ahriman/application/handlers/test_handler_rebuild.py +++ b/ahriman-core/tests/ahriman/application/handlers/test_handler_rebuild.py @@ -54,7 +54,7 @@ def test_run(args: argparse.Namespace, package_ahriman: Package, configuration: _, repository_id = configuration.check_loaded() Rebuild.run(args, repository_id, configuration, report=False) - plan = BuildPlan().update([package_ahriman], BuildPlanReason.Rebuild) + plan = BuildPlan().update([package_ahriman], BuildPlanReason.REBUILD) extract_mock.assert_called_once_with(pytest.helpers.anyvar(int), args.status, from_database=args.from_database) application_packages_mock.assert_called_once_with([package_ahriman], None) print_mock.assert_called_once_with(plan, pytest.helpers.anyvar(int), bump_pkgrel=args.increment) @@ -97,7 +97,7 @@ def test_run_dry_run(args: argparse.Namespace, configuration: Configuration, rep _, repository_id = configuration.check_loaded() Rebuild.run(args, repository_id, configuration, report=False) application_mock.assert_not_called() - plan = BuildPlan().update([package_ahriman], BuildPlanReason.Rebuild) + plan = BuildPlan().update([package_ahriman], BuildPlanReason.REBUILD) check_mock.assert_called_once_with(False, plan) print_mock.assert_called_once_with(plan, pytest.helpers.anyvar(int), bump_pkgrel=args.increment) @@ -189,10 +189,10 @@ def test_extract_packages_by_status(application: Application, mocker: MockerFixt must extract packages from database and filter them by status """ packages_mock = mocker.patch("ahriman.core.database.SQLite.packages_get", return_value=[ - ("package1", BuildStatus(BuildStatusEnum.Success)), - ("package2", BuildStatus(BuildStatusEnum.Failed)), + ("package1", BuildStatus(BuildStatusEnum.SUCCESS)), + ("package2", BuildStatus(BuildStatusEnum.FAILED)), ]) - assert Rebuild.extract_packages(application, BuildStatusEnum.Failed, from_database=True) == ["package2"] + assert Rebuild.extract_packages(application, BuildStatusEnum.FAILED, from_database=True) == ["package2"] packages_mock.assert_called_once_with(application.repository_id) diff --git a/ahriman-core/tests/ahriman/application/handlers/test_handler_setup.py b/ahriman-core/tests/ahriman/application/handlers/test_handler_setup.py index aa1b5765..b71e40b3 100644 --- a/ahriman-core/tests/ahriman/application/handlers/test_handler_setup.py +++ b/ahriman-core/tests/ahriman/application/handlers/test_handler_setup.py @@ -39,7 +39,7 @@ def _default_args(args: argparse.Namespace) -> argparse.Namespace: args.repository = "aur" args.server = None args.sign_key = "key" - args.sign_target = [SignSettings.Packages] + args.sign_target = [SignSettings.PACKAGES] args.web_port = 8080 args.web_unix_socket = Path("/var/lib/ahriman/ahriman-web.sock") return args diff --git a/ahriman-core/tests/ahriman/application/handlers/test_handler_statistics.py b/ahriman-core/tests/ahriman/application/handlers/test_handler_statistics.py index b39acc46..dfb88266 100644 --- a/ahriman-core/tests/ahriman/application/handlers/test_handler_statistics.py +++ b/ahriman-core/tests/ahriman/application/handlers/test_handler_statistics.py @@ -25,7 +25,7 @@ def _default_args(args: argparse.Namespace) -> argparse.Namespace: argparse.Namespace: generated arguments for these test cases """ args.chart = None - args.event = EventType.PackageUpdated + args.event = EventType.PACKAGE_UPDATED args.from_date = None args.limit = -1 args.offset = 0 diff --git a/ahriman-core/tests/ahriman/application/handlers/test_handler_status.py b/ahriman-core/tests/ahriman/application/handlers/test_handler_status.py index a2ca0c57..2b809ef0 100644 --- a/ahriman-core/tests/ahriman/application/handlers/test_handler_status.py +++ b/ahriman-core/tests/ahriman/application/handlers/test_handler_status.py @@ -37,8 +37,8 @@ def test_run(args: argparse.Namespace, configuration: Configuration, repository: """ args = _default_args(args) packages = [ - (package_ahriman, BuildStatus(BuildStatusEnum.Success)), - (package_python_schedule, BuildStatus(BuildStatusEnum.Failed)), + (package_ahriman, BuildStatus(BuildStatusEnum.SUCCESS)), + (package_python_schedule, BuildStatus(BuildStatusEnum.FAILED)), ] mocker.patch("ahriman.core.repository.Repository.load", return_value=repository) application_mock = mocker.patch("ahriman.core.status.Client.status_get") @@ -83,7 +83,7 @@ def test_run_verbose(args: argparse.Namespace, configuration: Configuration, rep args.info = True mocker.patch("ahriman.core.repository.Repository.load", return_value=repository) mocker.patch("ahriman.core.status.local_client.LocalClient.package_get", - return_value=[(package_ahriman, BuildStatus(BuildStatusEnum.Success))]) + return_value=[(package_ahriman, BuildStatus(BuildStatusEnum.SUCCESS))]) print_mock = mocker.patch("ahriman.core.formatters.Printer.print") _, repository_id = configuration.check_loaded() @@ -103,7 +103,7 @@ def test_run_with_package_filter(args: argparse.Namespace, configuration: Config args.package = [package_ahriman.base] mocker.patch("ahriman.core.repository.Repository.load", return_value=repository) packages_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_get", - return_value=[(package_ahriman, BuildStatus(BuildStatusEnum.Success))]) + return_value=[(package_ahriman, BuildStatus(BuildStatusEnum.SUCCESS))]) _, repository_id = configuration.check_loaded() Status.run(args, repository_id, configuration, report=False) @@ -116,10 +116,10 @@ def test_run_by_status(args: argparse.Namespace, configuration: Configuration, r must filter packages by status """ args = _default_args(args) - args.status = BuildStatusEnum.Failed + args.status = BuildStatusEnum.FAILED mocker.patch("ahriman.core.status.local_client.LocalClient.package_get", - return_value=[(package_ahriman, BuildStatus(BuildStatusEnum.Success)), - (package_python_schedule, BuildStatus(BuildStatusEnum.Failed))]) + return_value=[(package_ahriman, BuildStatus(BuildStatusEnum.SUCCESS)), + (package_python_schedule, BuildStatus(BuildStatusEnum.FAILED))]) mocker.patch("ahriman.core.repository.Repository.load", return_value=repository) print_mock = mocker.patch("ahriman.core.formatters.Printer.print") diff --git a/ahriman-core/tests/ahriman/application/handlers/test_handler_status_update.py b/ahriman-core/tests/ahriman/application/handlers/test_handler_status_update.py index f5213962..7e13ef99 100644 --- a/ahriman-core/tests/ahriman/application/handlers/test_handler_status_update.py +++ b/ahriman-core/tests/ahriman/application/handlers/test_handler_status_update.py @@ -22,8 +22,8 @@ def _default_args(args: argparse.Namespace) -> argparse.Namespace: argparse.Namespace: generated arguments for these test cases """ args.package = None - args.action = Action.Update - args.status = BuildStatusEnum.Success + args.action = Action.UPDATE + args.status = BuildStatusEnum.SUCCESS return args @@ -63,7 +63,7 @@ def test_run_remove(args: argparse.Namespace, configuration: Configuration, repo """ args = _default_args(args) args.package = [package_ahriman.base] - args.action = Action.Remove + args.action = Action.REMOVE mocker.patch("ahriman.core.repository.Repository.load", return_value=repository) update_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_remove") diff --git a/ahriman-core/tests/ahriman/application/handlers/test_handler_update.py b/ahriman-core/tests/ahriman/application/handlers/test_handler_update.py index 3bb6fb01..fb92c71f 100644 --- a/ahriman-core/tests/ahriman/application/handlers/test_handler_update.py +++ b/ahriman-core/tests/ahriman/application/handlers/test_handler_update.py @@ -66,7 +66,7 @@ def test_perform_action(args: argparse.Namespace, application: Application, pack result.add_updated(package_ahriman) application_mock = mocker.patch("ahriman.application.application.Application.update", return_value=result) check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_status") - plan = BuildPlan().update([package_ahriman], BuildPlanReason.RegularUpdate) + plan = BuildPlan().update([package_ahriman], BuildPlanReason.REGULAR_UPDATE) dependencies_mock = mocker.patch("ahriman.application.application.Application.with_dependencies", return_value=plan) updates_mock = mocker.patch("ahriman.application.application.Application.updates", return_value=plan) @@ -110,7 +110,7 @@ def test_perform_action_update_empty_exception(args: argparse.Namespace, applica args = _default_args(args) args.exit_code = True mocker.patch("ahriman.application.application.Application.update", return_value=Result()) - plan = BuildPlan().update([package_ahriman], BuildPlanReason.RegularUpdate) + plan = BuildPlan().update([package_ahriman], BuildPlanReason.REGULAR_UPDATE) mocker.patch("ahriman.application.application.Application.updates", return_value=plan) mocker.patch("ahriman.application.application.Application.with_dependencies", return_value=plan) mocker.patch("ahriman.application.application.Application.changes") @@ -131,7 +131,7 @@ def test_perform_action_dry_run(args: argparse.Namespace, application: Applicati application_mock = mocker.patch("ahriman.application.application.Application.update") check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_status") print_mock = mocker.patch("ahriman.application.application.Application.print_updates") - plan = BuildPlan().update([package_ahriman], BuildPlanReason.RegularUpdate) + plan = BuildPlan().update([package_ahriman], BuildPlanReason.REGULAR_UPDATE) dependencies_mock = mocker.patch("ahriman.application.application.Application.with_dependencies", return_value=plan) updates_mock = mocker.patch("ahriman.application.application.Application.updates", return_value=plan) diff --git a/ahriman-core/tests/ahriman/application/handlers/test_handler_users.py b/ahriman-core/tests/ahriman/application/handlers/test_handler_users.py index e964e13f..4ee17cad 100644 --- a/ahriman-core/tests/ahriman/application/handlers/test_handler_users.py +++ b/ahriman-core/tests/ahriman/application/handlers/test_handler_users.py @@ -24,12 +24,12 @@ def _default_args(args: argparse.Namespace) -> argparse.Namespace: argparse.Namespace: generated arguments for these test cases """ args.username = "user" - args.action = Action.Update + args.action = Action.UPDATE args.exit_code = False args.key = "key" args.packager = "packager" args.password = "pa55w0rd" - args.role = UserAccess.Reporter + args.role = UserAccess.REPORTER return args @@ -97,7 +97,7 @@ def test_run_list(args: argparse.Namespace, configuration: Configuration, databa must list available users """ args = _default_args(args) - args.action = Action.List + args.action = Action.LIST mocker.patch("ahriman.core.database.SQLite.load", return_value=database) check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_status") list_mock = mocker.patch("ahriman.core.database.SQLite.user_list", return_value=[user]) @@ -114,7 +114,7 @@ def test_run_empty_exception(args: argparse.Namespace, configuration: Configurat must raise ExitCode exception on empty user list """ args = _default_args(args) - args.action = Action.List + args.action = Action.LIST args.exit_code = True mocker.patch("ahriman.core.database.SQLite.load", return_value=database) mocker.patch("ahriman.core.database.SQLite.user_list", return_value=[]) @@ -131,7 +131,7 @@ def test_run_remove(args: argparse.Namespace, configuration: Configuration, data must remove user if remove flag supplied """ args = _default_args(args) - args.action = Action.Remove + args.action = Action.REMOVE mocker.patch("ahriman.core.database.SQLite.load", return_value=database) remove_mock = mocker.patch("ahriman.core.database.SQLite.user_remove") diff --git a/ahriman-core/tests/ahriman/application/test_ahriman.py b/ahriman-core/tests/ahriman/application/test_ahriman.py index a6856fae..86fa26d0 100644 --- a/ahriman-core/tests/ahriman/application/test_ahriman.py +++ b/ahriman-core/tests/ahriman/application/test_ahriman.py @@ -288,7 +288,7 @@ def test_subparsers_package_archives(parser: argparse.ArgumentParser) -> None: package-archives command must imply action, exit code, info, lock, quiet, report and unsafe """ args = parser.parse_args(["-a", "x86_64", "-r", "repo", "package-archives", "ahriman"]) - assert args.action == Action.List + assert args.action == Action.LIST assert args.architecture == "x86_64" assert not args.exit_code assert not args.info @@ -304,7 +304,7 @@ def test_subparsers_package_changes(parser: argparse.ArgumentParser) -> None: package-changes command must imply action, exit code, lock, quiet, report and unsafe """ args = parser.parse_args(["-a", "x86_64", "-r", "repo", "package-changes", "ahriman"]) - assert args.action == Action.List + assert args.action == Action.LIST assert args.architecture == "x86_64" assert not args.exit_code assert args.lock is None @@ -319,7 +319,7 @@ def test_subparsers_package_changes_remove(parser: argparse.ArgumentParser) -> N package-changes-remove command must imply action, lock, quiet, report and unsafe """ args = parser.parse_args(["-a", "x86_64", "-r", "repo", "package-changes-remove", "ahriman"]) - assert args.action == Action.Remove + assert args.action == Action.REMOVE assert args.architecture == "x86_64" assert args.lock is None assert args.quiet @@ -362,7 +362,7 @@ def test_subparsers_package_pkgbuild(parser: argparse.ArgumentParser) -> None: package-pkgbuild command must imply action, exit code, lock, quiet, report and unsafe """ args = parser.parse_args(["-a", "x86_64", "-r", "repo", "package-pkgbuild", "ahriman"]) - assert args.action == Action.List + assert args.action == Action.LIST assert args.architecture == "x86_64" assert not args.exit_code assert args.lock is None @@ -377,7 +377,7 @@ def test_subparsers_package_pkgbuild_remove(parser: argparse.ArgumentParser) -> package-pkgbuild-remove command must imply action, lock, quiet, report and unsafe """ args = parser.parse_args(["-a", "x86_64", "-r", "repo", "package-pkgbuild-remove", "ahriman"]) - assert args.action == Action.Remove + assert args.action == Action.REMOVE assert args.architecture == "x86_64" assert args.lock is None assert args.quiet @@ -496,7 +496,7 @@ def test_subparsers_package_status_remove(parser: argparse.ArgumentParser) -> No """ args = parser.parse_args(["-a", "x86_64", "-r", "repo", "package-status-remove", "ahriman"]) assert args.architecture == "x86_64" - assert args.action == Action.Remove + assert args.action == Action.REMOVE assert args.lock is None assert args.quiet assert not args.report @@ -510,7 +510,7 @@ def test_subparsers_package_status_update(parser: argparse.ArgumentParser) -> No """ args = parser.parse_args(["-a", "x86_64", "-r", "repo", "package-status-update"]) assert args.architecture == "x86_64" - assert args.action == Action.Update + assert args.action == Action.UPDATE assert args.lock is None assert args.quiet assert not args.report @@ -543,7 +543,7 @@ def test_subparsers_package_hold(parser: argparse.ArgumentParser) -> None: package-hold command must imply action, lock, quiet, report and unsafe """ args = parser.parse_args(["package-hold", "ahriman"]) - assert args.action == Action.Update + assert args.action == Action.UPDATE assert args.lock is None assert args.quiet assert not args.report @@ -555,7 +555,7 @@ def test_subparsers_package_unhold(parser: argparse.ArgumentParser) -> None: package-unhold command must imply action, lock, quiet, report and unsafe """ args = parser.parse_args(["package-unhold", "ahriman"]) - assert args.action == Action.Remove + assert args.action == Action.REMOVE assert args.lock is None assert args.quiet assert not args.report @@ -567,7 +567,7 @@ def test_subparsers_patch_add(parser: argparse.ArgumentParser) -> None: patch-add command must imply action, architecture list, exit code, lock, report and repository """ args = parser.parse_args(["patch-add", "ahriman", "version"]) - assert args.action == Action.Update + assert args.action == Action.UPDATE assert args.architecture == "" assert not args.exit_code assert args.lock is None @@ -596,7 +596,7 @@ def test_subparsers_patch_list(parser: argparse.ArgumentParser) -> None: patch-list command must imply action, architecture list, lock, report, repository and unsafe """ args = parser.parse_args(["patch-list", "ahriman"]) - assert args.action == Action.List + assert args.action == Action.LIST assert args.architecture == "" assert args.lock is None assert not args.report @@ -651,7 +651,7 @@ def test_subparsers_patch_remove(parser: argparse.ArgumentParser) -> None: patch-remove command must imply action, architecture list, exit code, lock, report and repository """ args = parser.parse_args(["patch-remove", "ahriman"]) - assert args.action == Action.Remove + assert args.action == Action.REMOVE assert args.architecture == "" assert not args.exit_code assert args.lock is None @@ -706,7 +706,7 @@ def test_subparsers_patch_set_add(parser: argparse.ArgumentParser) -> None: patch-set-add command must imply action, architecture list, exit code, lock, report, repository and variable """ args = parser.parse_args(["patch-set-add", "ahriman"]) - assert args.action == Action.Update + assert args.action == Action.UPDATE assert args.architecture == "" assert not args.exit_code assert args.lock is None @@ -1172,7 +1172,7 @@ def test_subparsers_repo_status_update(parser: argparse.ArgumentParser) -> None: """ args = parser.parse_args(["-a", "x86_64", "-r", "repo", "repo-status-update"]) assert args.architecture == "x86_64" - assert args.action == Action.Update + assert args.action == Action.UPDATE assert args.lock is None assert args.quiet assert not args.report @@ -1537,7 +1537,7 @@ def test_subparsers_service_setup_option_sign_target_multiple(parser: argparse.A args = parser.parse_args(["-a", "x86_64", "-r", "repo", "service-setup", "--packager", "ahriman bot ", "--sign-target", "packages", "--sign-target", "repository"]) - assert args.sign_target == [SignSettings.Packages, SignSettings.Repository] + assert args.sign_target == [SignSettings.PACKAGES, SignSettings.REPOSITORY] def test_subparsers_service_shell(parser: argparse.ArgumentParser) -> None: @@ -1564,7 +1564,7 @@ def test_subparsers_user_add(parser: argparse.ArgumentParser) -> None: user-add command must imply action, architecture, exit code, lock, quiet, report and repository """ args = parser.parse_args(["user-add", "username"]) - assert args.action == Action.Update + assert args.action == Action.UPDATE assert args.architecture == "" assert not args.exit_code assert args.lock is None @@ -1604,7 +1604,7 @@ def test_subparsers_user_list(parser: argparse.ArgumentParser) -> None: user-list command must imply action, architecture, lock, quiet, report, repository and unsafe """ args = parser.parse_args(["user-list"]) - assert args.action == Action.List + assert args.action == Action.LIST assert args.architecture == "" assert args.lock is None assert args.quiet @@ -1652,7 +1652,7 @@ def test_subparsers_user_remove(parser: argparse.ArgumentParser) -> None: user-remove command must imply action, architecture, exit code, lock, quiet, report and repository """ args = parser.parse_args(["user-remove", "username"]) - assert args.action == Action.Remove + assert args.action == Action.REMOVE assert args.architecture == "" assert not args.exit_code assert args.lock is None diff --git a/ahriman-core/tests/ahriman/application/test_lock.py b/ahriman-core/tests/ahriman/application/test_lock.py index eab44f0e..49796706 100644 --- a/ahriman-core/tests/ahriman/application/test_lock.py +++ b/ahriman-core/tests/ahriman/application/test_lock.py @@ -278,7 +278,7 @@ def test_enter(lock: Lock, mocker: MockerFixture) -> None: check_user_mock.assert_called_once_with() check_version_mock.assert_called_once_with() lock_mock.assert_called_once_with() - update_status_mock.assert_has_calls([MockCall(BuildStatusEnum.Building), MockCall(BuildStatusEnum.Success)]) + update_status_mock.assert_has_calls([MockCall(BuildStatusEnum.BUILDING), MockCall(BuildStatusEnum.SUCCESS)]) def test_exit_with_exception(lock: Lock, mocker: MockerFixture) -> None: @@ -293,4 +293,4 @@ def test_exit_with_exception(lock: Lock, mocker: MockerFixture) -> None: with pytest.raises(ValueError): with lock: raise ValueError() - update_status_mock.assert_has_calls([MockCall(BuildStatusEnum.Building), MockCall(BuildStatusEnum.Failed)]) + update_status_mock.assert_has_calls([MockCall(BuildStatusEnum.BUILDING), MockCall(BuildStatusEnum.FAILED)]) diff --git a/ahriman-core/tests/ahriman/conftest.py b/ahriman-core/tests/ahriman/conftest.py index af8fd8b5..7d81b71e 100644 --- a/ahriman-core/tests/ahriman/conftest.py +++ b/ahriman-core/tests/ahriman/conftest.py @@ -96,7 +96,7 @@ def pacman(configuration: Configuration) -> Pacman: Pacman: pacman wrapper test instance """ _, repository_id = configuration.check_loaded() - return Pacman(repository_id, configuration, refresh_database=PacmanSynchronization.Disabled) + return Pacman(repository_id, configuration, refresh_database=PacmanSynchronization.DISABLED) @pytest.fixture diff --git a/ahriman-core/tests/ahriman/core/alpm/test_pacman.py b/ahriman-core/tests/ahriman/core/alpm/test_pacman.py index 2153f87a..d11d7823 100644 --- a/ahriman-core/tests/ahriman/core/alpm/test_pacman.py +++ b/ahriman-core/tests/ahriman/core/alpm/test_pacman.py @@ -27,7 +27,7 @@ def test_init_with_local_cache(configuration: Configuration, mocker: MockerFixtu with TemporaryDirectory(ignore_cleanup_errors=True) as pacman_root: mocker.patch.object(RepositoryPaths, "pacman", Path(pacman_root)) # during the creation pyalpm.Handle will create also version file which we would like to remove later - pacman = Pacman(repository_id, configuration, refresh_database=PacmanSynchronization.Enabled) + pacman = Pacman(repository_id, configuration, refresh_database=PacmanSynchronization.ENABLED) assert pacman.handle sync_mock.assert_called_once_with(pytest.helpers.anyvar(int), force=False) @@ -45,7 +45,7 @@ def test_init_with_local_cache_forced(configuration: Configuration, mocker: Mock with TemporaryDirectory(ignore_cleanup_errors=True) as pacman_root: mocker.patch.object(RepositoryPaths, "pacman", Path(pacman_root)) # during the creation pyalpm.Handle will create also version file which we would like to remove later - pacman = Pacman(repository_id, configuration, refresh_database=PacmanSynchronization.Force) + pacman = Pacman(repository_id, configuration, refresh_database=PacmanSynchronization.FORCE) assert pacman.handle sync_mock.assert_called_once_with(pytest.helpers.anyvar(int), force=True) diff --git a/ahriman-core/tests/ahriman/core/build_tools/test_sources.py b/ahriman-core/tests/ahriman/core/build_tools/test_sources.py index 43a22170..cecbf958 100644 --- a/ahriman-core/tests/ahriman/core/build_tools/test_sources.py +++ b/ahriman-core/tests/ahriman/core/build_tools/test_sources.py @@ -137,7 +137,7 @@ def test_fetch_new_without_remote(sources: Sources, mocker: MockerFixture) -> No head_mock = mocker.patch("ahriman.core.build_tools.sources.Sources.head", return_value="sha") local = Path("local") - assert sources.fetch(local, RemoteSource(source=PackageSource.Archive)) == "sha" + assert sources.fetch(local, RemoteSource(source=PackageSource.ARCHIVE)) == "sha" check_output_mock.assert_has_calls([ MockCall(*sources.git(), "checkout", "--force", sources.DEFAULT_BRANCH, cwd=local, logger=pytest.helpers.anyvar(int)), diff --git a/ahriman-core/tests/ahriman/core/database/operations/test_auth_operations.py b/ahriman-core/tests/ahriman/core/database/operations/test_auth_operations.py index 8af74293..12fbd55a 100644 --- a/ahriman-core/tests/ahriman/core/database/operations/test_auth_operations.py +++ b/ahriman-core/tests/ahriman/core/database/operations/test_auth_operations.py @@ -29,9 +29,9 @@ def test_user_list_filter_by_username(database: SQLite) -> None: """ must return users filtered by its id """ - first = User(username="1", password="", access=UserAccess.Read, packager_id=None, key=None) - second = User(username="2", password="", access=UserAccess.Full, packager_id=None, key=None) - third = User(username="3", password="", access=UserAccess.Read, packager_id=None, key=None) + first = User(username="1", password="", access=UserAccess.READ, packager_id=None, key=None) + second = User(username="2", password="", access=UserAccess.FULL, packager_id=None, key=None) + third = User(username="3", password="", access=UserAccess.READ, packager_id=None, key=None) database.user_update(first) database.user_update(second) @@ -46,15 +46,15 @@ def test_user_list_filter_by_access(database: SQLite) -> None: """ must return users filtered by its access """ - first = User(username="1", password="", access=UserAccess.Read, packager_id=None, key=None) - second = User(username="2", password="", access=UserAccess.Full, packager_id=None, key=None) - third = User(username="3", password="", access=UserAccess.Read, packager_id=None, key=None) + first = User(username="1", password="", access=UserAccess.READ, packager_id=None, key=None) + second = User(username="2", password="", access=UserAccess.FULL, packager_id=None, key=None) + third = User(username="3", password="", access=UserAccess.READ, packager_id=None, key=None) database.user_update(first) database.user_update(second) database.user_update(third) - users = database.user_list(None, UserAccess.Read) + users = database.user_list(None, UserAccess.READ) assert len(users) == 2 assert first in users assert third in users @@ -64,16 +64,16 @@ def test_user_list_filter_by_username_access(database: SQLite) -> None: """ must return users filtered by its access and username """ - first = User(username="1", password="", access=UserAccess.Read, packager_id=None, key=None) - second = User(username="2", password="", access=UserAccess.Full, packager_id=None, key=None) - third = User(username="3", password="", access=UserAccess.Read, packager_id=None, key=None) + first = User(username="1", password="", access=UserAccess.READ, packager_id=None, key=None) + second = User(username="2", password="", access=UserAccess.FULL, packager_id=None, key=None) + third = User(username="3", password="", access=UserAccess.READ, packager_id=None, key=None) database.user_update(first) database.user_update(second) database.user_update(third) - assert database.user_list("1", UserAccess.Read) == [first] - assert not database.user_list("1", UserAccess.Full) + assert database.user_list("1", UserAccess.READ) == [first] + assert not database.user_list("1", UserAccess.FULL) def test_user_remove_update(database: SQLite, user: User) -> None: @@ -92,7 +92,7 @@ def test_user_update(database: SQLite, user: User) -> None: database.user_update(user) assert database.user_get(user.username) == user - new_user = User(username=user.username, password=user.hash_password("salt").password, access=UserAccess.Full, + new_user = User(username=user.username, password=user.hash_password("salt").password, access=UserAccess.FULL, packager_id=None, key="new key") database.user_update(new_user) assert database.user_get(new_user.username) == new_user diff --git a/ahriman-core/tests/ahriman/core/database/operations/test_event_operations.py b/ahriman-core/tests/ahriman/core/database/operations/test_event_operations.py index 2c4e1dad..373ba29e 100644 --- a/ahriman-core/tests/ahriman/core/database/operations/test_event_operations.py +++ b/ahriman-core/tests/ahriman/core/database/operations/test_event_operations.py @@ -8,7 +8,7 @@ def test_event_insert_get(database: SQLite, package_ahriman: Package) -> None: """ must insert and get event """ - event = Event(EventType.PackageUpdated, package_ahriman.base, "Updated", key="value") + event = Event(EventType.PACKAGE_UPDATED, package_ahriman.base, "Updated", key="value") database.event_insert(event) assert database.event_get() == [event] @@ -24,11 +24,11 @@ def test_event_insert_get_filter(database: SQLite) -> None: """ database.event_insert(Event("event 1", "object 1", created=1)) database.event_insert(Event("event 2", "object 2")) - database.event_insert(Event(EventType.PackageUpdated, "package")) + database.event_insert(Event(EventType.PACKAGE_UPDATED, "package")) assert database.event_get(event="event 1") == [Event("event 1", "object 1", created=1)] assert database.event_get(object_id="object 1") == [Event("event 1", "object 1", created=1)] - assert all(event.event == EventType.PackageUpdated for event in database.event_get(event=EventType.PackageUpdated)) + assert all(event.event == EventType.PACKAGE_UPDATED for event in database.event_get(event=EventType.PACKAGE_UPDATED)) def test_event_insert_get_pagination(database: SQLite) -> None: diff --git a/ahriman-core/tests/ahriman/core/formatters/conftest.py b/ahriman-core/tests/ahriman/core/formatters/conftest.py index c37566f7..41c15f23 100644 --- a/ahriman-core/tests/ahriman/core/formatters/conftest.py +++ b/ahriman-core/tests/ahriman/core/formatters/conftest.py @@ -220,7 +220,7 @@ def update_printer(package_ahriman: Package) -> UpdatePrinter: Returns: UpdatePrinter: update printer test instance """ - plan = BuildPlan().update([package_ahriman], BuildPlanReason.RegularUpdate) + plan = BuildPlan().update([package_ahriman], BuildPlanReason.REGULAR_UPDATE) return UpdatePrinter(plan, {}) diff --git a/ahriman-core/tests/ahriman/core/formatters/test_update_printer.py b/ahriman-core/tests/ahriman/core/formatters/test_update_printer.py index 2e5d9d9a..5e66d656 100644 --- a/ahriman-core/tests/ahriman/core/formatters/test_update_printer.py +++ b/ahriman-core/tests/ahriman/core/formatters/test_update_printer.py @@ -19,7 +19,7 @@ def test_properties_na(update_printer: UpdatePrinter) -> None: assert update_printer.properties() == [ Property(package.base, "", is_required=True), Property("N/A", package.version, is_required=True, indent=2, separator=" -> "), - Property("Reason", BuildPlanReason.RegularUpdate.value, indent=2), + Property("Reason", BuildPlanReason.REGULAR_UPDATE.value, indent=2), ] @@ -28,7 +28,7 @@ def test_properties_package_required_by(package_python_schedule: Package) -> Non must include requestee package to properties """ plan = BuildPlan() - plan.add(package_python_schedule, BuildPlanReason.RequiredBy, requester="ahriman") + plan.add(package_python_schedule, BuildPlanReason.REQUIRED_BY, requester="ahriman") properties = list(UpdatePrinter(plan, {}, bump_pkgrel=False).properties_package(package_python_schedule)) assert properties[-1].value == "required by ahriman" diff --git a/ahriman-core/tests/ahriman/core/log/test_log_loader.py b/ahriman-core/tests/ahriman/core/log/test_log_loader.py index 40b7591c..0eb49370 100644 --- a/ahriman-core/tests/ahriman/core/log/test_log_loader.py +++ b/ahriman-core/tests/ahriman/core/log/test_log_loader.py @@ -16,14 +16,14 @@ def test_handler() -> None: """ must extract journald handler if available """ - assert LogLoader.handler(None) == LogHandler.Journald + assert LogLoader.handler(None) == LogHandler.JOURNALD def test_handler_selected() -> None: """ must return selected log handler """ - assert LogLoader.handler(LogHandler.Console) == LogHandler.Console + assert LogLoader.handler(LogHandler.CONSOLE) == LogHandler.CONSOLE def test_handler_syslog(mocker: MockerFixture) -> None: @@ -32,7 +32,7 @@ def test_handler_syslog(mocker: MockerFixture) -> None: """ mocker.patch("pathlib.Path.exists", return_value=True) mocker.patch.dict(sys.modules, {"systemd.journal": None}) - assert LogLoader.handler(None) == LogHandler.Syslog + assert LogLoader.handler(None) == LogHandler.SYSLOG def test_handler_console(mocker: MockerFixture) -> None: @@ -41,7 +41,7 @@ def test_handler_console(mocker: MockerFixture) -> None: """ mocker.patch("pathlib.Path.exists", return_value=False) mocker.patch.dict(sys.modules, {"systemd.journal": None}) - assert LogLoader.handler(None) == LogHandler.Console + assert LogLoader.handler(None) == LogHandler.CONSOLE def test_load(configuration: Configuration, mocker: MockerFixture) -> None: @@ -52,7 +52,7 @@ def test_load(configuration: Configuration, mocker: MockerFixture) -> None: http_log_mock = mocker.patch("ahriman.core.log.http_log_handler.HttpLogHandler.load") _, repository_id = configuration.check_loaded() - LogLoader.load(repository_id, configuration, LogHandler.Journald, quiet=False, report=False) + LogLoader.load(repository_id, configuration, LogHandler.JOURNALD, quiet=False, report=False) logging_mock.assert_called_once_with(pytest.helpers.anyvar(int), disable_existing_loggers=True) http_log_mock.assert_called_once_with(repository_id, configuration, report=False) assert all(isinstance(handler, JournalHandler) for handler in logging.getLogger().handlers) @@ -64,7 +64,7 @@ def test_load_fallback(configuration: Configuration, mocker: MockerFixture) -> N """ mocker.patch("ahriman.core.log.log_loader.fileConfig", side_effect=PermissionError) _, repository_id = configuration.check_loaded() - LogLoader.load(repository_id, configuration, LogHandler.Journald, quiet=False, report=False) + LogLoader.load(repository_id, configuration, LogHandler.JOURNALD, quiet=False, report=False) def test_load_quiet(configuration: Configuration, mocker: MockerFixture) -> None: @@ -74,7 +74,7 @@ def test_load_quiet(configuration: Configuration, mocker: MockerFixture) -> None disable_mock = mocker.patch("logging.disable") _, repository_id = configuration.check_loaded() - LogLoader.load(repository_id, configuration, LogHandler.Journald, quiet=True, report=False) + LogLoader.load(repository_id, configuration, LogHandler.JOURNALD, quiet=True, report=False) disable_mock.assert_called_once_with(logging.WARNING) diff --git a/ahriman-core/tests/ahriman/core/report/test_email.py b/ahriman-core/tests/ahriman/core/report/test_email.py index 0a9bc4e7..06fcfa9c 100644 --- a/ahriman-core/tests/ahriman/core/report/test_email.py +++ b/ahriman-core/tests/ahriman/core/report/test_email.py @@ -44,7 +44,7 @@ def test_smtp_session(email: Email) -> None: """ must build normal SMTP session if SSL is disabled """ - email.ssl = SmtpSSLSettings.Disabled + email.ssl = SmtpSSLSettings.DISABLED assert email._smtp_session == smtplib.SMTP email.ssl = SmtpSSLSettings.STARTTLS diff --git a/ahriman-core/tests/ahriman/core/report/test_report.py b/ahriman-core/tests/ahriman/core/report/test_report.py index 06c737e8..129d9def 100644 --- a/ahriman-core/tests/ahriman/core/report/test_report.py +++ b/ahriman-core/tests/ahriman/core/report/test_report.py @@ -24,7 +24,7 @@ def test_report_dummy(configuration: Configuration, result: Result, mocker: Mock """ must construct dummy report class """ - mocker.patch("ahriman.models.report_settings.ReportSettings.from_option", return_value=ReportSettings.Disabled) + mocker.patch("ahriman.models.report_settings.ReportSettings.from_option", return_value=ReportSettings.DISABLED) report_mock = mocker.patch("ahriman.core.report.report.Report.generate") _, repository_id = configuration.check_loaded() diff --git a/ahriman-core/tests/ahriman/core/report/test_rss.py b/ahriman-core/tests/ahriman/core/report/test_rss.py index ffd6550a..07c9ce5d 100644 --- a/ahriman-core/tests/ahriman/core/report/test_rss.py +++ b/ahriman-core/tests/ahriman/core/report/test_rss.py @@ -56,15 +56,15 @@ def test_content(rss: RSS, package_ahriman: Package, mocker: MockerFixture) -> N """ client_mock = MagicMock() client_mock.event_get.return_value = [ - Event(EventType.PackageUpdated, package_ahriman.base), - Event(EventType.PackageUpdated, "random"), - Event(EventType.PackageUpdated, package_ahriman.base), + Event(EventType.PACKAGE_UPDATED, package_ahriman.base), + Event(EventType.PACKAGE_UPDATED, "random"), + Event(EventType.PACKAGE_UPDATED, package_ahriman.base), ] context_mock = mocker.patch("ahriman.core._Context.get", return_value=client_mock) assert rss.content([package_ahriman]).success == [package_ahriman] context_mock.assert_called_once_with(Client) - client_mock.event_get.assert_called_once_with(EventType.PackageUpdated, None, limit=rss.max_entries) + client_mock.event_get.assert_called_once_with(EventType.PACKAGE_UPDATED, None, limit=rss.max_entries) def test_generate(rss: RSS, package_ahriman: Package, mocker: MockerFixture) -> None: diff --git a/ahriman-core/tests/ahriman/core/repository/conftest.py b/ahriman-core/tests/ahriman/core/repository/conftest.py index 439cf473..a8479718 100644 --- a/ahriman-core/tests/ahriman/core/repository/conftest.py +++ b/ahriman-core/tests/ahriman/core/repository/conftest.py @@ -24,7 +24,7 @@ def cleaner(configuration: Configuration, database: SQLite) -> Cleaner: """ _, repository_id = configuration.check_loaded() return Cleaner(repository_id, configuration, database, report=False, - refresh_pacman_database=PacmanSynchronization.Disabled) + refresh_pacman_database=PacmanSynchronization.DISABLED) @pytest.fixture @@ -46,7 +46,7 @@ def executor(configuration: Configuration, database: SQLite, mocker: MockerFixtu mocker.patch("ahriman.core.repository.cleaner.Cleaner.clear_queue") _, repository_id = configuration.check_loaded() return Executor(repository_id, configuration, database, report=False, - refresh_pacman_database=PacmanSynchronization.Disabled) + refresh_pacman_database=PacmanSynchronization.DISABLED) @pytest.fixture @@ -68,4 +68,4 @@ def update_handler(configuration: Configuration, database: SQLite, mocker: Mocke mocker.patch("ahriman.core.repository.cleaner.Cleaner.clear_queue") _, repository_id = configuration.check_loaded() return UpdateHandler(repository_id, configuration, database, report=False, - refresh_pacman_database=PacmanSynchronization.Disabled) + refresh_pacman_database=PacmanSynchronization.DISABLED) diff --git a/ahriman-core/tests/ahriman/core/repository/test_event_logger.py b/ahriman-core/tests/ahriman/core/repository/test_event_logger.py index 037fae01..281ba83c 100644 --- a/ahriman-core/tests/ahriman/core/repository/test_event_logger.py +++ b/ahriman-core/tests/ahriman/core/repository/test_event_logger.py @@ -10,7 +10,7 @@ def test_event(repository: EventLogger, mocker: MockerFixture) -> None: """ must log event """ - event = Event(EventType.PackageUpdated, "base", "message", created=pytest.helpers.anyvar(int, True)) + event = Event(EventType.PACKAGE_UPDATED, "base", "message", created=pytest.helpers.anyvar(int, True)) event_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.event_add") repository.event(event.object_id, event.event, event.message) @@ -21,7 +21,7 @@ def test_in_event(repository: EventLogger, mocker: MockerFixture) -> None: """ must log success action """ - event = Event(EventType.PackageUpdated, "base", "message", + event = Event(EventType.PACKAGE_UPDATED, "base", "message", created=pytest.helpers.anyvar(int, True), took=pytest.helpers.anyvar(float, True)) event_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.event_add") @@ -34,7 +34,7 @@ def test_in_event_exception(repository: EventLogger, mocker: MockerFixture) -> N """ must reraise exception in context """ - event = Event(EventType.PackageUpdated, "base", "message", + event = Event(EventType.PACKAGE_UPDATED, "base", "message", created=pytest.helpers.anyvar(int, True), took=pytest.helpers.anyvar(float, True)) event_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.event_add") @@ -48,11 +48,11 @@ def test_in_event_exception_event(repository: EventLogger, mocker: MockerFixture """ must reraise exception in context and emit new event """ - event = Event(EventType.PackageUpdateFailed, "base", created=pytest.helpers.anyvar(int, True), + event = Event(EventType.PACKAGE_UPDATE_FAILED, "base", created=pytest.helpers.anyvar(int, True), took=pytest.helpers.anyvar(float, True)) event_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.event_add") with pytest.raises(Exception): - with repository.in_event(event.object_id, EventType.PackageUpdated, failure=event.event): + with repository.in_event(event.object_id, EventType.PACKAGE_UPDATED, failure=event.event): raise Exception event_mock.assert_called_once_with(event) diff --git a/ahriman-core/tests/ahriman/core/repository/test_repository_properties.py b/ahriman-core/tests/ahriman/core/repository/test_repository_properties.py index 694e8467..f1c80ec5 100644 --- a/ahriman-core/tests/ahriman/core/repository/test_repository_properties.py +++ b/ahriman-core/tests/ahriman/core/repository/test_repository_properties.py @@ -20,7 +20,7 @@ def test_packager_empty(repository: RepositoryProperties, mocker: MockerFixture) must return empty user if username was not set """ database_mock = mocker.patch("ahriman.core.database.SQLite.user_get") - user = User(username="", password="", access=UserAccess.Read, packager_id=None, key=None) + user = User(username="", password="", access=UserAccess.READ, packager_id=None, key=None) assert repository.packager(Packagers(), "base") == user database_mock.assert_not_called() @@ -30,6 +30,6 @@ def test_packager_empty_result(repository: RepositoryProperties, mocker: MockerF must return empty user if it wasn't found in database """ database_mock = mocker.patch("ahriman.core.database.SQLite.user_get", return_value=None) - user = User(username="username", password="", access=UserAccess.Read, packager_id=None, key=None) + user = User(username="username", password="", access=UserAccess.READ, packager_id=None, key=None) assert repository.packager(Packagers(user.username), "base") == user database_mock.assert_called_once_with(user.username) diff --git a/ahriman-core/tests/ahriman/core/repository/test_update_handler.py b/ahriman-core/tests/ahriman/core/repository/test_update_handler.py index 27e2b15c..65800b76 100644 --- a/ahriman-core/tests/ahriman/core/repository/test_update_handler.py +++ b/ahriman-core/tests/ahriman/core/repository/test_update_handler.py @@ -44,7 +44,7 @@ def test_updates_aur(update_handler: UpdateHandler, package_ahriman: Package, assert update_handler.updates_aur([], vcs=True) == [package_ahriman] packages_mock.assert_called_once_with([]) status_client_mock.assert_called_once_with(package_ahriman.base) - event_mock.assert_called_once_with(package_ahriman.base, EventType.PackageOutdated, + event_mock.assert_called_once_with(package_ahriman.base, EventType.PACKAGE_OUTDATED, pytest.helpers.anyvar(str, True)) package_is_outdated_mock.assert_called_once_with( package_ahriman, update_handler.configuration, @@ -56,7 +56,7 @@ def test_updates_aur_official(update_handler: UpdateHandler, package_ahriman: Pa """ must provide updates based on repository data """ - package_ahriman.remote = RemoteSource(source=PackageSource.Repository) + package_ahriman.remote = RemoteSource(source=PackageSource.REPOSITORY) mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.packages", return_value=[package_ahriman]) mocker.patch("ahriman.core.build_tools.package_version.PackageVersion.is_outdated", return_value=True) mocker.patch("ahriman.models.package.Package.from_official", return_value=package_ahriman) @@ -65,7 +65,7 @@ def test_updates_aur_official(update_handler: UpdateHandler, package_ahriman: Pa assert update_handler.updates_aur([], vcs=True) == [package_ahriman] status_client_mock.assert_called_once_with(package_ahriman.base) - event_mock.assert_called_once_with(package_ahriman.base, EventType.PackageOutdated, + event_mock.assert_called_once_with(package_ahriman.base, EventType.PACKAGE_OUTDATED, pytest.helpers.anyvar(str, True)) @@ -93,7 +93,7 @@ def test_updates_aur_up_to_date(update_handler: UpdateHandler, package_ahriman: status_client_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_status_update") assert update_handler.updates_aur([], vcs=True) == [] - status_client_mock.assert_called_once_with(package_ahriman.base, BuildStatusEnum.Success) + status_client_mock.assert_called_once_with(package_ahriman.base, BuildStatusEnum.SUCCESS) def test_updates_aur_local(update_handler: UpdateHandler, package_ahriman: Package, @@ -101,7 +101,7 @@ def test_updates_aur_local(update_handler: UpdateHandler, package_ahriman: Packa """ must skip packages with local sources """ - package_ahriman.remote = RemoteSource(source=PackageSource.Local) + package_ahriman.remote = RemoteSource(source=PackageSource.LOCAL) mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.packages", return_value=[package_ahriman]) package_load_mock = mocker.patch("ahriman.models.package.Package.from_aur") @@ -204,7 +204,7 @@ def test_updates_dependencies(update_handler: UpdateHandler, package_ahriman: Pa assert update_handler.updates_dependencies(["filter"]) == [package_ahriman] packages_mock.assert_called_once_with(["filter"]) status_client_mock.assert_called_once_with(package_ahriman.base) - event_mock.assert_called_once_with(package_ahriman.base, EventType.PackageOutdated, + event_mock.assert_called_once_with(package_ahriman.base, EventType.PACKAGE_OUTDATED, pytest.helpers.anyvar(str, True)) @@ -254,7 +254,7 @@ def test_updates_local(update_handler: UpdateHandler, package_ahriman: Package, """ must check for updates for locally stored packages """ - package_ahriman.remote = RemoteSource(source=PackageSource.Local, git_url="", web_url="", path="", branch="") + package_ahriman.remote = RemoteSource(source=PackageSource.LOCAL, git_url="", web_url="", path="", branch="") mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.packages", return_value=[package_ahriman]) mocker.patch("pathlib.Path.iterdir", return_value=[Path(package_ahriman.base)]) fetch_mock = mocker.patch("ahriman.core.build_tools.sources.Sources.fetch") @@ -268,7 +268,7 @@ def test_updates_local(update_handler: UpdateHandler, package_ahriman: Package, fetch_mock.assert_called_once_with(Path(package_ahriman.base), pytest.helpers.anyvar(int)) package_load_mock.assert_called_once_with(Path(package_ahriman.base), "x86_64", None) status_client_mock.assert_called_once_with(package_ahriman.base) - event_mock.assert_called_once_with(package_ahriman.base, EventType.PackageOutdated, + event_mock.assert_called_once_with(package_ahriman.base, EventType.PACKAGE_OUTDATED, pytest.helpers.anyvar(str, True)) package_is_outdated_mock.assert_called_once_with( package_ahriman, update_handler.configuration, @@ -293,7 +293,7 @@ def test_updates_local_ignore_vcs(update_handler: UpdateHandler, package_ahriman """ must skip VCS packages check if requested for locally stored packages """ - package_ahriman.remote = RemoteSource(source=PackageSource.Local, git_url="", web_url="", path="", branch="") + package_ahriman.remote = RemoteSource(source=PackageSource.LOCAL, git_url="", web_url="", path="", branch="") mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.packages", return_value=[package_ahriman]) mocker.patch("pathlib.Path.iterdir", return_value=[Path(package_ahriman.base)]) mocker.patch("ahriman.core.build_tools.sources.Sources.fetch") @@ -350,7 +350,7 @@ def test_updates_local_held_metadata(update_handler: UpdateHandler, package_ahri """ must respect the held base even when the source directory has a different name """ - package_ahriman.remote = RemoteSource(source=PackageSource.Local) + package_ahriman.remote = RemoteSource(source=PackageSource.LOCAL) mocker.patch.object(update_handler.reporter, "package_get", return_value=[(package_ahriman, BuildStatus(is_held=True))]) mocker.patch.object(update_handler, "packages", return_value=[package_ahriman]) @@ -385,7 +385,7 @@ def test_updates_manual_status_known(update_handler: UpdateHandler, package_ahri update_handler.updates_manual() status_client_mock.assert_called_once_with(package_ahriman.base) - event_mock.assert_called_once_with(package_ahriman.base, EventType.PackageOutdated, + event_mock.assert_called_once_with(package_ahriman.base, EventType.PACKAGE_OUTDATED, pytest.helpers.anyvar(str, True)) @@ -401,7 +401,7 @@ def test_updates_manual_status_unknown(update_handler: UpdateHandler, package_ah update_handler.updates_manual() status_client_mock.assert_called_once_with(package_ahriman) - event_mock.assert_called_once_with(package_ahriman.base, EventType.PackageOutdated, + event_mock.assert_called_once_with(package_ahriman.base, EventType.PACKAGE_OUTDATED, pytest.helpers.anyvar(str, True)) diff --git a/ahriman-core/tests/ahriman/core/sign/test_gpg.py b/ahriman-core/tests/ahriman/core/sign/test_gpg.py index b67c5372..61ace1c2 100644 --- a/ahriman-core/tests/ahriman/core/sign/test_gpg.py +++ b/ahriman-core/tests/ahriman/core/sign/test_gpg.py @@ -14,10 +14,10 @@ def test_repository_sign_args(gpg_with_key: GPG) -> None: """ must generate correct sign args """ - gpg_with_key.targets = {SignSettings.Repository} + gpg_with_key.targets = {SignSettings.REPOSITORY} assert gpg_with_key.repository_sign_args - gpg_with_key.targets = {SignSettings.Packages, SignSettings.Repository} + gpg_with_key.targets = {SignSettings.PACKAGES, SignSettings.REPOSITORY} assert gpg_with_key.repository_sign_args @@ -28,7 +28,7 @@ def test_repository_sign_args_skip(gpg_with_key: GPG) -> None: gpg_with_key.targets = {} assert not gpg_with_key.repository_sign_args - gpg_with_key.targets = {SignSettings.Packages} + gpg_with_key.targets = {SignSettings.PACKAGES} assert not gpg_with_key.repository_sign_args @@ -36,10 +36,10 @@ def test_repository_sign_args_skip_no_key(gpg: GPG) -> None: """ must return empty args if it is not set if no key set """ - gpg.targets = {SignSettings.Repository} + gpg.targets = {SignSettings.REPOSITORY} assert not gpg.repository_sign_args - gpg.targets = {SignSettings.Packages, SignSettings.Repository} + gpg.targets = {SignSettings.PACKAGES, SignSettings.REPOSITORY} assert not gpg.repository_sign_args @@ -58,7 +58,7 @@ def test_sign_options(configuration: Configuration) -> None: configuration.set_option("sign", "key", "default-key") target, default_key = GPG.sign_options(configuration) - assert target == {SignSettings.Repository} + assert target == {SignSettings.REPOSITORY} assert default_key == "default-key" @@ -152,7 +152,7 @@ def test_process_sign_package_1(gpg_with_key: GPG, mocker: MockerFixture) -> Non result = [Path("a"), Path("a.sig")] process_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process", return_value=result) - gpg_with_key.targets = {SignSettings.Packages} + gpg_with_key.targets = {SignSettings.PACKAGES} assert gpg_with_key.process_sign_package(Path("a"), "a") == result process_mock.assert_called_once_with(Path("a"), "a") @@ -164,7 +164,7 @@ def test_process_sign_package_2(gpg_with_key: GPG, mocker: MockerFixture) -> Non result = [Path("a"), Path("a.sig")] process_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process", return_value=result) - gpg_with_key.targets = {SignSettings.Packages, SignSettings.Repository} + gpg_with_key.targets = {SignSettings.PACKAGES, SignSettings.REPOSITORY} assert gpg_with_key.process_sign_package(Path("a"), "a") == result process_mock.assert_called_once_with(Path("a"), "a") @@ -176,7 +176,7 @@ def test_process_sign_package_3(gpg_with_key: GPG, mocker: MockerFixture) -> Non result = [Path("a"), Path("a.sig")] process_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process", return_value=result) - gpg_with_key.targets = {SignSettings.Packages} + gpg_with_key.targets = {SignSettings.PACKAGES} assert gpg_with_key.process_sign_package(Path("a"), None) == result process_mock.assert_called_once_with(Path("a"), gpg_with_key.default_key) @@ -196,7 +196,7 @@ def test_process_sign_package_skip_2(gpg_with_key: GPG, mocker: MockerFixture) - must not sign package if repository only is enabled """ process_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process") - gpg_with_key.targets = {SignSettings.Repository} + gpg_with_key.targets = {SignSettings.REPOSITORY} gpg_with_key.process_sign_package(Path("a"), "a") process_mock.assert_not_called() @@ -206,7 +206,7 @@ def test_process_sign_package_skip_3(gpg: GPG, mocker: MockerFixture) -> None: must not sign package if key is not set """ process_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process") - gpg.targets = {SignSettings.Packages} + gpg.targets = {SignSettings.PACKAGES} gpg.process_sign_package(Path("a"), None) process_mock.assert_not_called() @@ -230,7 +230,7 @@ def test_process_sign_repository_1(gpg_with_key: GPG, mocker: MockerFixture) -> result = [Path("a"), Path("a.sig")] process_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process", return_value=result) - gpg_with_key.targets = {SignSettings.Repository} + gpg_with_key.targets = {SignSettings.REPOSITORY} assert gpg_with_key.process_sign_repository(Path("a")) == result process_mock.assert_called_once_with(Path("a"), "key") @@ -242,7 +242,7 @@ def test_process_sign_repository_2(gpg_with_key: GPG, mocker: MockerFixture) -> result = [Path("a"), Path("a.sig")] process_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process", return_value=result) - gpg_with_key.targets = {SignSettings.Packages, SignSettings.Repository} + gpg_with_key.targets = {SignSettings.PACKAGES, SignSettings.REPOSITORY} assert gpg_with_key.process_sign_repository(Path("a")) == result process_mock.assert_called_once_with(Path("a"), "key") @@ -262,7 +262,7 @@ def test_process_sign_repository_skip_2(gpg_with_key: GPG, mocker: MockerFixture must not sign repository if repository target is not set """ process_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process") - gpg_with_key.targets = {SignSettings.Packages} + gpg_with_key.targets = {SignSettings.PACKAGES} gpg_with_key.process_sign_repository(Path("a")) process_mock.assert_not_called() @@ -272,6 +272,6 @@ def test_process_sign_repository_skip_3(gpg: GPG, mocker: MockerFixture) -> None must not sign repository if key is not set """ process_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process") - gpg.targets = {SignSettings.Repository} + gpg.targets = {SignSettings.REPOSITORY} gpg.process_sign_repository(Path("a")) process_mock.assert_not_called() diff --git a/ahriman-core/tests/ahriman/core/status/test_client.py b/ahriman-core/tests/ahriman/core/status/test_client.py index 8af1a20e..a413e312 100644 --- a/ahriman-core/tests/ahriman/core/status/test_client.py +++ b/ahriman-core/tests/ahriman/core/status/test_client.py @@ -236,7 +236,7 @@ def test_package_status_update(client: Client, package_ahriman: Package) -> None must raise not implemented on package update """ with pytest.raises(NotImplementedError): - client.package_status_update(package_ahriman.base, BuildStatusEnum.Unknown) + client.package_status_update(package_ahriman.base, BuildStatusEnum.UNKNOWN) def test_package_update(client: Client, package_ahriman: Package) -> None: @@ -244,7 +244,7 @@ def test_package_update(client: Client, package_ahriman: Package) -> None: must raise not implemented on package addition """ with pytest.raises(NotImplementedError): - client.package_update(package_ahriman, BuildStatusEnum.Unknown) + client.package_update(package_ahriman, BuildStatusEnum.UNKNOWN) def test_set_building(client: Client, package_ahriman: Package, mocker: MockerFixture) -> None: @@ -254,7 +254,7 @@ def test_set_building(client: Client, package_ahriman: Package, mocker: MockerFi update_mock = mocker.patch("ahriman.core.status.Client.package_status_update") client.set_building(package_ahriman.base) - update_mock.assert_called_once_with(package_ahriman.base, BuildStatusEnum.Building) + update_mock.assert_called_once_with(package_ahriman.base, BuildStatusEnum.BUILDING) def test_set_failed(client: Client, package_ahriman: Package, mocker: MockerFixture) -> None: @@ -264,7 +264,7 @@ def test_set_failed(client: Client, package_ahriman: Package, mocker: MockerFixt update_mock = mocker.patch("ahriman.core.status.Client.package_status_update") client.set_failed(package_ahriman.base) - update_mock.assert_called_once_with(package_ahriman.base, BuildStatusEnum.Failed) + update_mock.assert_called_once_with(package_ahriman.base, BuildStatusEnum.FAILED) def test_set_pending(client: Client, package_ahriman: Package, mocker: MockerFixture) -> None: @@ -274,7 +274,7 @@ def test_set_pending(client: Client, package_ahriman: Package, mocker: MockerFix update_mock = mocker.patch("ahriman.core.status.Client.package_status_update") client.set_pending(package_ahriman.base) - update_mock.assert_called_once_with(package_ahriman.base, BuildStatusEnum.Pending) + update_mock.assert_called_once_with(package_ahriman.base, BuildStatusEnum.PENDING) def test_set_success(client: Client, package_ahriman: Package, mocker: MockerFixture) -> None: @@ -284,7 +284,7 @@ def test_set_success(client: Client, package_ahriman: Package, mocker: MockerFix update_mock = mocker.patch("ahriman.core.status.Client.package_update") client.set_success(package_ahriman) - update_mock.assert_called_once_with(package_ahriman, BuildStatusEnum.Success) + update_mock.assert_called_once_with(package_ahriman, BuildStatusEnum.SUCCESS) def test_set_unknown(client: Client, package_ahriman: Package, mocker: MockerFixture) -> None: @@ -295,7 +295,7 @@ def test_set_unknown(client: Client, package_ahriman: Package, mocker: MockerFix update_mock = mocker.patch("ahriman.core.status.Client.package_update") client.set_unknown(package_ahriman) - update_mock.assert_called_once_with(package_ahriman, BuildStatusEnum.Unknown) + update_mock.assert_called_once_with(package_ahriman, BuildStatusEnum.UNKNOWN) def test_set_unknown_skip(client: Client, package_ahriman: Package, mocker: MockerFixture) -> None: @@ -331,4 +331,4 @@ def test_status_update(client: Client) -> None: """ must update self status without errors """ - client.status_update(BuildStatusEnum.Unknown) + client.status_update(BuildStatusEnum.UNKNOWN) diff --git a/ahriman-core/tests/ahriman/core/status/test_event_bus.py b/ahriman-core/tests/ahriman/core/status/test_event_bus.py index 467146fa..2e44e3da 100644 --- a/ahriman-core/tests/ahriman/core/status/test_event_bus.py +++ b/ahriman-core/tests/ahriman/core/status/test_event_bus.py @@ -12,11 +12,11 @@ async def test_broadcast(event_bus: EventBus, package_ahriman: Package) -> None: must broadcast event to all subscribers """ _, queue = await event_bus.subscribe() - await event_bus.broadcast(EventType.PackageUpdated, package_ahriman.base, version=package_ahriman.version) + await event_bus.broadcast(EventType.PACKAGE_UPDATED, package_ahriman.base, version=package_ahriman.version) message = queue.get_nowait() assert message == ( - EventType.PackageUpdated, + EventType.PACKAGE_UPDATED, {"object_id": package_ahriman.base, "version": package_ahriman.version}, ) @@ -25,8 +25,8 @@ async def test_broadcast_with_topics(event_bus: EventBus, package_ahriman: Packa """ must broadcast event to subscribers with matching topics """ - _, queue = await event_bus.subscribe([EventType.PackageUpdated]) - await event_bus.broadcast(EventType.PackageUpdated, package_ahriman.base) + _, queue = await event_bus.subscribe([EventType.PACKAGE_UPDATED]) + await event_bus.broadcast(EventType.PACKAGE_UPDATED, package_ahriman.base) assert not queue.empty() @@ -34,8 +34,8 @@ async def test_broadcast_topic_isolation(event_bus: EventBus, package_ahriman: P """ must not broadcast event to subscribers with non-matching topics """ - _, queue = await event_bus.subscribe([EventType.BuildLog]) - await event_bus.broadcast(EventType.PackageUpdated, package_ahriman.base) + _, queue = await event_bus.subscribe([EventType.BUILD_LOG]) + await event_bus.broadcast(EventType.PACKAGE_UPDATED, package_ahriman.base) assert queue.empty() @@ -46,8 +46,8 @@ async def test_broadcast_queue_full(event_bus: EventBus, package_ahriman: Packag event_bus.max_size = 1 _, queue = await event_bus.subscribe() - await event_bus.broadcast(EventType.PackageUpdated, package_ahriman.base) - await event_bus.broadcast(EventType.PackageRemoved, package_ahriman.base) + await event_bus.broadcast(EventType.PACKAGE_UPDATED, package_ahriman.base) + await event_bus.broadcast(EventType.PACKAGE_REMOVED, package_ahriman.base) assert queue.qsize() == 1 @@ -58,7 +58,7 @@ async def test_broadcast_queue_shutdown(event_bus: EventBus, package_ahriman: Pa _, queue = await event_bus.subscribe() queue.shutdown() - await event_bus.broadcast(EventType.PackageUpdated, package_ahriman.base) + await event_bus.broadcast(EventType.PACKAGE_UPDATED, package_ahriman.base) async def test_shutdown(event_bus: EventBus) -> None: @@ -80,7 +80,7 @@ async def test_shutdown_queue_full(event_bus: EventBus, package_ahriman: Package event_bus.max_size = 1 _, queue = await event_bus.subscribe() - await event_bus.broadcast(EventType.PackageUpdated, package_ahriman.base) + await event_bus.broadcast(EventType.PACKAGE_UPDATED, package_ahriman.base) await event_bus.shutdown() @@ -100,7 +100,7 @@ async def test_broadcast_with_object_id(event_bus: EventBus, package_ahriman: Pa must broadcast event to subscribers with matching object_id """ _, queue = await event_bus.subscribe(object_id=package_ahriman.base) - await event_bus.broadcast(EventType.PackageUpdated, package_ahriman.base) + await event_bus.broadcast(EventType.PACKAGE_UPDATED, package_ahriman.base) assert not queue.empty() @@ -109,7 +109,7 @@ async def test_broadcast_object_id_isolation(event_bus: EventBus, package_ahrima must not broadcast event to subscribers with non-matching object_id """ _, queue = await event_bus.subscribe(object_id="other-package") - await event_bus.broadcast(EventType.PackageUpdated, package_ahriman.base) + await event_bus.broadcast(EventType.PACKAGE_UPDATED, package_ahriman.base) assert queue.empty() @@ -117,8 +117,8 @@ async def test_subscribe_with_topics(event_bus: EventBus) -> None: """ must register subscriber with topic filter """ - subscriber_id, _ = await event_bus.subscribe([EventType.BuildLog]) - assert event_bus._subscribers[subscriber_id].topics == [EventType.BuildLog] + subscriber_id, _ = await event_bus.subscribe([EventType.BUILD_LOG]) + assert event_bus._subscribers[subscriber_id].topics == [EventType.BUILD_LOG] async def test_subscribe_with_object_id(event_bus: EventBus, package_ahriman: Package) -> None: diff --git a/ahriman-core/tests/ahriman/core/status/test_local_client.py b/ahriman-core/tests/ahriman/core/status/test_local_client.py index c06d7b28..d88a9e2e 100644 --- a/ahriman-core/tests/ahriman/core/status/test_local_client.py +++ b/ahriman-core/tests/ahriman/core/status/test_local_client.py @@ -19,7 +19,7 @@ def test_event_add(local_client: LocalClient, package_ahriman: Package, mocker: must add new event """ event_mock = mocker.patch("ahriman.core.database.SQLite.event_insert") - event = Event(EventType.PackageUpdated, package_ahriman.base) + event = Event(EventType.PACKAGE_UPDATED, package_ahriman.base) local_client.event_add(event) event_mock.assert_called_once_with(event, local_client.repository_id) @@ -30,8 +30,8 @@ def test_event_get(local_client: LocalClient, package_ahriman: Package, mocker: must retrieve events """ event_mock = mocker.patch("ahriman.core.database.SQLite.event_get") - local_client.event_get(EventType.PackageUpdated, package_ahriman.base, from_date=10, to_date=20, limit=1, offset=2) - event_mock.assert_called_once_with(EventType.PackageUpdated, package_ahriman.base, 10, 20, 1, 2, + local_client.event_get(EventType.PACKAGE_UPDATED, package_ahriman.base, from_date=10, to_date=20, limit=1, offset=2) + event_mock.assert_called_once_with(EventType.PACKAGE_UPDATED, package_ahriman.base, 10, 20, 1, 2, local_client.repository_id) @@ -208,7 +208,7 @@ def test_package_status_update(local_client: LocalClient, package_ahriman: Packa must update package status """ status_mock = mocker.patch("ahriman.core.database.SQLite.status_update") - local_client.package_status_update(package_ahriman.base, BuildStatusEnum.Success) + local_client.package_status_update(package_ahriman.base, BuildStatusEnum.SUCCESS) status_mock.assert_called_once_with(package_ahriman.base, pytest.helpers.anyvar(int), local_client.repository_id) @@ -219,6 +219,6 @@ def test_package_update(local_client: LocalClient, package_ahriman: Package, moc package_mock = mocker.patch("ahriman.core.database.SQLite.package_update") status_mock = mocker.patch("ahriman.core.database.SQLite.status_update") - local_client.package_update(package_ahriman, BuildStatusEnum.Success) + local_client.package_update(package_ahriman, BuildStatusEnum.SUCCESS) package_mock.assert_called_once_with(package_ahriman, local_client.repository_id) status_mock.assert_called_once_with(package_ahriman.base, pytest.helpers.anyvar(int), local_client.repository_id) diff --git a/ahriman-core/tests/ahriman/core/status/test_watcher.py b/ahriman-core/tests/ahriman/core/status/test_watcher.py index b7e5b6fb..68ab2ce3 100644 --- a/ahriman-core/tests/ahriman/core/status/test_watcher.py +++ b/ahriman-core/tests/ahriman/core/status/test_watcher.py @@ -48,20 +48,20 @@ async def test_load(watcher: Watcher, package_ahriman: Package, mocker: MockerFi cache_mock.assert_called_once_with(None) package, status = watcher._known[package_ahriman.base] assert package == package_ahriman - assert status.status == BuildStatusEnum.Unknown + assert status.status == BuildStatusEnum.UNKNOWN async def test_load_known(watcher: Watcher, package_ahriman: Package, mocker: MockerFixture) -> None: """ must correctly load packages with known statuses """ - status = BuildStatus(BuildStatusEnum.Success) + status = BuildStatus(BuildStatusEnum.SUCCESS) mocker.patch("ahriman.core.status.local_client.LocalClient.package_get", return_value=[(package_ahriman, status)]) watcher._known = {package_ahriman.base: (package_ahriman, status)} await watcher.load() _, status = watcher._known[package_ahriman.base] - assert status.status == BuildStatusEnum.Success + assert status.status == BuildStatusEnum.SUCCESS async def test_logs_rotate(watcher: Watcher, mocker: MockerFixture) -> None: @@ -92,7 +92,7 @@ async def test_package_get(watcher: Watcher, package_ahriman: Package) -> None: watcher._known = {package_ahriman.base: (package_ahriman, BuildStatus())} package, status = await watcher.package_get(package_ahriman.base) assert package == package_ahriman - assert status.status == BuildStatusEnum.Unknown + assert status.status == BuildStatusEnum.UNKNOWN async def test_package_get_failed(watcher: Watcher, package_ahriman: Package) -> None: @@ -161,7 +161,7 @@ async def test_package_hold_update(watcher: Watcher, package_ahriman: Package, m cache_mock.assert_called_once_with(package_ahriman.base, enabled=True) _, status = watcher._known[package_ahriman.base] assert status.is_held is True - broadcast_mock.assert_called_once_with(EventType.PackageHeld, package_ahriman.base, is_held=True) + broadcast_mock.assert_called_once_with(EventType.PACKAGE_HELD, package_ahriman.base, is_held=True) async def test_package_hold_update_unknown(watcher: Watcher, package_ahriman: Package) -> None: @@ -182,7 +182,7 @@ async def test_package_logs_add(watcher: Watcher, package_ahriman: Package, mock await watcher.package_logs_add(log_record) cache_mock.assert_called_once_with(log_record) - broadcast_mock.assert_called_once_with(EventType.BuildLog, package_ahriman.base, **log_record.view()) + broadcast_mock.assert_called_once_with(EventType.BUILD_LOG, package_ahriman.base, **log_record.view()) async def test_package_logs_get(watcher: Watcher, package_ahriman: Package, mocker: MockerFixture) -> None: @@ -248,7 +248,7 @@ async def test_package_remove(watcher: Watcher, package_ahriman: Package, mocker await watcher.package_remove(package_ahriman.base) assert not watcher._known cache_mock.assert_called_once_with(package_ahriman.base) - broadcast_mock.assert_called_once_with(EventType.PackageRemoved, package_ahriman.base) + broadcast_mock.assert_called_once_with(EventType.PACKAGE_REMOVED, package_ahriman.base) async def test_package_remove_unknown(watcher: Watcher, package_ahriman: Package, mocker: MockerFixture) -> None: @@ -260,7 +260,7 @@ async def test_package_remove_unknown(watcher: Watcher, package_ahriman: Package await watcher.package_remove(package_ahriman.base) cache_mock.assert_called_once_with(package_ahriman.base) - broadcast_mock.assert_called_once_with(EventType.PackageRemoved, package_ahriman.base) + broadcast_mock.assert_called_once_with(EventType.PACKAGE_REMOVED, package_ahriman.base) async def test_package_status_update(watcher: Watcher, package_ahriman: Package, mocker: MockerFixture) -> None: @@ -271,13 +271,13 @@ async def test_package_status_update(watcher: Watcher, package_ahriman: Package, broadcast_mock = mocker.patch("ahriman.core.status.event_bus.EventBus.broadcast") watcher._known = {package_ahriman.base: (package_ahriman, BuildStatus())} - await watcher.package_status_update(package_ahriman.base, BuildStatusEnum.Success) + await watcher.package_status_update(package_ahriman.base, BuildStatusEnum.SUCCESS) cache_mock.assert_called_once_with(package_ahriman.base, pytest.helpers.anyvar(int)) package, status = watcher._known[package_ahriman.base] assert package == package_ahriman - assert status.status == BuildStatusEnum.Success + assert status.status == BuildStatusEnum.SUCCESS broadcast_mock.assert_called_once_with( - EventType.PackageStatusChanged, package_ahriman.base, status=BuildStatusEnum.Success.value, + EventType.PACKAGE_STATUS_CHANGED, package_ahriman.base, status=BuildStatusEnum.SUCCESS.value, ) @@ -290,7 +290,7 @@ async def test_package_status_update_preserves_hold(watcher: Watcher, package_ah mocker.patch("ahriman.core.status.event_bus.EventBus.broadcast") watcher._known = {package_ahriman.base: (package_ahriman, BuildStatus(is_held=True))} - await watcher.package_status_update(package_ahriman.base, BuildStatusEnum.Success) + await watcher.package_status_update(package_ahriman.base, BuildStatusEnum.SUCCESS) _, status = watcher._known[package_ahriman.base] assert status.is_held is True @@ -300,7 +300,7 @@ async def test_package_status_update_unknown(watcher: Watcher, package_ahriman: must fail on unknown package status update only """ with pytest.raises(UnknownPackageError): - await watcher.package_status_update(package_ahriman.base, BuildStatusEnum.Unknown) + await watcher.package_status_update(package_ahriman.base, BuildStatusEnum.UNKNOWN) async def test_package_update(watcher: Watcher, package_ahriman: Package, mocker: MockerFixture) -> None: @@ -310,12 +310,12 @@ async def test_package_update(watcher: Watcher, package_ahriman: Package, mocker cache_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_update") broadcast_mock = mocker.patch("ahriman.core.status.event_bus.EventBus.broadcast") - await watcher.package_update(package_ahriman, BuildStatusEnum.Unknown) + await watcher.package_update(package_ahriman, BuildStatusEnum.UNKNOWN) assert await watcher.packages() cache_mock.assert_called_once_with(package_ahriman, pytest.helpers.anyvar(int)) broadcast_mock.assert_called_once_with( - EventType.PackageUpdated, package_ahriman.base, - status=BuildStatusEnum.Unknown.value, version=package_ahriman.version, + EventType.PACKAGE_UPDATED, package_ahriman.base, + status=BuildStatusEnum.UNKNOWN.value, version=package_ahriman.version, ) @@ -327,7 +327,7 @@ async def test_package_update_preserves_hold(watcher: Watcher, package_ahriman: mocker.patch("ahriman.core.status.local_client.LocalClient.package_update") watcher._known = {package_ahriman.base: (package_ahriman, BuildStatus(is_held=True))} - await watcher.package_update(package_ahriman, BuildStatusEnum.Success) + await watcher.package_update(package_ahriman, BuildStatusEnum.SUCCESS) _, status = watcher._known[package_ahriman.base] assert status.is_held is True @@ -357,9 +357,9 @@ async def test_status_update(watcher: Watcher, mocker: MockerFixture) -> None: """ broadcast_mock = mocker.patch("ahriman.core.status.event_bus.EventBus.broadcast") - await watcher.status_update(BuildStatusEnum.Success) - assert watcher.status.status == BuildStatusEnum.Success - broadcast_mock.assert_called_once_with(EventType.ServiceStatusChanged, None, status=BuildStatusEnum.Success.value) + await watcher.status_update(BuildStatusEnum.SUCCESS) + assert watcher.status.status == BuildStatusEnum.SUCCESS + broadcast_mock.assert_called_once_with(EventType.SERVICE_STATUS_CHANGED, None, status=BuildStatusEnum.SUCCESS.value) def test_call(watcher: Watcher, package_ahriman: Package) -> None: diff --git a/ahriman-core/tests/ahriman/core/status/test_web_client.py b/ahriman-core/tests/ahriman/core/status/test_web_client.py index 4c1a8a1e..ce951deb 100644 --- a/ahriman-core/tests/ahriman/core/status/test_web_client.py +++ b/ahriman-core/tests/ahriman/core/status/test_web_client.py @@ -160,7 +160,7 @@ def test_event_add(web_client: WebClient, package_ahriman: Package, mocker: Mock """ must create event """ - event = Event(EventType.PackageUpdated, package_ahriman.base) + event = Event(EventType.PACKAGE_UPDATED, package_ahriman.base) requests_mock = mocker.patch("ahriman.core.status.web_client.WebClient.make_request") web_client.event_add(event) @@ -212,7 +212,7 @@ def test_event_get(web_client: WebClient, package_ahriman: Package, mocker: Mock """ must get events """ - event = Event(EventType.PackageUpdated, package_ahriman.base) + event = Event(EventType.PACKAGE_UPDATED, package_ahriman.base) response_obj = requests.Response() response_obj._content = json.dumps([event.view()]).encode("utf8") response_obj.status_code = 200 @@ -605,7 +605,7 @@ def test_package_get_all(web_client: WebClient, package_ahriman: Package, mocker result = web_client.package_get(None) requests_mock.assert_called_once_with("GET", web_client._package_url(), params=web_client.repository_id.query()) assert len(result) == len(response) - assert (package_ahriman, BuildStatusEnum.Unknown) in [(package, status.status) for package, status in result] + assert (package_ahriman, BuildStatusEnum.UNKNOWN) in [(package, status.status) for package, status in result] def test_package_get_failed(web_client: WebClient, mocker: MockerFixture) -> None: @@ -640,7 +640,7 @@ def test_package_get_single(web_client: WebClient, package_ahriman: Package, moc requests_mock.assert_called_once_with("GET", web_client._package_url(package_ahriman.base), params=web_client.repository_id.query()) assert len(result) == len(response) - assert (package_ahriman, BuildStatusEnum.Unknown) in [(package, status.status) for package, status in result] + assert (package_ahriman, BuildStatusEnum.UNKNOWN) in [(package, status.status) for package, status in result] def test_package_hold_update(web_client: WebClient, package_ahriman: Package, mocker: MockerFixture) -> None: @@ -1055,11 +1055,11 @@ def test_package_status_update(web_client: WebClient, package_ahriman: Package, """ requests_mock = mocker.patch("ahriman.core.status.web_client.WebClient.make_request") - web_client.package_status_update(package_ahriman.base, BuildStatusEnum.Unknown) + web_client.package_status_update(package_ahriman.base, BuildStatusEnum.UNKNOWN) requests_mock.assert_called_once_with("POST", pytest.helpers.anyvar(str, True), params=web_client.repository_id.query(), json={ - "status": BuildStatusEnum.Unknown.value, + "status": BuildStatusEnum.UNKNOWN.value, }) @@ -1068,7 +1068,7 @@ def test_package_status_update_failed(web_client: WebClient, package_ahriman: Pa must suppress any exception happened during update """ mocker.patch("requests.Session.request", side_effect=Exception) - web_client.package_status_update(package_ahriman.base, BuildStatusEnum.Unknown) + web_client.package_status_update(package_ahriman.base, BuildStatusEnum.UNKNOWN) def test_package_status_update_failed_http_error(web_client: WebClient, package_ahriman: Package, @@ -1077,7 +1077,7 @@ def test_package_status_update_failed_http_error(web_client: WebClient, package_ must suppress HTTP exception happened during update """ mocker.patch("requests.Session.request", side_effect=requests.HTTPError) - web_client.package_status_update(package_ahriman.base, BuildStatusEnum.Unknown) + web_client.package_status_update(package_ahriman.base, BuildStatusEnum.UNKNOWN) def test_package_update(web_client: WebClient, package_ahriman: Package, mocker: MockerFixture) -> None: @@ -1087,7 +1087,7 @@ def test_package_update(web_client: WebClient, package_ahriman: Package, mocker: requests_mock = mocker.patch("ahriman.core.status.web_client.WebClient.make_request") payload = pytest.helpers.get_package_status(package_ahriman) - web_client.package_update(package_ahriman, BuildStatusEnum.Unknown) + web_client.package_update(package_ahriman, BuildStatusEnum.UNKNOWN) requests_mock.assert_called_once_with("POST", pytest.helpers.anyvar(str, True), params=web_client.repository_id.query(), json=payload) @@ -1097,7 +1097,7 @@ def test_package_update_failed(web_client: WebClient, package_ahriman: Package, must suppress any exception happened during addition """ mocker.patch("requests.Session.request", side_effect=Exception) - web_client.package_update(package_ahriman, BuildStatusEnum.Unknown) + web_client.package_update(package_ahriman, BuildStatusEnum.UNKNOWN) def test_package_update_failed_http_error(web_client: WebClient, package_ahriman: Package, @@ -1106,7 +1106,7 @@ def test_package_update_failed_http_error(web_client: WebClient, package_ahriman must suppress HTTP exception happened during addition """ mocker.patch("requests.Session.request", side_effect=requests.HTTPError) - web_client.package_update(package_ahriman, BuildStatusEnum.Unknown) + web_client.package_update(package_ahriman, BuildStatusEnum.UNKNOWN) def test_package_update_failed_suppress(web_client: WebClient, package_ahriman: Package, mocker: MockerFixture) -> None: @@ -1117,7 +1117,7 @@ def test_package_update_failed_suppress(web_client: WebClient, package_ahriman: mocker.patch("requests.Session.request", side_effect=Exception) logging_mock = mocker.patch("logging.exception") - web_client.package_update(package_ahriman, BuildStatusEnum.Unknown) + web_client.package_update(package_ahriman, BuildStatusEnum.UNKNOWN) logging_mock.assert_not_called() @@ -1130,7 +1130,7 @@ def test_package_update_failed_http_error_suppress(web_client: WebClient, packag mocker.patch("requests.Session.request", side_effect=requests.HTTPError) logging_mock = mocker.patch("logging.exception") - web_client.package_update(package_ahriman, BuildStatusEnum.Unknown) + web_client.package_update(package_ahriman, BuildStatusEnum.UNKNOWN) logging_mock.assert_not_called() @@ -1173,12 +1173,12 @@ def test_status_update(web_client: WebClient, mocker: MockerFixture) -> None: """ requests_mock = mocker.patch("ahriman.core.status.web_client.WebClient.make_request") - web_client.status_update(BuildStatusEnum.Unknown) + web_client.status_update(BuildStatusEnum.UNKNOWN) requests_mock.assert_called_once_with( "POST", pytest.helpers.anyvar(str, True), params=web_client.repository_id.query(), json={ - "status": BuildStatusEnum.Unknown.value, + "status": BuildStatusEnum.UNKNOWN.value, } ) @@ -1188,7 +1188,7 @@ def test_status_update_self_failed(web_client: WebClient, mocker: MockerFixture) must suppress any exception happened during service update """ mocker.patch("requests.Session.request", side_effect=Exception) - web_client.status_update(BuildStatusEnum.Unknown) + web_client.status_update(BuildStatusEnum.UNKNOWN) def test_status_update_failed_http_error(web_client: WebClient, mocker: MockerFixture) -> None: @@ -1196,4 +1196,4 @@ def test_status_update_failed_http_error(web_client: WebClient, mocker: MockerFi must suppress HTTP exception happened during service update """ mocker.patch("requests.Session.request", side_effect=requests.HTTPError) - web_client.status_update(BuildStatusEnum.Unknown) + web_client.status_update(BuildStatusEnum.UNKNOWN) diff --git a/ahriman-core/tests/ahriman/core/upload/test_upload.py b/ahriman-core/tests/ahriman/core/upload/test_upload.py index a3fbe766..806f6b6f 100644 --- a/ahriman-core/tests/ahriman/core/upload/test_upload.py +++ b/ahriman-core/tests/ahriman/core/upload/test_upload.py @@ -24,7 +24,7 @@ def test_report_dummy(configuration: Configuration, mocker: MockerFixture) -> No """ must construct dummy upload class """ - mocker.patch("ahriman.models.upload_settings.UploadSettings.from_option", return_value=UploadSettings.Disabled) + mocker.patch("ahriman.models.upload_settings.UploadSettings.from_option", return_value=UploadSettings.DISABLED) upload_mock = mocker.patch("ahriman.core.upload.upload.Upload.sync") _, repository_id = configuration.check_loaded() diff --git a/ahriman-core/tests/ahriman/models/conftest.py b/ahriman-core/tests/ahriman/models/conftest.py index 886927a2..9d0fa10c 100644 --- a/ahriman-core/tests/ahriman/models/conftest.py +++ b/ahriman-core/tests/ahriman/models/conftest.py @@ -21,7 +21,7 @@ def build_status_failed() -> BuildStatus: Returns: BuildStatus: failed build status test instance """ - return BuildStatus(BuildStatusEnum.Failed, 42) + return BuildStatus(BuildStatusEnum.FAILED, 42) @pytest.fixture diff --git a/ahriman-core/tests/ahriman/models/test_auth_settings.py b/ahriman-core/tests/ahriman/models/test_auth_settings.py index 640fa8b1..1ceb7faa 100644 --- a/ahriman-core/tests/ahriman/models/test_auth_settings.py +++ b/ahriman-core/tests/ahriman/models/test_auth_settings.py @@ -5,26 +5,26 @@ def test_from_option_invalid() -> None: """ return disabled on invalid option """ - assert AuthSettings.from_option("invalid") == AuthSettings.Disabled + assert AuthSettings.from_option("invalid") == AuthSettings.DISABLED def test_from_option_valid() -> None: """ must return value from valid options """ - assert AuthSettings.from_option("disabled") == AuthSettings.Disabled - assert AuthSettings.from_option("DISABLED") == AuthSettings.Disabled - assert AuthSettings.from_option("no") == AuthSettings.Disabled - assert AuthSettings.from_option("NO") == AuthSettings.Disabled + assert AuthSettings.from_option("disabled") == AuthSettings.DISABLED + assert AuthSettings.from_option("DISABLED") == AuthSettings.DISABLED + assert AuthSettings.from_option("no") == AuthSettings.DISABLED + assert AuthSettings.from_option("NO") == AuthSettings.DISABLED - assert AuthSettings.from_option("oauth") == AuthSettings.OAuth - assert AuthSettings.from_option("OAuth") == AuthSettings.OAuth - assert AuthSettings.from_option("OAuth2") == AuthSettings.OAuth + assert AuthSettings.from_option("oauth") == AuthSettings.OAUTH + assert AuthSettings.from_option("OAuth") == AuthSettings.OAUTH + assert AuthSettings.from_option("OAuth2") == AuthSettings.OAUTH - assert AuthSettings.from_option("configuration") == AuthSettings.Configuration - assert AuthSettings.from_option("ConFigUration") == AuthSettings.Configuration - assert AuthSettings.from_option("mapping") == AuthSettings.Configuration - assert AuthSettings.from_option("MAPPing") == AuthSettings.Configuration + assert AuthSettings.from_option("configuration") == AuthSettings.CONFIGURATION + assert AuthSettings.from_option("ConFigUration") == AuthSettings.CONFIGURATION + assert AuthSettings.from_option("mapping") == AuthSettings.CONFIGURATION + assert AuthSettings.from_option("MAPPing") == AuthSettings.CONFIGURATION assert AuthSettings.from_option("pam") == AuthSettings.PAM assert AuthSettings.from_option("PAM") == AuthSettings.PAM @@ -34,6 +34,6 @@ def test_is_enabled() -> None: """ must mark as disabled authorization for disabled and enabled otherwise """ - assert not AuthSettings.Disabled.is_enabled - for option in filter(lambda o: o != AuthSettings.Disabled, AuthSettings): + assert not AuthSettings.DISABLED.is_enabled + for option in filter(lambda o: o != AuthSettings.DISABLED, AuthSettings): assert option.is_enabled diff --git a/ahriman-core/tests/ahriman/models/test_build_plan.py b/ahriman-core/tests/ahriman/models/test_build_plan.py index 1bb8cbcf..e4ac3cf3 100644 --- a/ahriman-core/tests/ahriman/models/test_build_plan.py +++ b/ahriman-core/tests/ahriman/models/test_build_plan.py @@ -10,8 +10,8 @@ def test_add(package_ahriman: Package, package_python_schedule: Package) -> None """ plan = BuildPlan() - plan.add(package_ahriman, BuildPlanReason.ManualRequest, requester="later-requester") - plan.add(package_python_schedule, BuildPlanReason.LocalSourceUpdate) + plan.add(package_ahriman, BuildPlanReason.MANUAL_REQUEST, requester="later-requester") + plan.add(package_python_schedule, BuildPlanReason.LOCAL_SOURCE_UPDATE) assert package_ahriman in plan assert package_python_schedule in plan @@ -20,18 +20,18 @@ def test_add_preserves_first_reason(package_ahriman: Package) -> None: """ must update package data while preserving the first reason and requester """ - plan = BuildPlan().update([package_ahriman], BuildPlanReason.RegularUpdate, "requester1") + plan = BuildPlan().update([package_ahriman], BuildPlanReason.REGULAR_UPDATE, "requester1") updated = replace(package_ahriman, version="42") - plan.add(updated, BuildPlanReason.ManualRequest, "requester2") - assert plan.item(package_ahriman.base) == BuildPlanItem(updated, BuildPlanReason.RegularUpdate, "requester1") + plan.add(updated, BuildPlanReason.MANUAL_REQUEST, "requester2") + assert plan.item(package_ahriman.base) == BuildPlanItem(updated, BuildPlanReason.REGULAR_UPDATE, "requester1") def test_update(package_ahriman: Package) -> None: """ must update instance with new packages """ - plan = BuildPlan().update([package_ahriman], BuildPlanReason.RegularUpdate) + plan = BuildPlan().update([package_ahriman], BuildPlanReason.REGULAR_UPDATE) assert package_ahriman in plan @@ -39,10 +39,10 @@ def test_eq(package_ahriman: Package) -> None: """ must compare two plans """ - plan1 = BuildPlan().update([package_ahriman], BuildPlanReason.RegularUpdate) + plan1 = BuildPlan().update([package_ahriman], BuildPlanReason.REGULAR_UPDATE) assert plan1 == plan1 - plan2 = BuildPlan().update([package_ahriman], BuildPlanReason.ManualRequest) + plan2 = BuildPlan().update([package_ahriman], BuildPlanReason.MANUAL_REQUEST) assert plan1 != plan2 diff --git a/ahriman-core/tests/ahriman/models/test_build_status.py b/ahriman-core/tests/ahriman/models/test_build_status.py index fe996fae..b62ab1a6 100644 --- a/ahriman-core/tests/ahriman/models/test_build_status.py +++ b/ahriman-core/tests/ahriman/models/test_build_status.py @@ -8,7 +8,7 @@ def test_build_status_init_1() -> None: must construct status object from None """ status = BuildStatus() - assert status.status == BuildStatusEnum.Unknown + assert status.status == BuildStatusEnum.UNKNOWN assert status.timestamp > 0 @@ -16,7 +16,7 @@ def test_build_status_init_2(build_status_failed: BuildStatus) -> None: """ must construct status object from objects """ - status = BuildStatus(BuildStatusEnum.Failed, 42) + status = BuildStatus(BuildStatusEnum.FAILED, 42) assert status == build_status_failed @@ -50,5 +50,5 @@ def test_build_status_pretty_print_held() -> None: """ must include held marker in pretty print """ - status = BuildStatus(BuildStatusEnum.Success, 42, is_held=True) + status = BuildStatus(BuildStatusEnum.SUCCESS, 42, is_held=True) assert "(held)" in status.pretty_print() diff --git a/ahriman-core/tests/ahriman/models/test_counters.py b/ahriman-core/tests/ahriman/models/test_counters.py index 1722f3a3..f6e98fc4 100644 --- a/ahriman-core/tests/ahriman/models/test_counters.py +++ b/ahriman-core/tests/ahriman/models/test_counters.py @@ -17,8 +17,8 @@ def test_counters_from_packages(package_ahriman: Package, package_python_schedul must construct object from list of packages with their statuses """ payload = [ - (package_ahriman, BuildStatus(status=BuildStatusEnum.Success)), - (package_python_schedule, BuildStatus(status=BuildStatusEnum.Failed)), + (package_ahriman, BuildStatus(status=BuildStatusEnum.SUCCESS)), + (package_python_schedule, BuildStatus(status=BuildStatusEnum.FAILED)), ] counters = Counters.from_packages(payload) diff --git a/ahriman-core/tests/ahriman/models/test_event.py b/ahriman-core/tests/ahriman/models/test_event.py index 91fb6276..216ad855 100644 --- a/ahriman-core/tests/ahriman/models/test_event.py +++ b/ahriman-core/tests/ahriman/models/test_event.py @@ -6,7 +6,7 @@ def test_init() -> None: must replace event type for known types """ assert Event("random", "") - assert isinstance(Event(str(EventType.PackageUpdated), "").event, EventType) + assert isinstance(Event(str(EventType.PACKAGE_UPDATED), "").event, EventType) assert Event("", "", key="value").data == {"key": "value"} diff --git a/ahriman-core/tests/ahriman/models/test_package_source.py b/ahriman-core/tests/ahriman/models/test_package_source.py index 25d62a6c..cf3cc95d 100644 --- a/ahriman-core/tests/ahriman/models/test_package_source.py +++ b/ahriman-core/tests/ahriman/models/test_package_source.py @@ -26,7 +26,7 @@ def test_resolve_non_auto(repository_paths: RepositoryPaths) -> None: """ must resolve non auto type to itself """ - for source in filter(lambda src: src != PackageSource.Auto, PackageSource): + for source in filter(lambda src: src != PackageSource.AUTO, PackageSource): assert source.resolve("", repository_paths) == source @@ -37,7 +37,7 @@ def test_resolve_archive(package_description_ahriman: PackageDescription, reposi """ mocker.patch("pathlib.Path.is_dir", return_value=False) mocker.patch("pathlib.Path.is_file", autospec=True, side_effect=_is_file_mock(True, False)) - assert PackageSource.Auto.resolve(package_description_ahriman.filename, repository_paths) == PackageSource.Archive + assert PackageSource.AUTO.resolve(package_description_ahriman.filename, repository_paths) == PackageSource.ARCHIVE def test_resolve_aur(repository_paths: RepositoryPaths, mocker: MockerFixture) -> None: @@ -46,7 +46,7 @@ def test_resolve_aur(repository_paths: RepositoryPaths, mocker: MockerFixture) - """ mocker.patch("pathlib.Path.is_dir", return_value=False) mocker.patch("pathlib.Path.is_file", return_value=False) - assert PackageSource.Auto.resolve("package", repository_paths) == PackageSource.AUR + assert PackageSource.AUTO.resolve("package", repository_paths) == PackageSource.AUR def test_resolve_aur_not_package_like(repository_paths: RepositoryPaths, mocker: MockerFixture) -> None: @@ -55,7 +55,7 @@ def test_resolve_aur_not_package_like(repository_paths: RepositoryPaths, mocker: """ mocker.patch("pathlib.Path.is_dir", return_value=False) mocker.patch("pathlib.Path.is_file", autospec=True, side_effect=_is_file_mock(True, False)) - assert PackageSource.Auto.resolve("package", repository_paths) == PackageSource.AUR + assert PackageSource.AUTO.resolve("package", repository_paths) == PackageSource.AUR def test_resolve_aur_no_access(repository_paths: RepositoryPaths, mocker: MockerFixture) -> None: @@ -63,7 +63,7 @@ def test_resolve_aur_no_access(repository_paths: RepositoryPaths, mocker: Mocker must resolve auto type into the AUR package in case if we cannot read in suggested path """ mocker.patch("pathlib.Path.is_dir", side_effect=PermissionError) - assert PackageSource.Auto.resolve("package", repository_paths) == PackageSource.AUR + assert PackageSource.AUTO.resolve("package", repository_paths) == PackageSource.AUR def test_resolve_directory(repository_paths: RepositoryPaths, mocker: MockerFixture) -> None: @@ -72,7 +72,7 @@ def test_resolve_directory(repository_paths: RepositoryPaths, mocker: MockerFixt """ mocker.patch("pathlib.Path.is_dir", autospec=True, side_effect=lambda p: p == Path("path")) mocker.patch("pathlib.Path.is_file", autospec=True, side_effect=_is_file_mock(False, False)) - assert PackageSource.Auto.resolve("path", repository_paths) == PackageSource.Directory + assert PackageSource.AUTO.resolve("path", repository_paths) == PackageSource.DIRECTORY def test_resolve_local(repository_paths: RepositoryPaths, mocker: MockerFixture) -> None: @@ -81,7 +81,7 @@ def test_resolve_local(repository_paths: RepositoryPaths, mocker: MockerFixture) """ mocker.patch("pathlib.Path.is_dir", return_value=False) mocker.patch("pathlib.Path.is_file", autospec=True, side_effect=_is_file_mock(True, True)) - assert PackageSource.Auto.resolve("path", repository_paths) == PackageSource.Local + assert PackageSource.AUTO.resolve("path", repository_paths) == PackageSource.LOCAL def test_resolve_local_cache(repository_paths: RepositoryPaths, mocker: MockerFixture) -> None: @@ -92,7 +92,7 @@ def test_resolve_local_cache(repository_paths: RepositoryPaths, mocker: MockerFi mocker.patch("pathlib.Path.is_dir", autospec=True, side_effect=lambda p: p == Path("cache")) mocker.patch("pathlib.Path.is_file", autospec=True, side_effect=_is_file_mock(False, False)) - assert PackageSource.Auto.resolve("path", repository_paths) == PackageSource.Local + assert PackageSource.AUTO.resolve("path", repository_paths) == PackageSource.LOCAL cache_mock.assert_called_once_with("path") @@ -104,4 +104,4 @@ def test_resolve_remote(package_description_ahriman: PackageDescription, reposit mocker.patch("pathlib.Path.is_dir", return_value=False) mocker.patch("pathlib.Path.is_file", autospec=True, side_effect=_is_file_mock(False, False)) url = f"https://host/{package_description_ahriman.filename}" - assert PackageSource.Auto.resolve(url, repository_paths) == PackageSource.Remote + assert PackageSource.AUTO.resolve(url, repository_paths) == PackageSource.REMOTE diff --git a/ahriman-core/tests/ahriman/models/test_remote_source.py b/ahriman-core/tests/ahriman/models/test_remote_source.py index b1126b6a..73736fb8 100644 --- a/ahriman-core/tests/ahriman/models/test_remote_source.py +++ b/ahriman-core/tests/ahriman/models/test_remote_source.py @@ -26,7 +26,7 @@ def test_is_remote() -> None: must correctly define if source is remote or not """ for source in PackageSource: - assert RemoteSource(source=source).is_remote or source not in (PackageSource.AUR, PackageSource.Repository) + assert RemoteSource(source=source).is_remote or source not in (PackageSource.AUR, PackageSource.REPOSITORY) def test_pkgbuild_dir(remote_source: RemoteSource) -> None: @@ -56,4 +56,4 @@ def test_git_source_empty() -> None: must raise exception if path is none """ with pytest.raises(InitializeError): - RemoteSource(source=PackageSource.Remote).git_source() + RemoteSource(source=PackageSource.REMOTE).git_source() diff --git a/ahriman-core/tests/ahriman/models/test_report_settings.py b/ahriman-core/tests/ahriman/models/test_report_settings.py index 25a5db7e..06f0b5ea 100644 --- a/ahriman-core/tests/ahriman/models/test_report_settings.py +++ b/ahriman-core/tests/ahriman/models/test_report_settings.py @@ -5,7 +5,7 @@ def test_from_option_invalid() -> None: """ must return disabled on invalid option """ - assert ReportSettings.from_option("invalid") == ReportSettings.Disabled + assert ReportSettings.from_option("invalid") == ReportSettings.DISABLED def test_from_option_valid() -> None: @@ -15,19 +15,19 @@ def test_from_option_valid() -> None: assert ReportSettings.from_option("html") == ReportSettings.HTML assert ReportSettings.from_option("HTML") == ReportSettings.HTML - assert ReportSettings.from_option("email") == ReportSettings.Email - assert ReportSettings.from_option("EmAil") == ReportSettings.Email + assert ReportSettings.from_option("email") == ReportSettings.EMAIL + assert ReportSettings.from_option("EmAil") == ReportSettings.EMAIL - assert ReportSettings.from_option("console") == ReportSettings.Console - assert ReportSettings.from_option("conSOle") == ReportSettings.Console + assert ReportSettings.from_option("console") == ReportSettings.CONSOLE + assert ReportSettings.from_option("conSOle") == ReportSettings.CONSOLE - assert ReportSettings.from_option("telegram") == ReportSettings.Telegram - assert ReportSettings.from_option("TElegraM") == ReportSettings.Telegram + assert ReportSettings.from_option("telegram") == ReportSettings.TELEGRAM + assert ReportSettings.from_option("TElegraM") == ReportSettings.TELEGRAM assert ReportSettings.from_option("rss") == ReportSettings.RSS assert ReportSettings.from_option("RSS") == ReportSettings.RSS - assert ReportSettings.from_option("remote-call") == ReportSettings.RemoteCall - assert ReportSettings.from_option("reMOte-cALL") == ReportSettings.RemoteCall - assert ReportSettings.from_option("ahriman") == ReportSettings.RemoteCall - assert ReportSettings.from_option("AhRiMAN") == ReportSettings.RemoteCall + assert ReportSettings.from_option("remote-call") == ReportSettings.REMOTE_CALL + assert ReportSettings.from_option("reMOte-cALL") == ReportSettings.REMOTE_CALL + assert ReportSettings.from_option("ahriman") == ReportSettings.REMOTE_CALL + assert ReportSettings.from_option("AhRiMAN") == ReportSettings.REMOTE_CALL diff --git a/ahriman-core/tests/ahriman/models/test_sign_settings.py b/ahriman-core/tests/ahriman/models/test_sign_settings.py index a4a5dfe8..62a27804 100644 --- a/ahriman-core/tests/ahriman/models/test_sign_settings.py +++ b/ahriman-core/tests/ahriman/models/test_sign_settings.py @@ -5,18 +5,18 @@ def test_from_option_invalid() -> None: """ must return disabled on invalid option """ - assert SignSettings.from_option("invalid") == SignSettings.Disabled + assert SignSettings.from_option("invalid") == SignSettings.DISABLED def test_from_option_valid() -> None: """ must return value from valid options """ - assert SignSettings.from_option("package") == SignSettings.Packages - assert SignSettings.from_option("PACKAGE") == SignSettings.Packages - assert SignSettings.from_option("packages") == SignSettings.Packages - assert SignSettings.from_option("sign-package") == SignSettings.Packages + assert SignSettings.from_option("package") == SignSettings.PACKAGES + assert SignSettings.from_option("PACKAGE") == SignSettings.PACKAGES + assert SignSettings.from_option("packages") == SignSettings.PACKAGES + assert SignSettings.from_option("sign-package") == SignSettings.PACKAGES - assert SignSettings.from_option("repository") == SignSettings.Repository - assert SignSettings.from_option("REPOSITORY") == SignSettings.Repository - assert SignSettings.from_option("sign-repository") == SignSettings.Repository + assert SignSettings.from_option("repository") == SignSettings.REPOSITORY + assert SignSettings.from_option("REPOSITORY") == SignSettings.REPOSITORY + assert SignSettings.from_option("sign-repository") == SignSettings.REPOSITORY diff --git a/ahriman-core/tests/ahriman/models/test_smtp_ssl_settings.py b/ahriman-core/tests/ahriman/models/test_smtp_ssl_settings.py index 06bd0c7d..c9d02ddd 100644 --- a/ahriman-core/tests/ahriman/models/test_smtp_ssl_settings.py +++ b/ahriman-core/tests/ahriman/models/test_smtp_ssl_settings.py @@ -5,7 +5,7 @@ def test_from_option_invalid() -> None: """ must return disabled value on invalid option """ - assert SmtpSSLSettings.from_option("invalid") == SmtpSSLSettings.Disabled + assert SmtpSSLSettings.from_option("invalid") == SmtpSSLSettings.DISABLED def test_from_option_valid() -> None: diff --git a/ahriman-core/tests/ahriman/models/test_upload_settings.py b/ahriman-core/tests/ahriman/models/test_upload_settings.py index f8d0b089..da1ed211 100644 --- a/ahriman-core/tests/ahriman/models/test_upload_settings.py +++ b/ahriman-core/tests/ahriman/models/test_upload_settings.py @@ -5,23 +5,23 @@ def test_from_option_invalid() -> None: """ must return disabled on invalid option """ - assert UploadSettings.from_option("invalid") == UploadSettings.Disabled + assert UploadSettings.from_option("invalid") == UploadSettings.DISABLED def test_from_option_valid() -> None: """ must return value from valid options """ - assert UploadSettings.from_option("rsync") == UploadSettings.Rsync - assert UploadSettings.from_option("RSYNC") == UploadSettings.Rsync + assert UploadSettings.from_option("rsync") == UploadSettings.RSYNC + assert UploadSettings.from_option("RSYNC") == UploadSettings.RSYNC assert UploadSettings.from_option("s3") == UploadSettings.S3 assert UploadSettings.from_option("S3") == UploadSettings.S3 - assert UploadSettings.from_option("github") == UploadSettings.GitHub - assert UploadSettings.from_option("GitHub") == UploadSettings.GitHub + assert UploadSettings.from_option("github") == UploadSettings.GITHUB + assert UploadSettings.from_option("GitHub") == UploadSettings.GITHUB - assert UploadSettings.from_option("remote-service") == UploadSettings.RemoteService - assert UploadSettings.from_option("Remote-Service") == UploadSettings.RemoteService - assert UploadSettings.from_option("ahriman") == UploadSettings.RemoteService - assert UploadSettings.from_option("AhRiMAN") == UploadSettings.RemoteService + assert UploadSettings.from_option("remote-service") == UploadSettings.REMOTE_SERVICE + assert UploadSettings.from_option("Remote-Service") == UploadSettings.REMOTE_SERVICE + assert UploadSettings.from_option("ahriman") == UploadSettings.REMOTE_SERVICE + assert UploadSettings.from_option("AhRiMAN") == UploadSettings.REMOTE_SERVICE diff --git a/ahriman-core/tests/ahriman/models/test_user.py b/ahriman-core/tests/ahriman/models/test_user.py index 0cb0c072..7031ce43 100644 --- a/ahriman-core/tests/ahriman/models/test_user.py +++ b/ahriman-core/tests/ahriman/models/test_user.py @@ -10,19 +10,19 @@ def test_algo() -> None: """ must correctly define algorithm used """ - assert User(username="user", password=None, access=UserAccess.Read).algo is None - assert User(username="user", password="", access=UserAccess.Read).algo is None - assert User(username="user", password="$$$", access=UserAccess.Read).algo is None + assert User(username="user", password=None, access=UserAccess.READ).algo is None + assert User(username="user", password="", access=UserAccess.READ).algo is None + assert User(username="user", password="$$$", access=UserAccess.READ).algo is None assert User( username="user", password="$6$rounds=656000$mWBiecMPrHAL1VgX$oU4Y5HH8HzlvMaxwkNEJjK13ozElyU1wAHBoO/WW5dAaE4YEfnB0X3FxbynKMl4FBdC3Ovap0jINz4LPkNADg0", - access=UserAccess.Read, + access=UserAccess.READ, ).algo == "$6$" assert User( username="user", password="$2b$12$VCWKazvYxH7B0eAalDGAbu/3y1dSWs79sv/2ujjX1TMaFdVUy80hy", - access=UserAccess.Read, + access=UserAccess.READ, ).algo == "$2b$" @@ -53,7 +53,7 @@ def test_check_credentials_sha512() -> None: user = User( username="user", password="$6$rounds=656000$mWBiecMPrHAL1VgX$oU4Y5HH8HzlvMaxwkNEJjK13ozElyU1wAHBoO/WW5dAaE4YEfnB0X3FxbynKMl4FBdC3Ovap0jINz4LPkNADg0", - access=UserAccess.Read, + access=UserAccess.READ, ) with pytest.raises(ValueError): assert user.check_credentials("password", "salt") @@ -86,18 +86,18 @@ def test_verify_access_read(user: User) -> None: """ user with read access must be able to only request read """ - user = replace(user, access=UserAccess.Read) - assert user.verify_access(UserAccess.Read) - assert not user.verify_access(UserAccess.Full) + user = replace(user, access=UserAccess.READ) + assert user.verify_access(UserAccess.READ) + assert not user.verify_access(UserAccess.FULL) def test_verify_access_write(user: User) -> None: """ user with write access must be able to do anything """ - user = replace(user, access=UserAccess.Full) - assert user.verify_access(UserAccess.Read) - assert user.verify_access(UserAccess.Full) + user = replace(user, access=UserAccess.FULL) + assert user.verify_access(UserAccess.READ) + assert user.verify_access(UserAccess.FULL) def test_repr(user: User) -> None: diff --git a/ahriman-core/tests/ahriman/models/test_user_access.py b/ahriman-core/tests/ahriman/models/test_user_access.py index cfe9cb9e..cb309a16 100644 --- a/ahriman-core/tests/ahriman/models/test_user_access.py +++ b/ahriman-core/tests/ahriman/models/test_user_access.py @@ -7,45 +7,45 @@ def test_permits_full() -> None: """ full access must allow everything """ - assert UserAccess.Full.permits(UserAccess.Full) - assert UserAccess.Full.permits(UserAccess.Reporter) - assert UserAccess.Full.permits(UserAccess.Read) - assert UserAccess.Full.permits(UserAccess.Unauthorized) + assert UserAccess.FULL.permits(UserAccess.FULL) + assert UserAccess.FULL.permits(UserAccess.REPORTER) + assert UserAccess.FULL.permits(UserAccess.READ) + assert UserAccess.FULL.permits(UserAccess.UNAUTHORIZED) def test_permits_reporter() -> None: """ reporter access must allow everything except full """ - assert not UserAccess.Reporter.permits(UserAccess.Full) - assert UserAccess.Reporter.permits(UserAccess.Reporter) - assert UserAccess.Reporter.permits(UserAccess.Read) - assert UserAccess.Reporter.permits(UserAccess.Unauthorized) + assert not UserAccess.REPORTER.permits(UserAccess.FULL) + assert UserAccess.REPORTER.permits(UserAccess.REPORTER) + assert UserAccess.REPORTER.permits(UserAccess.READ) + assert UserAccess.REPORTER.permits(UserAccess.UNAUTHORIZED) def test_permits_read() -> None: """ read access must allow read only and unauthorized """ - assert not UserAccess.Read.permits(UserAccess.Full) - assert not UserAccess.Read.permits(UserAccess.Reporter) - assert UserAccess.Read.permits(UserAccess.Read) - assert UserAccess.Read.permits(UserAccess.Unauthorized) + assert not UserAccess.READ.permits(UserAccess.FULL) + assert not UserAccess.READ.permits(UserAccess.REPORTER) + assert UserAccess.READ.permits(UserAccess.READ) + assert UserAccess.READ.permits(UserAccess.UNAUTHORIZED) def test_permits_unauthorized() -> None: """ unauthorized access must only allow unauthorized """ - assert not UserAccess.Unauthorized.permits(UserAccess.Full) - assert not UserAccess.Unauthorized.permits(UserAccess.Reporter) - assert not UserAccess.Unauthorized.permits(UserAccess.Read) - assert UserAccess.Unauthorized.permits(UserAccess.Unauthorized) + assert not UserAccess.UNAUTHORIZED.permits(UserAccess.FULL) + assert not UserAccess.UNAUTHORIZED.permits(UserAccess.REPORTER) + assert not UserAccess.UNAUTHORIZED.permits(UserAccess.READ) + assert UserAccess.UNAUTHORIZED.permits(UserAccess.UNAUTHORIZED) def test_permits_unknown(mocker: MockerFixture) -> None: """ must return False in case if input does not match """ - mocker.patch.object(UserAccess, "_member_names_", ["Read"]) - assert not UserAccess.Full.permits(UserAccess.Unauthorized) + mocker.patch.object(UserAccess, "_member_names_", ["READ"]) + assert not UserAccess.FULL.permits(UserAccess.UNAUTHORIZED) diff --git a/ahriman-triggers/tests/ahriman/core/support/test_package_creator.py b/ahriman-triggers/tests/ahriman/core/support/test_package_creator.py index dc2b88a7..c2595051 100644 --- a/ahriman-triggers/tests/ahriman/core/support/test_package_creator.py +++ b/ahriman-triggers/tests/ahriman/core/support/test_package_creator.py @@ -34,7 +34,7 @@ def test_package_register(package_creator: PackageCreator, mocker: MockerFixture package = Package( base=package_creator.generator.pkgname, version=package_creator.generator.pkgver, - remote=RemoteSource(source=PackageSource.Local), + remote=RemoteSource(source=PackageSource.LOCAL), packages={package_creator.generator.pkgname: PackageDescription()}, ) client_mock = mocker.patch("ahriman.core._Context.get", return_value=Client()) diff --git a/ahriman-web/src/ahriman/core/auth/auth.py b/ahriman-web/src/ahriman/core/auth/auth.py index 0fcab71e..de4ca0a5 100644 --- a/ahriman-web/src/ahriman/core/auth/auth.py +++ b/ahriman-web/src/ahriman/core/auth/auth.py @@ -36,11 +36,11 @@ class Auth(LazyLogging): allow_read_only(bool): allow read only access to APIs """ - def __init__(self, configuration: Configuration, provider: AuthSettings = AuthSettings.Disabled) -> None: + def __init__(self, configuration: Configuration, provider: AuthSettings = AuthSettings.DISABLED) -> None: """ Args: configuration(Configuration): configuration instance - provider(AuthSettings, optional): authorization type definition (Default value = AuthSettings.Disabled) + provider(AuthSettings, optional): authorization type definition (Default value = AuthSettings.DISABLED) """ self.allow_read_only = configuration.getboolean("auth", "allow_read_only") @@ -83,10 +83,10 @@ class Auth(LazyLogging): Auth: authorization module according to current settings """ match AuthSettings.from_option(configuration.get("auth", "target", fallback="disabled")): - case AuthSettings.Configuration: + case AuthSettings.CONFIGURATION: from ahriman.core.auth.mapping import Mapping return Mapping(configuration, database) - case AuthSettings.OAuth: + case AuthSettings.OAUTH: from ahriman.core.auth.oauth import OAuth return OAuth(configuration, database) case AuthSettings.PAM: diff --git a/ahriman-web/src/ahriman/core/auth/mapping.py b/ahriman-web/src/ahriman/core/auth/mapping.py index ef5c3b72..52d6f416 100644 --- a/ahriman-web/src/ahriman/core/auth/mapping.py +++ b/ahriman-web/src/ahriman/core/auth/mapping.py @@ -35,12 +35,12 @@ class Mapping(Auth): """ def __init__(self, configuration: Configuration, database: SQLite, - provider: AuthSettings = AuthSettings.Configuration) -> None: + provider: AuthSettings = AuthSettings.CONFIGURATION) -> None: """ Args: configuration(Configuration): configuration instance database(SQLite): database instance - provider(AuthSettings, optional): authorization type definition (Default value = AuthSettings.Configuration) + provider(AuthSettings, optional): authorization type definition (Default value = AuthSettings.CONFIGURATION) """ Auth.__init__(self, configuration, provider) self.database = database diff --git a/ahriman-web/src/ahriman/core/auth/oauth.py b/ahriman-web/src/ahriman/core/auth/oauth.py index 6d74411a..d7e56138 100644 --- a/ahriman-web/src/ahriman/core/auth/oauth.py +++ b/ahriman-web/src/ahriman/core/auth/oauth.py @@ -42,12 +42,12 @@ class OAuth(Mapping): """ def __init__(self, configuration: Configuration, database: SQLite, - provider: AuthSettings = AuthSettings.OAuth) -> None: + provider: AuthSettings = AuthSettings.OAUTH) -> None: """ Args: configuration(Configuration): configuration instance database(SQLite): database instance - provider(AuthSettings, optional): authorization type definition (Default value = AuthSettings.OAuth) + provider(AuthSettings, optional): authorization type definition (Default value = AuthSettings.OAUTH) """ Mapping.__init__(self, configuration, database, provider) self.client_id = configuration.get("auth", "client_id") diff --git a/ahriman-web/src/ahriman/core/auth/pam.py b/ahriman-web/src/ahriman/core/auth/pam.py index cdfdc640..9b9c7c7a 100644 --- a/ahriman-web/src/ahriman/core/auth/pam.py +++ b/ahriman-web/src/ahriman/core/auth/pam.py @@ -124,6 +124,6 @@ class PAM(Mapping): return user.verify_access(required) # if username is in admin group, then we treat it as full access if username in self.group_members(self.full_access_group): - return UserAccess.Full.permits(required) + return UserAccess.FULL.permits(required) # fallback to read-only accounts - return UserAccess.Read.permits(required) + return UserAccess.READ.permits(required) diff --git a/ahriman-web/src/ahriman/web/apispec/decorators.py b/ahriman-web/src/ahriman/web/apispec/decorators.py index 7c5a787f..1e667463 100644 --- a/ahriman-web/src/ahriman/web/apispec/decorators.py +++ b/ahriman-web/src/ahriman/web/apispec/decorators.py @@ -112,7 +112,7 @@ def apidocs(*, Returns: Callable[..., Any]: decorated function """ - authorization_required = permission != UserAccess.Unauthorized + authorization_required = permission != UserAccess.UNAUTHORIZED def wrapper(handler: Callable[..., Any]) -> Callable[..., Any]: if not aiohttp_apispec: diff --git a/ahriman-web/src/ahriman/web/apispec/info.py b/ahriman-web/src/ahriman/web/apispec/info.py index 72374acd..abb8d991 100644 --- a/ahriman-web/src/ahriman/web/apispec/info.py +++ b/ahriman-web/src/ahriman/web/apispec/info.py @@ -22,7 +22,7 @@ from typing import Any from ahriman import __version__ from ahriman.web.apispec import aiohttp_apispec -from ahriman.web.keys import ConfigurationKey +from ahriman.web.keys import CONFIGURATION_KEY __all__ = ["setup_apispec"] @@ -88,7 +88,7 @@ def _servers(application: Application) -> list[dict[str, Any]]: Returns: list[dict[str, Any]]: list (actually only one) of defined web urls """ - configuration = application[ConfigurationKey] + configuration = application[CONFIGURATION_KEY] address = configuration.get("web", "address", fallback=None) if not address: host = configuration.get("web", "host") diff --git a/ahriman-web/src/ahriman/web/keys.py b/ahriman-web/src/ahriman/web/keys.py index 757d1d8c..b4eaeba9 100644 --- a/ahriman-web/src/ahriman/web/keys.py +++ b/ahriman-web/src/ahriman/web/keys.py @@ -28,16 +28,16 @@ from ahriman.models.repository_id import RepositoryId __all__ = [ - "AuthKey", - "ConfigurationKey", - "SpawnKey", - "WatcherKey", - "WorkersKey", + "AUTH_KEY", + "CONFIGURATION_KEY", + "SPAWN_KEY", + "WATCHER_KEY", + "WORKERS_KEY", ] -AuthKey = AppKey("validator", Auth) -ConfigurationKey = AppKey("configuration", Configuration) -SpawnKey = AppKey("spawn", Spawn) -WatcherKey = AppKey("watcher", dict[RepositoryId, Watcher]) -WorkersKey = AppKey("workers", WorkersCache) +AUTH_KEY = AppKey("validator", Auth) +CONFIGURATION_KEY = AppKey("configuration", Configuration) +SPAWN_KEY = AppKey("spawn", Spawn) +WATCHER_KEY = AppKey("watcher", dict[RepositoryId, Watcher]) +WORKERS_KEY = AppKey("workers", WorkersCache) diff --git a/ahriman-web/src/ahriman/web/middlewares/auth_handler.py b/ahriman-web/src/ahriman/web/middlewares/auth_handler.py index 41652f4c..b0d8321a 100644 --- a/ahriman-web/src/ahriman/web/middlewares/auth_handler.py +++ b/ahriman-web/src/ahriman/web/middlewares/auth_handler.py @@ -98,18 +98,18 @@ def _auth_handler(allow_read_only: bool) -> Middleware: if (unix_socket := request.get_extra_info("socket")) is not None and unix_socket.family == socket.AF_UNIX: # special case for unix sockets. We need to extract socket which is used for the request # and check its address family - permission = UserAccess.Unauthorized + permission = UserAccess.UNAUTHORIZED elif (permission_method := getattr(handler, "get_permission", None)) is not None: permission = await permission_method(request) elif isinstance(handler, types.MethodType): # additional wrapper for static resources handler_instance = getattr(handler, "__self__", None) - permission = UserAccess.Unauthorized if isinstance(handler_instance, StaticResource) else UserAccess.Full + permission = UserAccess.UNAUTHORIZED if isinstance(handler_instance, StaticResource) else UserAccess.FULL else: - permission = UserAccess.Full + permission = UserAccess.FULL - if permission == UserAccess.Unauthorized: # explicit if elif else for better code coverage + if permission == UserAccess.UNAUTHORIZED: # explicit if elif else for better code coverage pass - elif allow_read_only and UserAccess.Read.permits(permission): + elif allow_read_only and UserAccess.READ.permits(permission): pass else: await aiohttp_security.check_permission(request, permission, request.path) diff --git a/ahriman-web/src/ahriman/web/schemas/event_bus_filter_schema.py b/ahriman-web/src/ahriman/web/schemas/event_bus_filter_schema.py index f788caa9..39600de2 100644 --- a/ahriman-web/src/ahriman/web/schemas/event_bus_filter_schema.py +++ b/ahriman-web/src/ahriman/web/schemas/event_bus_filter_schema.py @@ -29,7 +29,7 @@ class EventBusFilterSchema(RepositoryIdSchema): event = fields.List(fields.String(), metadata={ "description": "Event type filter", - "example": [EventType.PackageUpdated], + "example": [EventType.PACKAGE_UPDATED], }) object_id = fields.String(metadata={ "description": "Object identifier filter", diff --git a/ahriman-web/src/ahriman/web/schemas/event_schema.py b/ahriman-web/src/ahriman/web/schemas/event_schema.py index 55ef9c0a..12974421 100644 --- a/ahriman-web/src/ahriman/web/schemas/event_schema.py +++ b/ahriman-web/src/ahriman/web/schemas/event_schema.py @@ -35,7 +35,7 @@ class EventSchema(Schema): }) event = fields.String(required=True, metadata={ "description": "Event type", - "example": EventType.PackageUpdated, + "example": EventType.PACKAGE_UPDATED, }) message = fields.String(metadata={ "description": "Event message if available", diff --git a/ahriman-web/src/ahriman/web/schemas/event_search_schema.py b/ahriman-web/src/ahriman/web/schemas/event_search_schema.py index 13586fdc..bc4e488d 100644 --- a/ahriman-web/src/ahriman/web/schemas/event_search_schema.py +++ b/ahriman-web/src/ahriman/web/schemas/event_search_schema.py @@ -29,7 +29,7 @@ class EventSearchSchema(PaginationSchema): event = fields.String(metadata={ "description": "Event type", - "example": EventType.PackageUpdated, + "example": EventType.PACKAGE_UPDATED, }) from_date = fields.Integer(metadata={ "description": "Minimal creation timestamp, inclusive", diff --git a/ahriman-web/src/ahriman/web/schemas/sse_schema.py b/ahriman-web/src/ahriman/web/schemas/sse_schema.py index 7211d294..897ee79a 100644 --- a/ahriman-web/src/ahriman/web/schemas/sse_schema.py +++ b/ahriman-web/src/ahriman/web/schemas/sse_schema.py @@ -28,7 +28,7 @@ class SSESchema(Schema): event = fields.String(required=True, metadata={ "description": "Event type", - "example": EventType.PackageUpdated, + "example": EventType.PACKAGE_UPDATED, }) data = fields.Dict(keys=fields.String(), values=fields.Raw(), metadata={ "description": "Event data", diff --git a/ahriman-web/src/ahriman/web/views/api/docs.py b/ahriman-web/src/ahriman/web/views/api/docs.py index bac36094..3691ccd8 100644 --- a/ahriman-web/src/ahriman/web/views/api/docs.py +++ b/ahriman-web/src/ahriman/web/views/api/docs.py @@ -35,7 +35,7 @@ class DocsView(BaseView): GET_PERMISSION(UserAccess): (class attribute) get permissions of self """ - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Unauthorized + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.UNAUTHORIZED ROUTES = ["/api-docs"] @classmethod diff --git a/ahriman-web/src/ahriman/web/views/api/swagger.py b/ahriman-web/src/ahriman/web/views/api/swagger.py index 3599496e..d8c37fb6 100644 --- a/ahriman-web/src/ahriman/web/views/api/swagger.py +++ b/ahriman-web/src/ahriman/web/views/api/swagger.py @@ -36,7 +36,7 @@ class SwaggerView(BaseView): GET_PERMISSION(UserAccess): (class attribute) get permissions of self """ - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Unauthorized + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.UNAUTHORIZED ROUTES = ["/api-docs/swagger.json"] @classmethod diff --git a/ahriman-web/src/ahriman/web/views/base.py b/ahriman-web/src/ahriman/web/views/base.py index 05d9e518..d0a21b78 100644 --- a/ahriman-web/src/ahriman/web/views/base.py +++ b/ahriman-web/src/ahriman/web/views/base.py @@ -32,7 +32,7 @@ from ahriman.core.status.watcher import Watcher from ahriman.core.utils import filter_json from ahriman.models.repository_id import RepositoryId from ahriman.models.user_access import UserAccess -from ahriman.web.keys import AuthKey, ConfigurationKey, SpawnKey, WatcherKey, WorkersKey +from ahriman.web.keys import AUTH_KEY, CONFIGURATION_KEY, SPAWN_KEY, WATCHER_KEY, WORKERS_KEY T = TypeVar("T", str, list[str]) @@ -47,7 +47,7 @@ class BaseView(View, CorsViewMixin): ROUTES(list[str]): (class attribute) list of supported routes """ - OPTIONS_PERMISSION: ClassVar[UserAccess] = UserAccess.Unauthorized + OPTIONS_PERMISSION: ClassVar[UserAccess] = UserAccess.UNAUTHORIZED ROUTES: ClassVar[list[str]] = [] @property @@ -58,7 +58,7 @@ class BaseView(View, CorsViewMixin): Returns: Configuration: configuration instance """ - return self.request.app[ConfigurationKey] + return self.request.app[CONFIGURATION_KEY] @property def services(self) -> dict[RepositoryId, Watcher]: @@ -68,7 +68,7 @@ class BaseView(View, CorsViewMixin): Returns: dict[RepositoryId, Watcher]: map of loaded watchers per known repository """ - return self.request.app[WatcherKey] + return self.request.app[WATCHER_KEY] @property def sign(self) -> GPG: @@ -88,7 +88,7 @@ class BaseView(View, CorsViewMixin): Returns: Spawn: external process spawner instance """ - return self.request.app[SpawnKey] + return self.request.app[SPAWN_KEY] @property def validator(self) -> Auth: @@ -98,7 +98,7 @@ class BaseView(View, CorsViewMixin): Returns: Auth: authorization service instance """ - return self.request.app[AuthKey] + return self.request.app[AUTH_KEY] @property def workers(self) -> WorkersCache: @@ -108,7 +108,7 @@ class BaseView(View, CorsViewMixin): Returns: WorkersCache: workers service """ - return self.request.app[WorkersKey] + return self.request.app[WORKERS_KEY] @classmethod async def get_permission(cls, request: Request) -> UserAccess: @@ -122,7 +122,7 @@ class BaseView(View, CorsViewMixin): UserAccess: extracted permission """ method = "GET" if (other := request.method.upper()) == "HEAD" else other - permission: UserAccess = getattr(cls, f"{method}_PERMISSION", UserAccess.Full) + permission: UserAccess = getattr(cls, f"{method}_PERMISSION", UserAccess.FULL) return permission @classmethod diff --git a/ahriman-web/src/ahriman/web/views/index.py b/ahriman-web/src/ahriman/web/views/index.py index b2046441..224eba32 100644 --- a/ahriman-web/src/ahriman/web/views/index.py +++ b/ahriman-web/src/ahriman/web/views/index.py @@ -53,7 +53,7 @@ class IndexView(BaseView): GET_PERMISSION(UserAccess): (class attribute) get permissions of self """ - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Unauthorized + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.UNAUTHORIZED ROUTES = ["/", "/index.html"] async def get(self) -> Response: diff --git a/ahriman-web/src/ahriman/web/views/static.py b/ahriman-web/src/ahriman/web/views/static.py index c19b5838..ed4a01d1 100644 --- a/ahriman-web/src/ahriman/web/views/static.py +++ b/ahriman-web/src/ahriman/web/views/static.py @@ -32,7 +32,7 @@ class StaticView(BaseView): GET_PERMISSION(UserAccess): (class attribute) get permissions of self """ - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Unauthorized + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.UNAUTHORIZED ROUTES = ["/favicon.ico"] async def get(self) -> None: diff --git a/ahriman-web/src/ahriman/web/views/v1/auditlog/event_bus.py b/ahriman-web/src/ahriman/web/views/v1/auditlog/event_bus.py index ab4e9c21..7fbf8c9c 100644 --- a/ahriman-web/src/ahriman/web/views/v1/auditlog/event_bus.py +++ b/ahriman-web/src/ahriman/web/views/v1/auditlog/event_bus.py @@ -41,13 +41,13 @@ class EventBusView(BaseView): """ READ_EVENTS: ClassVar[set[EventType]] = { - EventType.PackageHeld, - EventType.PackageOutdated, - EventType.PackageRemoved, - EventType.PackageStatusChanged, - EventType.PackageUpdateFailed, - EventType.PackageUpdated, - EventType.ServiceStatusChanged, + EventType.PACKAGE_HELD, + EventType.PACKAGE_OUTDATED, + EventType.PACKAGE_REMOVED, + EventType.PACKAGE_STATUS_CHANGED, + EventType.PACKAGE_UPDATE_FAILED, + EventType.PACKAGE_UPDATED, + EventType.SERVICE_STATUS_CHANGED, } ROUTES = ["/api/v1/events/stream"] @@ -65,14 +65,14 @@ class EventBusView(BaseView): if request.method.upper() not in ("GET", "HEAD"): return await BaseView.get_permission(request) - permission = UserAccess.Full + permission = UserAccess.FULL try: topics = cls(request)._topics() except HTTPBadRequest: topics = None if topics is not None and set(topics).issubset(cls.READ_EVENTS): - permission = UserAccess.Read + permission = UserAccess.READ return permission @@ -120,7 +120,7 @@ class EventBusView(BaseView): description="Stream live updates via SSE. Read-only users may subscribe only when all requested event filters " "belong to read-safe package and service status events; build log or unfiltered streams require " "full access. Streams are live-only and do not replay missed events after reconnect.", - permission=UserAccess.Full, + permission=UserAccess.FULL, error_400_enabled=True, error_404_description="Repository is unknown", schema=SSESchema(many=True), diff --git a/ahriman-web/src/ahriman/web/views/v1/auditlog/events.py b/ahriman-web/src/ahriman/web/views/v1/auditlog/events.py index 2f6c3db8..9d76b731 100644 --- a/ahriman-web/src/ahriman/web/views/v1/auditlog/events.py +++ b/ahriman-web/src/ahriman/web/views/v1/auditlog/events.py @@ -36,7 +36,7 @@ class EventsView(BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - GET_PERMISSION = POST_PERMISSION = UserAccess.Full # type: ClassVar[UserAccess] + GET_PERMISSION = POST_PERMISSION = UserAccess.FULL # type: ClassVar[UserAccess] ROUTES = ["/api/v1/events"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/distributed/workers.py b/ahriman-web/src/ahriman/web/views/v1/distributed/workers.py index d5de4f27..a5c8eecb 100644 --- a/ahriman-web/src/ahriman/web/views/v1/distributed/workers.py +++ b/ahriman-web/src/ahriman/web/views/v1/distributed/workers.py @@ -39,7 +39,7 @@ class WorkersView(BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - DELETE_PERMISSION = GET_PERMISSION = POST_PERMISSION = UserAccess.Full # type: ClassVar[UserAccess] + DELETE_PERMISSION = GET_PERMISSION = POST_PERMISSION = UserAccess.FULL # type: ClassVar[UserAccess] ROUTES = ["/api/v1/distributed"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/packages/archives.py b/ahriman-web/src/ahriman/web/views/v1/packages/archives.py index 9e7a140d..27454561 100644 --- a/ahriman-web/src/ahriman/web/views/v1/packages/archives.py +++ b/ahriman-web/src/ahriman/web/views/v1/packages/archives.py @@ -35,7 +35,7 @@ class Archives(StatusViewGuard, BaseView): GET_PERMISSION(UserAccess): (class attribute) get permissions of self """ - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER ROUTES = ["/api/v1/packages/{package}/archives"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/packages/changes.py b/ahriman-web/src/ahriman/web/views/v1/packages/changes.py index 562a0859..d8d0c8bc 100644 --- a/ahriman-web/src/ahriman/web/views/v1/packages/changes.py +++ b/ahriman-web/src/ahriman/web/views/v1/packages/changes.py @@ -37,8 +37,8 @@ class ChangesView(StatusViewGuard, BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter - POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER + POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL ROUTES = ["/api/v1/packages/{package}/changes"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/packages/dependencies.py b/ahriman-web/src/ahriman/web/views/v1/packages/dependencies.py index e8467576..fd3d4045 100644 --- a/ahriman-web/src/ahriman/web/views/v1/packages/dependencies.py +++ b/ahriman-web/src/ahriman/web/views/v1/packages/dependencies.py @@ -37,8 +37,8 @@ class DependenciesView(StatusViewGuard, BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter - POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER + POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL ROUTES = ["/api/v1/packages/{package}/dependencies"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/packages/hold.py b/ahriman-web/src/ahriman/web/views/v1/packages/hold.py index cc6e01f4..199f6f15 100644 --- a/ahriman-web/src/ahriman/web/views/v1/packages/hold.py +++ b/ahriman-web/src/ahriman/web/views/v1/packages/hold.py @@ -36,7 +36,7 @@ class HoldView(StatusViewGuard, BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full + POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL ROUTES = ["/api/v1/packages/{package}/hold"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/packages/logs.py b/ahriman-web/src/ahriman/web/views/v1/packages/logs.py index c63a6d6c..0d08ea61 100644 --- a/ahriman-web/src/ahriman/web/views/v1/packages/logs.py +++ b/ahriman-web/src/ahriman/web/views/v1/packages/logs.py @@ -40,8 +40,8 @@ class LogsView(StatusViewGuard, BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - DELETE_PERMISSION = POST_PERMISSION = UserAccess.Full # type: ClassVar[UserAccess] - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter + DELETE_PERMISSION = POST_PERMISSION = UserAccess.FULL # type: ClassVar[UserAccess] + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER ROUTES = ["/api/v1/packages/{package}/logs"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/packages/package.py b/ahriman-web/src/ahriman/web/views/v1/packages/package.py index 41f44d6c..cafc4b87 100644 --- a/ahriman-web/src/ahriman/web/views/v1/packages/package.py +++ b/ahriman-web/src/ahriman/web/views/v1/packages/package.py @@ -45,8 +45,8 @@ class PackageView(StatusViewGuard, BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - DELETE_PERMISSION = POST_PERMISSION = UserAccess.Full # type: ClassVar[UserAccess] - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Read + DELETE_PERMISSION = POST_PERMISSION = UserAccess.FULL # type: ClassVar[UserAccess] + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.READ ROUTES = ["/api/v1/packages/{package}"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/packages/packages.py b/ahriman-web/src/ahriman/web/views/v1/packages/packages.py index f01c7760..f09150d3 100644 --- a/ahriman-web/src/ahriman/web/views/v1/packages/packages.py +++ b/ahriman-web/src/ahriman/web/views/v1/packages/packages.py @@ -42,8 +42,8 @@ class PackagesView(StatusViewGuard, BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Read - POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.READ + POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL ROUTES = ["/api/v1/packages"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/packages/patch.py b/ahriman-web/src/ahriman/web/views/v1/packages/patch.py index 936e5bec..486b02e3 100644 --- a/ahriman-web/src/ahriman/web/views/v1/packages/patch.py +++ b/ahriman-web/src/ahriman/web/views/v1/packages/patch.py @@ -36,8 +36,8 @@ class PatchView(StatusViewGuard, BaseView): GET_PERMISSION(UserAccess): (class attribute) get permissions of self """ - DELETE_PERMISSION: ClassVar[UserAccess] = UserAccess.Full - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter + DELETE_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER ROUTES = ["/api/v1/packages/{package}/patches/{patch}"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/packages/patches.py b/ahriman-web/src/ahriman/web/views/v1/packages/patches.py index cf4533df..6fe242ba 100644 --- a/ahriman-web/src/ahriman/web/views/v1/packages/patches.py +++ b/ahriman-web/src/ahriman/web/views/v1/packages/patches.py @@ -37,8 +37,8 @@ class PatchesView(StatusViewGuard, BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter - POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER + POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL ROUTES = ["/api/v1/packages/{package}/patches"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/service/add.py b/ahriman-web/src/ahriman/web/views/v1/service/add.py index ec94f605..4b48bd41 100644 --- a/ahriman-web/src/ahriman/web/views/v1/service/add.py +++ b/ahriman-web/src/ahriman/web/views/v1/service/add.py @@ -35,7 +35,7 @@ class AddView(BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full + POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL ROUTES = ["/api/v1/service/add"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/service/config.py b/ahriman-web/src/ahriman/web/views/v1/service/config.py index 0801bce4..87070eae 100644 --- a/ahriman-web/src/ahriman/web/views/v1/service/config.py +++ b/ahriman-web/src/ahriman/web/views/v1/service/config.py @@ -36,7 +36,7 @@ class ConfigView(BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - GET_PERMISSION = POST_PERMISSION = UserAccess.Full # type: ClassVar[UserAccess] + GET_PERMISSION = POST_PERMISSION = UserAccess.FULL # type: ClassVar[UserAccess] ROUTES = ["/api/v1/service/config"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/service/logs.py b/ahriman-web/src/ahriman/web/views/v1/service/logs.py index 94767494..c3a20999 100644 --- a/ahriman-web/src/ahriman/web/views/v1/service/logs.py +++ b/ahriman-web/src/ahriman/web/views/v1/service/logs.py @@ -34,7 +34,7 @@ class LogsView(BaseView): DELETE_PERMISSION(UserAccess): (class attribute) delete permissions of self """ - DELETE_PERMISSION: ClassVar[UserAccess] = UserAccess.Full + DELETE_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL ROUTES = ["/api/v1/service/logs"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/service/pgp.py b/ahriman-web/src/ahriman/web/views/v1/service/pgp.py index 7c682d91..a8499dd3 100644 --- a/ahriman-web/src/ahriman/web/views/v1/service/pgp.py +++ b/ahriman-web/src/ahriman/web/views/v1/service/pgp.py @@ -35,8 +35,8 @@ class PGPView(BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter - POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER + POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL ROUTES = ["/api/v1/service/pgp"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/service/process.py b/ahriman-web/src/ahriman/web/views/v1/service/process.py index bd8d42e1..58cdbe5d 100644 --- a/ahriman-web/src/ahriman/web/views/v1/service/process.py +++ b/ahriman-web/src/ahriman/web/views/v1/service/process.py @@ -34,7 +34,7 @@ class ProcessView(BaseView): GET_PERMISSION(UserAccess): (class attribute) get permissions of self """ - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER ROUTES = ["/api/v1/service/process/{process_id}"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/service/rebuild.py b/ahriman-web/src/ahriman/web/views/v1/service/rebuild.py index 6499fb71..35fa5d48 100644 --- a/ahriman-web/src/ahriman/web/views/v1/service/rebuild.py +++ b/ahriman-web/src/ahriman/web/views/v1/service/rebuild.py @@ -34,7 +34,7 @@ class RebuildView(BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full + POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL ROUTES = ["/api/v1/service/rebuild"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/service/remove.py b/ahriman-web/src/ahriman/web/views/v1/service/remove.py index 3d0f62f5..1e294816 100644 --- a/ahriman-web/src/ahriman/web/views/v1/service/remove.py +++ b/ahriman-web/src/ahriman/web/views/v1/service/remove.py @@ -34,7 +34,7 @@ class RemoveView(BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full + POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL ROUTES = ["/api/v1/service/remove"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/service/request.py b/ahriman-web/src/ahriman/web/views/v1/service/request.py index d56a8bc0..9c81b32e 100644 --- a/ahriman-web/src/ahriman/web/views/v1/service/request.py +++ b/ahriman-web/src/ahriman/web/views/v1/service/request.py @@ -35,7 +35,7 @@ class RequestView(BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter + POST_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER ROUTES = ["/api/v1/service/request"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/service/rollback.py b/ahriman-web/src/ahriman/web/views/v1/service/rollback.py index 348a0316..042789df 100644 --- a/ahriman-web/src/ahriman/web/views/v1/service/rollback.py +++ b/ahriman-web/src/ahriman/web/views/v1/service/rollback.py @@ -34,7 +34,7 @@ class RollbackView(BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full + POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL ROUTES = ["/api/v1/service/rollback"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/service/search.py b/ahriman-web/src/ahriman/web/views/v1/service/search.py index bd8ffb41..23b20977 100644 --- a/ahriman-web/src/ahriman/web/views/v1/service/search.py +++ b/ahriman-web/src/ahriman/web/views/v1/service/search.py @@ -38,7 +38,7 @@ class SearchView(BaseView): GET_PERMISSION(UserAccess): (class attribute) get permissions of self """ - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER ROUTES = ["/api/v1/service/search"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/service/update.py b/ahriman-web/src/ahriman/web/views/v1/service/update.py index 955bd9bd..0d2b517f 100644 --- a/ahriman-web/src/ahriman/web/views/v1/service/update.py +++ b/ahriman-web/src/ahriman/web/views/v1/service/update.py @@ -34,7 +34,7 @@ class UpdateView(BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full + POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL ROUTES = ["/api/v1/service/update"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/service/upload.py b/ahriman-web/src/ahriman/web/views/v1/service/upload.py index 54d1a52f..72a7db6a 100644 --- a/ahriman-web/src/ahriman/web/views/v1/service/upload.py +++ b/ahriman-web/src/ahriman/web/views/v1/service/upload.py @@ -42,7 +42,7 @@ class UploadView(BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full + POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL ROUTES = ["/api/v1/service/upload"] @classmethod diff --git a/ahriman-web/src/ahriman/web/views/v1/status/info.py b/ahriman-web/src/ahriman/web/views/v1/status/info.py index e1635f91..0cf17d5b 100644 --- a/ahriman-web/src/ahriman/web/views/v1/status/info.py +++ b/ahriman-web/src/ahriman/web/views/v1/status/info.py @@ -35,7 +35,7 @@ class InfoView(BaseView): GET_PERMISSION(UserAccess): (class attribute) get permissions of self """ - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Unauthorized + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.UNAUTHORIZED ROUTES = ["/api/v1/info"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/status/metrics.py b/ahriman-web/src/ahriman/web/views/v1/status/metrics.py index aeeba6fb..c78b06b7 100644 --- a/ahriman-web/src/ahriman/web/views/v1/status/metrics.py +++ b/ahriman-web/src/ahriman/web/views/v1/status/metrics.py @@ -35,7 +35,7 @@ class MetricsView(BaseView): GET_PERMISSION(UserAccess): (class attribute) get permissions of self """ - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Unauthorized + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.UNAUTHORIZED ROUTES = ["/api/v1/metrics"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/status/repositories.py b/ahriman-web/src/ahriman/web/views/v1/status/repositories.py index 81e333e3..cea0b16a 100644 --- a/ahriman-web/src/ahriman/web/views/v1/status/repositories.py +++ b/ahriman-web/src/ahriman/web/views/v1/status/repositories.py @@ -34,7 +34,7 @@ class RepositoriesView(BaseView): GET_PERMISSION(UserAccess): (class attribute) get permissions of self """ - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Read + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.READ ROUTES = ["/api/v1/repositories"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/status/status.py b/ahriman-web/src/ahriman/web/views/v1/status/status.py index a06fd4f9..a3f8b4b2 100644 --- a/ahriman-web/src/ahriman/web/views/v1/status/status.py +++ b/ahriman-web/src/ahriman/web/views/v1/status/status.py @@ -41,8 +41,8 @@ class StatusView(StatusViewGuard, BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Read - POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Full + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.READ + POST_PERMISSION: ClassVar[UserAccess] = UserAccess.FULL ROUTES = ["/api/v1/status"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/user/login.py b/ahriman-web/src/ahriman/web/views/v1/user/login.py index feb693c5..949eb2e5 100644 --- a/ahriman-web/src/ahriman/web/views/v1/user/login.py +++ b/ahriman-web/src/ahriman/web/views/v1/user/login.py @@ -38,7 +38,7 @@ class LoginView(BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - GET_PERMISSION = POST_PERMISSION = UserAccess.Unauthorized # type: ClassVar[UserAccess] + GET_PERMISSION = POST_PERMISSION = UserAccess.UNAUTHORIZED # type: ClassVar[UserAccess] ROUTES = ["/api/v1/login"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v1/user/logout.py b/ahriman-web/src/ahriman/web/views/v1/user/logout.py index efbd7d85..bd56fa8a 100644 --- a/ahriman-web/src/ahriman/web/views/v1/user/logout.py +++ b/ahriman-web/src/ahriman/web/views/v1/user/logout.py @@ -34,7 +34,7 @@ class LogoutView(BaseView): POST_PERMISSION(UserAccess): (class attribute) post permissions of self """ - POST_PERMISSION: ClassVar[UserAccess] = UserAccess.Unauthorized + POST_PERMISSION: ClassVar[UserAccess] = UserAccess.UNAUTHORIZED ROUTES = ["/api/v1/logout"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v2/packages/logs.py b/ahriman-web/src/ahriman/web/views/v2/packages/logs.py index 6ed20482..f00019b7 100644 --- a/ahriman-web/src/ahriman/web/views/v2/packages/logs.py +++ b/ahriman-web/src/ahriman/web/views/v2/packages/logs.py @@ -38,7 +38,7 @@ class LogsView(StatusViewGuard, BaseView): GET_PERMISSION(UserAccess): (class attribute) get permissions of self """ - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Reporter + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.REPORTER ROUTES = ["/api/v2/packages/{package}/logs"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/views/v2/status/info.py b/ahriman-web/src/ahriman/web/views/v2/status/info.py index c486173b..d72221e8 100644 --- a/ahriman-web/src/ahriman/web/views/v2/status/info.py +++ b/ahriman-web/src/ahriman/web/views/v2/status/info.py @@ -35,7 +35,7 @@ class InfoView(BaseView): GET_PERMISSION(UserAccess): (class attribute) get permissions of self """ - GET_PERMISSION: ClassVar[UserAccess] = UserAccess.Unauthorized + GET_PERMISSION: ClassVar[UserAccess] = UserAccess.UNAUTHORIZED ROUTES = ["/api/v2/info"] @apidocs( diff --git a/ahriman-web/src/ahriman/web/web.py b/ahriman-web/src/ahriman/web/web.py index 7cc9905f..6887c192 100644 --- a/ahriman-web/src/ahriman/web/web.py +++ b/ahriman-web/src/ahriman/web/web.py @@ -38,7 +38,7 @@ from ahriman.core.status.watcher import Watcher from ahriman.models.repository_id import RepositoryId from ahriman.web.apispec.info import setup_apispec from ahriman.web.cors import setup_cors -from ahriman.web.keys import AuthKey, ConfigurationKey, SpawnKey, WatcherKey, WorkersKey +from ahriman.web.keys import AUTH_KEY, CONFIGURATION_KEY, SPAWN_KEY, WATCHER_KEY, WORKERS_KEY from ahriman.web.middlewares.etag_handler import etag_handler from ahriman.web.middlewares.exception_handler import exception_handler from ahriman.web.middlewares.metrics_handler import metrics_handler @@ -121,7 +121,7 @@ async def _on_shutdown(application: Application) -> None: Args: application(Application): web application instance """ - for watcher in application[WatcherKey].values(): + for watcher in application[WATCHER_KEY].values(): await watcher.shutdown() application.logger.warning("server terminated") @@ -139,7 +139,7 @@ async def _on_startup(application: Application) -> None: application.logger.info("server started") try: - for watcher in application[WatcherKey].values(): + for watcher in application[WATCHER_KEY].values(): await watcher.load() except Exception: message = "could not load packages" @@ -156,7 +156,7 @@ def run_server(application: Application) -> None: """ application.logger.info("start server") - configuration = application[ConfigurationKey] + configuration = application[CONFIGURATION_KEY] host = configuration.get("web", "host") port = configuration.getint("web", "port") unix_socket = _create_socket(configuration, application) @@ -201,25 +201,25 @@ def setup_server(configuration: Configuration, spawner: Spawn, repositories: lis aiohttp_jinja2.setup(application, trim_blocks=True, lstrip_blocks=True, autoescape=True, loader=loader) application.logger.info("setup configuration") - application[ConfigurationKey] = configuration + application[CONFIGURATION_KEY] = configuration application.logger.info("setup services") # package cache if not repositories: raise InitializeError("No repositories configured, exiting") configuration_path, _ = configuration.check_loaded() - application[WatcherKey] = { + application[WATCHER_KEY] = { repository_id: _create_watcher(configuration_path, repository_id) for repository_id in repositories } # workers cache - application[WorkersKey] = WorkersCache(configuration) + application[WORKERS_KEY] = WorkersCache(configuration) # process spawner - application[SpawnKey] = spawner + application[SPAWN_KEY] = spawner application.logger.info("setup authorization") database = SQLite.load(configuration) - validator = application[AuthKey] = Auth.load(configuration, database) + validator = application[AUTH_KEY] = Auth.load(configuration, database) if validator.enabled: from ahriman.web.middlewares.auth_handler import setup_auth setup_auth(application, configuration, validator) diff --git a/ahriman-web/tests/ahriman/application/handlers/web/test_handler_web.py b/ahriman-web/tests/ahriman/application/handlers/web/test_handler_web.py index 19b0fc79..419be941 100644 --- a/ahriman-web/tests/ahriman/application/handlers/web/test_handler_web.py +++ b/ahriman-web/tests/ahriman/application/handlers/web/test_handler_web.py @@ -70,7 +70,7 @@ def test_extract_arguments(args: argparse.Namespace, configuration: Configuratio expected.extend(["--force"]) assert list(Web.extract_arguments(probe, configuration)) == expected - probe.log_handler = LogHandler.Console + probe.log_handler = LogHandler.CONSOLE expected.extend(["--log-handler", probe.log_handler.value]) assert list(Web.extract_arguments(probe, configuration)) == expected diff --git a/ahriman-web/tests/ahriman/core/auth/test_auth.py b/ahriman-web/tests/ahriman/core/auth/test_auth.py index 1cb17246..85824263 100644 --- a/ahriman-web/tests/ahriman/core/auth/test_auth.py +++ b/ahriman-web/tests/ahriman/core/auth/test_auth.py @@ -89,4 +89,4 @@ async def test_verify_access(auth: Auth, user: User) -> None: must allow any access """ assert await auth.verify_access(user.username, user.access, None) - assert await auth.verify_access(user.username, UserAccess.Full, None) + assert await auth.verify_access(user.username, UserAccess.FULL, None) diff --git a/ahriman-web/tests/ahriman/core/auth/test_mapping.py b/ahriman-web/tests/ahriman/core/auth/test_mapping.py index 3b8348f1..3012a60d 100644 --- a/ahriman-web/tests/ahriman/core/auth/test_mapping.py +++ b/ahriman-web/tests/ahriman/core/auth/test_mapping.py @@ -76,4 +76,4 @@ async def test_verify_access(mapping: Mapping, user: User, mocker: MockerFixture """ mocker.patch("ahriman.core.database.SQLite.user_get", return_value=user) assert await mapping.verify_access(user.username, user.access, None) - assert not await mapping.verify_access(user.username, UserAccess.Full, None) + assert not await mapping.verify_access(user.username, UserAccess.FULL, None) diff --git a/ahriman-web/tests/ahriman/core/auth/test_pam.py b/ahriman-web/tests/ahriman/core/auth/test_pam.py index a46f5a0b..856f0081 100644 --- a/ahriman-web/tests/ahriman/core/auth/test_pam.py +++ b/ahriman-web/tests/ahriman/core/auth/test_pam.py @@ -92,7 +92,7 @@ async def test_verify_access(pam: PAM, user: User, mocker: MockerFixture) -> Non """ mocker.patch("ahriman.core.auth.pam.PAM.get_user", return_value=None) mocker.patch("ahriman.core.auth.pam.PAM.group_members", return_value=[user.username]) - assert await pam.verify_access(user.username, UserAccess.Full, None) + assert await pam.verify_access(user.username, UserAccess.FULL, None) async def test_verify_access_readonly(pam: PAM, user: User, mocker: MockerFixture) -> None: @@ -102,9 +102,9 @@ async def test_verify_access_readonly(pam: PAM, user: User, mocker: MockerFixtur mocker.patch("ahriman.core.auth.pam.PAM.get_user", return_value=None) mocker.patch("ahriman.core.auth.pam.PAM.group_members", return_value=[]) - assert not await pam.verify_access(user.username, UserAccess.Full, None) - assert not await pam.verify_access(user.username, UserAccess.Reporter, None) - assert await pam.verify_access(user.username, UserAccess.Read, None) + assert not await pam.verify_access(user.username, UserAccess.FULL, None) + assert not await pam.verify_access(user.username, UserAccess.REPORTER, None) + assert await pam.verify_access(user.username, UserAccess.READ, None) async def test_verify_access_override(pam: PAM, user: User, mocker: MockerFixture) -> None: diff --git a/ahriman-web/tests/ahriman/web/apispec/test_decorators.py b/ahriman-web/tests/ahriman/web/apispec/test_decorators.py index 3ae29718..620880ea 100644 --- a/ahriman-web/tests/ahriman/web/apispec/test_decorators.py +++ b/ahriman-web/tests/ahriman/web/apispec/test_decorators.py @@ -70,7 +70,7 @@ def test_apidocs() -> None: tags=["tags"], summary="summary", description="description", - permission=UserAccess.Unauthorized, + permission=UserAccess.UNAUTHORIZED, )(MagicMock()) assert annotated.__apispec__ @@ -83,7 +83,7 @@ def test_apidocs_authorization() -> None: tags=["tags"], summary="summary", description="description", - permission=UserAccess.Full, + permission=UserAccess.FULL, )(MagicMock()) assert any(schema["put_into"] == "cookies" for schema in annotated.__schemas__) @@ -96,7 +96,7 @@ def test_apidocs_match() -> None: tags=["tags"], summary="summary", description="description", - permission=UserAccess.Unauthorized, + permission=UserAccess.UNAUTHORIZED, match_schema=LoginSchema, )(MagicMock()) assert any(schema["put_into"] == "match_info" for schema in annotated.__schemas__) @@ -110,7 +110,7 @@ def test_apidocs_querystring() -> None: tags=["tags"], summary="summary", description="description", - permission=UserAccess.Unauthorized, + permission=UserAccess.UNAUTHORIZED, query_schema=LoginSchema, )(MagicMock()) assert any(schema["put_into"] == "querystring" for schema in annotated.__schemas__) @@ -124,7 +124,7 @@ def test_apidocs_json() -> None: tags=["tags"], summary="summary", description="description", - permission=UserAccess.Unauthorized, + permission=UserAccess.UNAUTHORIZED, body_schema=LoginSchema, )(MagicMock()) assert any(schema["put_into"] == "json" for schema in annotated.__schemas__) @@ -138,7 +138,7 @@ def test_apidocs_form() -> None: tags=["tags"], summary="summary", description="description", - permission=UserAccess.Unauthorized, + permission=UserAccess.UNAUTHORIZED, body_schema=LoginSchema, body_location="form", )(MagicMock()) @@ -156,6 +156,6 @@ def test_apidocs_import_error(mocker: MockerFixture) -> None: tags=["tags"], summary="summary", description="description", - permission=UserAccess.Unauthorized, + permission=UserAccess.UNAUTHORIZED, )(mock) assert annotated == mock diff --git a/ahriman-web/tests/ahriman/web/apispec/test_info.py b/ahriman-web/tests/ahriman/web/apispec/test_info.py index e4f3023c..8c281fb7 100644 --- a/ahriman-web/tests/ahriman/web/apispec/test_info.py +++ b/ahriman-web/tests/ahriman/web/apispec/test_info.py @@ -6,7 +6,7 @@ from pytest_mock import MockerFixture from ahriman import __version__ from ahriman.web.apispec import info from ahriman.web.apispec.info import _info, _security, _servers, setup_apispec -from ahriman.web.keys import ConfigurationKey +from ahriman.web.keys import CONFIGURATION_KEY def test_info() -> None: @@ -38,7 +38,7 @@ def test_servers_address(application: Application) -> None: """ must generate servers definitions with address """ - application[ConfigurationKey].set_option("web", "address", "https://example.com") + application[CONFIGURATION_KEY].set_option("web", "address", "https://example.com") servers = _servers(application) assert servers == [{"url": "https://example.com"}] diff --git a/ahriman-web/tests/ahriman/web/conftest.py b/ahriman-web/tests/ahriman/web/conftest.py index 692978ae..dbc2868a 100644 --- a/ahriman-web/tests/ahriman/web/conftest.py +++ b/ahriman-web/tests/ahriman/web/conftest.py @@ -15,7 +15,7 @@ from ahriman.core.configuration import Configuration from ahriman.core.database import SQLite from ahriman.core.spawn import Spawn from ahriman.models.user import User -from ahriman.web.keys import AuthKey +from ahriman.web.keys import AUTH_KEY from ahriman.web.web import setup_server @@ -160,7 +160,7 @@ def application_with_auth(configuration: Configuration, user: User, spawner: Spa _, repository_id = configuration.check_loaded() application = setup_server(configuration, spawner, [repository_id]) - generated = user.hash_password(application[AuthKey].salt) + generated = user.hash_password(application[AUTH_KEY].salt) mocker.patch("ahriman.core.database.SQLite.user_get", return_value=generated) return application @@ -216,5 +216,5 @@ async def client_with_oauth_auth(application_with_auth: Application, aiohttp_cli TestClient: web client test instance """ mocker.patch("pathlib.Path.iterdir", return_value=[]) - application_with_auth[AuthKey] = MagicMock(spec=OAuth) + application_with_auth[AUTH_KEY] = MagicMock(spec=OAuth) return await aiohttp_client(application_with_auth) diff --git a/ahriman-web/tests/ahriman/web/middlewares/test_auth_handler.py b/ahriman-web/tests/ahriman/web/middlewares/test_auth_handler.py index fb6b83f1..827359af 100644 --- a/ahriman-web/tests/ahriman/web/middlewares/test_auth_handler.py +++ b/ahriman-web/tests/ahriman/web/middlewares/test_auth_handler.py @@ -12,7 +12,7 @@ from ahriman.core.configuration import Configuration from ahriman.models.build_status import BuildStatusEnum from ahriman.models.user import User from ahriman.models.user_access import UserAccess -from ahriman.web.keys import AuthKey +from ahriman.web.keys import AUTH_KEY from ahriman.web.middlewares.auth_handler import _AuthorizationPolicy, _auth_handler, _cookie_secret_key, setup_auth @@ -43,7 +43,7 @@ async def test_permits(authorization_policy: _AuthorizationPolicy, user: User) - assert not await authorization_policy.permits("somerandomname", user.access, "/endpoint") assert not await authorization_policy.permits(None, user.access, "/endpoint") assert not await authorization_policy.permits(user.username, "random", "/endpoint") - assert not await authorization_policy.permits(None, BuildStatusEnum.Building, "/endpoint") + assert not await authorization_policy.permits(None, BuildStatusEnum.BUILDING, "/endpoint") authorization_policy.validator.verify_access.assert_has_calls([ MockCall(user.username, user.access, "/endpoint"), @@ -58,7 +58,7 @@ async def test_auth_handler_unix_socket(mocker: MockerFixture) -> None: aiohttp_request = pytest.helpers.request( "", "/api/v1/status", "GET", extra={"socket": socket.socket(socket.AF_UNIX)}) request_handler = AsyncMock() - request_handler.get_permission.return_value = UserAccess.Full + request_handler.get_permission.return_value = UserAccess.FULL check_permission_mock = mocker.patch("aiohttp_security.check_permission") handler = _auth_handler(allow_read_only=False) @@ -72,12 +72,12 @@ async def test_auth_handler_api(mocker: MockerFixture) -> None: """ aiohttp_request = pytest.helpers.request("", "/api/v1/status", "GET") request_handler = AsyncMock() - request_handler.get_permission.return_value = UserAccess.Read + request_handler.get_permission.return_value = UserAccess.READ check_permission_mock = mocker.patch("aiohttp_security.check_permission") handler = _auth_handler(allow_read_only=False) await handler(aiohttp_request, request_handler) - check_permission_mock.assert_called_once_with(aiohttp_request, UserAccess.Read, aiohttp_request.path) + check_permission_mock.assert_called_once_with(aiohttp_request, UserAccess.READ, aiohttp_request.path) async def test_auth_handler_static(client_with_auth: TestClient, mocker: MockerFixture) -> None: @@ -104,7 +104,7 @@ async def test_auth_handler_allow_read_only(mocker: MockerFixture) -> None: """ aiohttp_request = pytest.helpers.request("", "/api/v1/status", "GET") request_handler = AsyncMock() - request_handler.get_permission.return_value = UserAccess.Read + request_handler.get_permission.return_value = UserAccess.READ check_permission_mock = mocker.patch("aiohttp_security.check_permission") handler = _auth_handler(allow_read_only=True) @@ -123,7 +123,7 @@ async def test_auth_handler_api_no_method(mocker: MockerFixture) -> None: handler = _auth_handler(allow_read_only=False) await handler(aiohttp_request, request_handler) - check_permission_mock.assert_called_once_with(aiohttp_request, UserAccess.Full, aiohttp_request.path) + check_permission_mock.assert_called_once_with(aiohttp_request, UserAccess.FULL, aiohttp_request.path) async def test_auth_handler_api_post(mocker: MockerFixture) -> None: @@ -132,12 +132,12 @@ async def test_auth_handler_api_post(mocker: MockerFixture) -> None: """ aiohttp_request = pytest.helpers.request("", "/api/v1/status", "POST") request_handler = AsyncMock() - request_handler.get_permission.return_value = UserAccess.Full + request_handler.get_permission.return_value = UserAccess.FULL check_permission_mock = mocker.patch("aiohttp_security.check_permission") handler = _auth_handler(allow_read_only=False) await handler(aiohttp_request, request_handler) - check_permission_mock.assert_called_once_with(aiohttp_request, UserAccess.Full, aiohttp_request.path) + check_permission_mock.assert_called_once_with(aiohttp_request, UserAccess.FULL, aiohttp_request.path) async def test_auth_handler_read(mocker: MockerFixture) -> None: @@ -147,12 +147,12 @@ async def test_auth_handler_read(mocker: MockerFixture) -> None: for method in ("GET", "HEAD", "OPTIONS"): aiohttp_request = pytest.helpers.request("", "", method) request_handler = AsyncMock() - request_handler.get_permission.return_value = UserAccess.Read + request_handler.get_permission.return_value = UserAccess.READ check_permission_mock = mocker.patch("aiohttp_security.check_permission") handler = _auth_handler(allow_read_only=False) await handler(aiohttp_request, request_handler) - check_permission_mock.assert_called_once_with(aiohttp_request, UserAccess.Read, aiohttp_request.path) + check_permission_mock.assert_called_once_with(aiohttp_request, UserAccess.READ, aiohttp_request.path) async def test_auth_handler_write(mocker: MockerFixture) -> None: @@ -162,12 +162,12 @@ async def test_auth_handler_write(mocker: MockerFixture) -> None: for method in ("CONNECT", "DELETE", "PATCH", "POST", "PUT", "TRACE"): aiohttp_request = pytest.helpers.request("", "", method) request_handler = AsyncMock() - request_handler.get_permission.return_value = UserAccess.Full + request_handler.get_permission.return_value = UserAccess.FULL check_permission_mock = mocker.patch("aiohttp_security.check_permission") handler = _auth_handler(allow_read_only=False) await handler(aiohttp_request, request_handler) - check_permission_mock.assert_called_once_with(aiohttp_request, UserAccess.Full, aiohttp_request.path) + check_permission_mock.assert_called_once_with(aiohttp_request, UserAccess.FULL, aiohttp_request.path) def test_cookie_secret_key(configuration: Configuration) -> None: @@ -193,5 +193,5 @@ def test_setup_auth(application_with_auth: Application, configuration: Configura """ setup_mock = mocker.patch("aiohttp_security.setup") application = setup_auth(application_with_auth, configuration, auth) - assert application.get(AuthKey) is not None + assert application.get(AUTH_KEY) is not None setup_mock.assert_called_once_with(application_with_auth, pytest.helpers.anyvar(int), pytest.helpers.anyvar(int)) diff --git a/ahriman-web/tests/ahriman/web/test_cors.py b/ahriman-web/tests/ahriman/web/test_cors.py index 219d1291..d0260078 100644 --- a/ahriman-web/tests/ahriman/web/test_cors.py +++ b/ahriman-web/tests/ahriman/web/test_cors.py @@ -5,7 +5,7 @@ from aiohttp.web import Application from pytest_mock import MockerFixture from ahriman.web.cors import setup_cors -from ahriman.web.keys import ConfigurationKey +from ahriman.web.keys import CONFIGURATION_KEY def test_setup_cors(application: Application) -> None: @@ -28,7 +28,7 @@ def test_setup_cors_custom_origins(application: Application, mocker: MockerFixtu """ must setup CORS with custom origins """ - configuration = application[ConfigurationKey] + configuration = application[CONFIGURATION_KEY] configuration.set_option("web", "cors_allow_origins", "https://example.com https://httpbin.com") setup_mock = mocker.patch("ahriman.web.cors.aiohttp_cors.setup", return_value=mocker.MagicMock()) @@ -44,7 +44,7 @@ def test_setup_cors_custom_methods(application: Application, mocker: MockerFixtu """ must setup CORS with custom methods """ - configuration = application[ConfigurationKey] + configuration = application[CONFIGURATION_KEY] configuration.set_option("web", "cors_allow_methods", "GET POST") setup_mock = mocker.patch("ahriman.web.cors.aiohttp_cors.setup", return_value=mocker.MagicMock()) diff --git a/ahriman-web/tests/ahriman/web/test_web.py b/ahriman-web/tests/ahriman/web/test_web.py index 13f51543..fe5b2a73 100644 --- a/ahriman-web/tests/ahriman/web/test_web.py +++ b/ahriman-web/tests/ahriman/web/test_web.py @@ -9,7 +9,7 @@ from ahriman.core.configuration import Configuration from ahriman.core.exceptions import InitializeError from ahriman.core.spawn import Spawn from ahriman.core.status.watcher import Watcher -from ahriman.web.keys import ConfigurationKey +from ahriman.web.keys import CONFIGURATION_KEY from ahriman.web.web import _create_socket, _create_watcher, _on_shutdown, _on_startup, run_server, setup_server @@ -18,14 +18,14 @@ async def test_create_socket(application: Application, mocker: MockerFixture) -> must create socket """ path = "/run/ahriman.sock" - application[ConfigurationKey].set_option("web", "unix_socket", str(path)) + application[CONFIGURATION_KEY].set_option("web", "unix_socket", str(path)) current_on_shutdown = len(application.on_shutdown) bind_mock = mocker.patch("socket.socket.bind") chmod_mock = mocker.patch("pathlib.Path.chmod") unlink_mock = mocker.patch("pathlib.Path.unlink") - sock = _create_socket(application[ConfigurationKey], application) + sock = _create_socket(application[CONFIGURATION_KEY], application) assert sock.family == socket.AF_UNIX assert sock.type == socket.SOCK_STREAM bind_mock.assert_called_once_with(str(path)) @@ -41,7 +41,7 @@ def test_create_socket_empty(application: Application) -> None: """ must skip socket creation if not set by configuration """ - assert _create_socket(application[ConfigurationKey], application) is None + assert _create_socket(application[CONFIGURATION_KEY], application) is None def test_create_socket_safe(application: Application, mocker: MockerFixture) -> None: @@ -49,14 +49,14 @@ def test_create_socket_safe(application: Application, mocker: MockerFixture) -> must create socket with default permission set """ path = "/run/ahriman.sock" - application[ConfigurationKey].set_option("web", "unix_socket", str(path)) - application[ConfigurationKey].set_option("web", "unix_socket_unsafe", "no") + application[CONFIGURATION_KEY].set_option("web", "unix_socket", str(path)) + application[CONFIGURATION_KEY].set_option("web", "unix_socket_unsafe", "no") mocker.patch("socket.socket.bind") mocker.patch("pathlib.Path.unlink") chmod_mock = mocker.patch("pathlib.Path.chmod") - sock = _create_socket(application[ConfigurationKey], application) + sock = _create_socket(application[CONFIGURATION_KEY], application) assert sock is not None chmod_mock.assert_not_called() @@ -112,7 +112,7 @@ def test_run(application: Application, mocker: MockerFixture) -> None: must run application """ port = 8080 - application[ConfigurationKey].set_option("web", "port", str(port)) + application[CONFIGURATION_KEY].set_option("web", "port", str(port)) run_application_mock = mocker.patch("ahriman.web.web.run_app") run_server(application) @@ -127,7 +127,7 @@ def test_run_with_auth(application_with_auth: Application, mocker: MockerFixture must run application with enabled authorization """ port = 8080 - application_with_auth[ConfigurationKey].set_option("web", "port", str(port)) + application_with_auth[CONFIGURATION_KEY].set_option("web", "port", str(port)) run_application_mock = mocker.patch("ahriman.web.web.run_app") run_server(application_with_auth) @@ -142,12 +142,12 @@ def test_run_with_socket(application: Application, mocker: MockerFixture) -> Non must run application with socket """ port = 8080 - application[ConfigurationKey].set_option("web", "port", str(port)) + application[CONFIGURATION_KEY].set_option("web", "port", str(port)) socket_mock = mocker.patch("ahriman.web.web._create_socket", return_value=42) run_application_mock = mocker.patch("ahriman.web.web.run_app") run_server(application) - socket_mock.assert_called_once_with(application[ConfigurationKey], application) + socket_mock.assert_called_once_with(application[CONFIGURATION_KEY], application) run_application_mock.assert_called_once_with( application, host="127.0.0.1", port=port, sock=42, handle_signals=True, access_log=pytest.helpers.anyvar(int), diff --git a/ahriman-web/tests/ahriman/web/views/api/test_view_api_docs.py b/ahriman-web/tests/ahriman/web/views/api/test_view_api_docs.py index 4a959a09..d4d46352 100644 --- a/ahriman-web/tests/ahriman/web/views/api/test_view_api_docs.py +++ b/ahriman-web/tests/ahriman/web/views/api/test_view_api_docs.py @@ -14,7 +14,7 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await DocsView.get_permission(request) == UserAccess.Unauthorized + assert await DocsView.get_permission(request) == UserAccess.UNAUTHORIZED def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/api/test_view_api_swagger.py b/ahriman-web/tests/ahriman/web/views/api/test_view_api_swagger.py index 99e1ef1d..2df12575 100644 --- a/ahriman-web/tests/ahriman/web/views/api/test_view_api_swagger.py +++ b/ahriman-web/tests/ahriman/web/views/api/test_view_api_swagger.py @@ -84,7 +84,7 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await SwaggerView.get_permission(request) == UserAccess.Unauthorized + assert await SwaggerView.get_permission(request) == UserAccess.UNAUTHORIZED def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/test_view_base.py b/ahriman-web/tests/ahriman/web/views/test_view_base.py index 291fc827..4b913f46 100644 --- a/ahriman-web/tests/ahriman/web/views/test_view_base.py +++ b/ahriman-web/tests/ahriman/web/views/test_view_base.py @@ -9,7 +9,7 @@ from unittest.mock import AsyncMock from ahriman.core.configuration import Configuration from ahriman.models.repository_id import RepositoryId from ahriman.models.user_access import UserAccess -from ahriman.web.keys import WatcherKey +from ahriman.web.keys import WATCHER_KEY from ahriman.web.views.base import BaseView @@ -75,7 +75,7 @@ async def test_get_permission(base: BaseView) -> None: for method in ("OPTIONS",): request = pytest.helpers.request(base.request.app, "", method) - assert await base.get_permission(request) == UserAccess.Unauthorized + assert await base.get_permission(request) == UserAccess.UNAUTHORIZED def test_get_routes(configuration: Configuration, mocker: MockerFixture) -> None: @@ -180,9 +180,9 @@ def test_service(base: BaseView) -> None: must return service for repository """ repository_id = RepositoryId("i686", "repo") - base.request.app[WatcherKey] = { + base.request.app[WATCHER_KEY] = { repository_id: watcher - for watcher in base.request.app[WatcherKey].values() + for watcher in base.request.app[WATCHER_KEY].values() } assert base.service(repository_id) == base.services[repository_id] diff --git a/ahriman-web/tests/ahriman/web/views/test_view_index.py b/ahriman-web/tests/ahriman/web/views/test_view_index.py index cf75dd27..ba56845a 100644 --- a/ahriman-web/tests/ahriman/web/views/test_view_index.py +++ b/ahriman-web/tests/ahriman/web/views/test_view_index.py @@ -12,7 +12,7 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await IndexView.get_permission(request) == UserAccess.Unauthorized + assert await IndexView.get_permission(request) == UserAccess.UNAUTHORIZED def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/test_view_static.py b/ahriman-web/tests/ahriman/web/views/test_view_static.py index 5c53f45f..ca1a31e3 100644 --- a/ahriman-web/tests/ahriman/web/views/test_view_static.py +++ b/ahriman-web/tests/ahriman/web/views/test_view_static.py @@ -13,7 +13,7 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await StaticView.get_permission(request) == UserAccess.Unauthorized + assert await StaticView.get_permission(request) == UserAccess.UNAUTHORIZED def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/v1/auditlog/test_view_v1_auditlog_event_bus.py b/ahriman-web/tests/ahriman/web/views/v1/auditlog/test_view_v1_auditlog_event_bus.py index 457af1e6..b8360ea3 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/auditlog/test_view_v1_auditlog_event_bus.py +++ b/ahriman-web/tests/ahriman/web/views/v1/auditlog/test_view_v1_auditlog_event_bus.py @@ -13,7 +13,7 @@ from ahriman.core.status.watcher import Watcher from ahriman.models.event import EventType from ahriman.models.package import Package from ahriman.models.user_access import UserAccess -from ahriman.web.keys import WatcherKey +from ahriman.web.keys import WATCHER_KEY from ahriman.web.views.base import BaseView from ahriman.web.views.v1.auditlog.event_bus import EventBusView @@ -27,8 +27,8 @@ async def _producer(watcher: Watcher, package_ahriman: Package) -> None: package_ahriman(Package): package test instance """ await asyncio.sleep(0.1) - await watcher.event_bus.broadcast(EventType.PackageRemoved, package_ahriman.base) - await watcher.event_bus.broadcast(EventType.PackageUpdated, package_ahriman.base, status="success") + await watcher.event_bus.broadcast(EventType.PACKAGE_REMOVED, package_ahriman.base) + await watcher.event_bus.broadcast(EventType.PACKAGE_UPDATED, package_ahriman.base, status="success") await asyncio.sleep(0.1) await watcher.event_bus.shutdown() @@ -39,15 +39,15 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await EventBusView.get_permission(request) == UserAccess.Full + assert await EventBusView.get_permission(request) == UserAccess.FULL async def test_get_permission_build_log() -> None: """ must return full permission for build log stream """ - request = pytest.helpers.request("", "", "GET", params=MultiDict(event=EventType.BuildLog)) - assert await EventBusView.get_permission(request) == UserAccess.Full + request = pytest.helpers.request("", "", "GET", params=MultiDict(event=EventType.BUILD_LOG)) + assert await EventBusView.get_permission(request) == UserAccess.FULL async def test_get_permission_build_log_with_read_events() -> None: @@ -55,10 +55,10 @@ async def test_get_permission_build_log_with_read_events() -> None: must return full permission for mixed build log and read event stream """ request = pytest.helpers.request("", "", "GET", params=MultiDict([ - ("event", EventType.BuildLog), - ("event", EventType.PackageUpdated), + ("event", EventType.BUILD_LOG), + ("event", EventType.PACKAGE_UPDATED), ])) - assert await EventBusView.get_permission(request) == UserAccess.Full + assert await EventBusView.get_permission(request) == UserAccess.FULL async def test_get_permission_invalid_event() -> None: @@ -66,14 +66,14 @@ async def test_get_permission_invalid_event() -> None: must return full permission for invalid event type """ request = pytest.helpers.request("", "", "GET", params=MultiDict(event="invalid")) - assert await EventBusView.get_permission(request) == UserAccess.Full + assert await EventBusView.get_permission(request) == UserAccess.FULL async def test_get_permission_post() -> None: """ must use default permission for non-get requests """ - request = pytest.helpers.request("", "", "POST", params=MultiDict(event=EventType.PackageUpdated)) + request = pytest.helpers.request("", "", "POST", params=MultiDict(event=EventType.PACKAGE_UPDATED)) assert await EventBusView.get_permission(request) == await BaseView.get_permission(request) @@ -84,7 +84,7 @@ async def test_get_permission_read_events() -> None: request = pytest.helpers.request("", "", "GET", params=MultiDict( ("event", event_type) for event_type in EventBusView.READ_EVENTS )) - assert await EventBusView.get_permission(request) == UserAccess.Read + assert await EventBusView.get_permission(request) == UserAccess.READ def test_routes() -> None: @@ -116,11 +116,11 @@ def test_topics() -> None: must parse event filters """ request = pytest.helpers.request("", "", "GET", params=MultiDict([ - ("event", EventType.PackageUpdated), - ("event", EventType.PackageRemoved), + ("event", EventType.PACKAGE_UPDATED), + ("event", EventType.PACKAGE_REMOVED), ])) - assert EventBusView(request)._topics() == [EventType.PackageUpdated, EventType.PackageRemoved] + assert EventBusView(request)._topics() == [EventType.PACKAGE_UPDATED, EventType.PACKAGE_REMOVED] def test_topics_empty() -> None: @@ -146,7 +146,7 @@ async def test_get(client: TestClient, package_ahriman: Package) -> None: """ must stream events via SSE """ - watcher = next(iter(client.app[WatcherKey].values())) + watcher = next(iter(client.app[WATCHER_KEY].values())) asyncio.create_task(_producer(watcher, package_ahriman)) request_schema = pytest.helpers.schema_request(EventBusView.get, location="querystring") # no content validation here because it is a streaming response @@ -156,7 +156,7 @@ async def test_get(client: TestClient, package_ahriman: Package) -> None: assert response.status == 200 body = await response.text() - assert EventType.PackageUpdated in body + assert EventType.PACKAGE_UPDATED in body assert "ahriman" in body @@ -164,25 +164,25 @@ async def test_get_with_topic_filter(client: TestClient, package_ahriman: Packag """ must filter events by topic """ - watcher = next(iter(client.app[WatcherKey].values())) + watcher = next(iter(client.app[WATCHER_KEY].values())) asyncio.create_task(_producer(watcher, package_ahriman)) request_schema = pytest.helpers.schema_request(EventBusView.get, location="querystring") - payload = {"event": [EventType.PackageUpdated]} + payload = {"event": [EventType.PACKAGE_UPDATED]} assert not request_schema.validate(payload) response = await client.get("/api/v1/events/stream", params=payload) assert response.status == 200 body = await response.text() - assert EventType.PackageUpdated in body - assert EventType.PackageRemoved not in body + assert EventType.PACKAGE_UPDATED in body + assert EventType.PACKAGE_REMOVED not in body async def test_get_with_object_id_filter(client: TestClient, package_ahriman: Package) -> None: """ must filter events by object_id """ - watcher = next(iter(client.app[WatcherKey].values())) + watcher = next(iter(client.app[WATCHER_KEY].values())) asyncio.create_task(_producer(watcher, package_ahriman)) request_schema = pytest.helpers.schema_request(EventBusView.get, location="querystring") @@ -230,7 +230,7 @@ async def test_head(client: TestClient) -> None: """ must check stream availability without opening SSE stream """ - response = await client.head("/api/v1/events/stream", params={"event": EventType.PackageUpdated}) + response = await client.head("/api/v1/events/stream", params={"event": EventType.PACKAGE_UPDATED}) assert response.status == 200 assert response.headers["Content-Type"] == "text/event-stream" assert not await response.text() diff --git a/ahriman-web/tests/ahriman/web/views/v1/auditlog/test_view_v1_auditlog_events.py b/ahriman-web/tests/ahriman/web/views/v1/auditlog/test_view_v1_auditlog_events.py index ee6b0f3a..026ea3fa 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/auditlog/test_view_v1_auditlog_events.py +++ b/ahriman-web/tests/ahriman/web/views/v1/auditlog/test_view_v1_auditlog_events.py @@ -13,7 +13,7 @@ async def test_get_permission() -> None: """ for method in ("GET", "POST"): request = pytest.helpers.request("", "", method) - assert await EventsView.get_permission(request) == UserAccess.Full + assert await EventsView.get_permission(request) == UserAccess.FULL def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/v1/distributed/test_view_v1_distributed_workers.py b/ahriman-web/tests/ahriman/web/views/v1/distributed/test_view_v1_distributed_workers.py index 5365f212..7f56d345 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/distributed/test_view_v1_distributed_workers.py +++ b/ahriman-web/tests/ahriman/web/views/v1/distributed/test_view_v1_distributed_workers.py @@ -13,7 +13,7 @@ async def test_get_permission() -> None: """ for method in ("DELETE", "GET", "POST"): request = pytest.helpers.request("", "", method) - assert await WorkersView.get_permission(request) == UserAccess.Full + assert await WorkersView.get_permission(request) == UserAccess.FULL def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_archives.py b/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_archives.py index fa7f6b62..655cd65c 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_archives.py +++ b/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_archives.py @@ -15,7 +15,7 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await Archives.get_permission(request) == UserAccess.Reporter + assert await Archives.get_permission(request) == UserAccess.REPORTER def test_routes() -> None: @@ -30,7 +30,7 @@ async def test_get(client: TestClient, package_ahriman: Package, mocker: MockerF must get archives for package """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) mocker.patch("ahriman.core.status.watcher.Watcher.package_archives", return_value=[package_ahriman]) response_schema = pytest.helpers.schema_response(Archives.get) diff --git a/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_changes.py b/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_changes.py index f747e172..92f740cf 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_changes.py +++ b/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_changes.py @@ -15,10 +15,10 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await ChangesView.get_permission(request) == UserAccess.Reporter + assert await ChangesView.get_permission(request) == UserAccess.REPORTER for method in ("POST",): request = pytest.helpers.request("", "", method) - assert await ChangesView.get_permission(request) == UserAccess.Full + assert await ChangesView.get_permission(request) == UserAccess.FULL def test_routes() -> None: @@ -34,7 +34,7 @@ async def test_get(client: TestClient, package_ahriman: Package) -> None: """ changes = Changes("sha", "change") await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) await client.post(f"/api/v1/packages/{package_ahriman.base}/changes", json=changes.view()) response_schema = pytest.helpers.schema_response(ChangesView.get) @@ -61,7 +61,7 @@ async def test_post(client: TestClient, package_ahriman: Package) -> None: must update package changes """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) request_schema = pytest.helpers.schema_request(ChangesView.post) changes = Changes("sha", "change") diff --git a/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_dependencies.py b/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_dependencies.py index ffa1e913..1f56589f 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_dependencies.py +++ b/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_dependencies.py @@ -15,10 +15,10 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await DependenciesView.get_permission(request) == UserAccess.Reporter + assert await DependenciesView.get_permission(request) == UserAccess.REPORTER for method in ("POST",): request = pytest.helpers.request("", "", method) - assert await DependenciesView.get_permission(request) == UserAccess.Full + assert await DependenciesView.get_permission(request) == UserAccess.FULL def test_routes() -> None: @@ -34,7 +34,7 @@ async def test_get(client: TestClient, package_ahriman: Package) -> None: """ dependency = Dependencies({"path": ["package"]}) await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) await client.post(f"/api/v1/packages/{package_ahriman.base}/dependencies", json=dependency.view()) response_schema = pytest.helpers.schema_response(DependenciesView.get) @@ -62,7 +62,7 @@ async def test_post(client: TestClient, package_ahriman: Package) -> None: must create dependencies """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) request_schema = pytest.helpers.schema_request(DependenciesView.post) payload = {"paths": {"path": ["package"]}} diff --git a/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_hold.py b/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_hold.py index 96cc3dd0..760d4966 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_hold.py +++ b/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_hold.py @@ -14,7 +14,7 @@ async def test_get_permission() -> None: """ for method in ("POST",): request = pytest.helpers.request("", "", method) - assert await HoldView.get_permission(request) == UserAccess.Full + assert await HoldView.get_permission(request) == UserAccess.FULL def test_routes() -> None: @@ -29,7 +29,7 @@ async def test_post(client: TestClient, package_ahriman: Package) -> None: must update package hold status """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) request_schema = pytest.helpers.schema_request(HoldView.post) payload = {"is_held": True} diff --git a/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_logs.py b/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_logs.py index 04c50f58..d66e7e11 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_logs.py +++ b/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_logs.py @@ -14,10 +14,10 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await LogsView.get_permission(request) == UserAccess.Reporter + assert await LogsView.get_permission(request) == UserAccess.REPORTER for method in ("DELETE", "POST"): request = pytest.helpers.request("", "", method) - assert await LogsView.get_permission(request) == UserAccess.Full + assert await LogsView.get_permission(request) == UserAccess.FULL def test_routes() -> None: @@ -32,9 +32,9 @@ async def test_delete(client: TestClient, package_ahriman: Package, package_pyth must delete logs for package """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) await client.post(f"/api/v1/packages/{package_python_schedule.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_python_schedule.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_python_schedule.view()}) await client.post(f"/api/v1/packages/{package_ahriman.base}/logs", json={"created": 42.0, "message": "message 1", "version": "42"}) @@ -70,7 +70,7 @@ async def test_get(client: TestClient, package_ahriman: Package) -> None: must get logs for package """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) await client.post(f"/api/v1/packages/{package_ahriman.base}/logs", json={"created": 42.0, "message": "message", "version": "42"}) response_schema = pytest.helpers.schema_response(LogsView.get) @@ -99,7 +99,7 @@ async def test_post(client: TestClient, package_ahriman: Package) -> None: must create logs record """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) request_schema = pytest.helpers.schema_request(LogsView.post) payload = {"created": 42.0, "message": "message", "version": "42"} diff --git a/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_package.py b/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_package.py index dd8dee4d..21cfca1f 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_package.py +++ b/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_package.py @@ -15,10 +15,10 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await PackageView.get_permission(request) == UserAccess.Read + assert await PackageView.get_permission(request) == UserAccess.READ for method in ("DELETE", "POST"): request = pytest.helpers.request("", "", method) - assert await PackageView.get_permission(request) == UserAccess.Full + assert await PackageView.get_permission(request) == UserAccess.FULL def test_routes() -> None: @@ -33,9 +33,9 @@ async def test_delete(client: TestClient, package_ahriman: Package, package_pyth must delete single base """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) await client.post(f"/api/v1/packages/{package_python_schedule.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_python_schedule.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_python_schedule.view()}) response = await client.delete(f"/api/v1/packages/{package_ahriman.base}") assert response.status == 204 @@ -52,7 +52,7 @@ async def test_delete_unknown(client: TestClient, package_ahriman: Package, pack must suppress errors on unknown package deletion """ await client.post(f"/api/v1/packages/{package_python_schedule.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_python_schedule.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_python_schedule.view()}) response = await client.delete(f"/api/v1/packages/{package_ahriman.base}") assert response.status == 204 @@ -69,9 +69,9 @@ async def test_get(client: TestClient, package_ahriman: Package, package_python_ must return status for specific package """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) await client.post(f"/api/v1/packages/{package_python_schedule.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_python_schedule.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_python_schedule.view()}) response_schema = pytest.helpers.schema_response(PackageView.get) response = await client.get(f"/api/v1/packages/{package_ahriman.base}") @@ -102,7 +102,7 @@ async def test_post(client: TestClient, package_ahriman: Package, repository_id: request_schema = pytest.helpers.schema_request(PackageView.post) payload = { - "status": BuildStatusEnum.Success.value, + "status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view(), "repository": repository_id.view(), } @@ -132,7 +132,7 @@ async def test_post_light(client: TestClient, package_ahriman: Package, reposito request_schema = pytest.helpers.schema_request(PackageView.post) payload = { - "status": BuildStatusEnum.Success.value, + "status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view(), "repository": repository_id.view(), } @@ -141,7 +141,7 @@ async def test_post_light(client: TestClient, package_ahriman: Package, reposito assert response.status == 204 payload = { - "status": BuildStatusEnum.Success.value, + "status": BuildStatusEnum.SUCCESS.value, "repository": repository_id.view(), } assert not request_schema.validate(payload) @@ -154,7 +154,7 @@ async def test_post_light(client: TestClient, package_ahriman: Package, reposito Package.from_json(item["package"]).base: BuildStatus.from_json(item["status"]) for item in await response.json() } - assert statuses[package_ahriman.base].status == BuildStatusEnum.Success + assert statuses[package_ahriman.base].status == BuildStatusEnum.SUCCESS async def test_post_not_found(client: TestClient, package_ahriman: Package, repository_id: RepositoryId) -> None: @@ -165,7 +165,7 @@ async def test_post_not_found(client: TestClient, package_ahriman: Package, repo response_schema = pytest.helpers.schema_response(PackageView.post, code=400) payload = { - "status": BuildStatusEnum.Success.value, + "status": BuildStatusEnum.SUCCESS.value, "repository": repository_id.view(), } assert not request_schema.validate(payload) diff --git a/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_packages.py b/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_packages.py index 7242c65e..c7f52001 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_packages.py +++ b/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_packages.py @@ -15,10 +15,10 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await PackagesView.get_permission(request) == UserAccess.Read + assert await PackagesView.get_permission(request) == UserAccess.READ for method in ("POST",): request = pytest.helpers.request("", "", method) - assert await PackagesView.get_permission(request) == UserAccess.Full + assert await PackagesView.get_permission(request) == UserAccess.FULL def test_routes() -> None: @@ -33,9 +33,9 @@ async def test_get(client: TestClient, package_ahriman: Package, package_python_ must return status for all packages """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) await client.post(f"/api/v1/packages/{package_python_schedule.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_python_schedule.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_python_schedule.view()}) response_schema = pytest.helpers.schema_response(PackagesView.get) response = await client.get("/api/v1/packages") @@ -54,9 +54,9 @@ async def test_get_with_pagination(client: TestClient, package_ahriman: Package, must return paginated status for packages """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) await client.post(f"/api/v1/packages/{package_python_schedule.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_python_schedule.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_python_schedule.view()}) request_schema = pytest.helpers.schema_request(PackagesView.get, location="querystring") response_schema = pytest.helpers.schema_response(PackagesView.get) diff --git a/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_patch.py b/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_patch.py index 90805bd6..2cc84c85 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_patch.py +++ b/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_patch.py @@ -15,10 +15,10 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await PatchView.get_permission(request) == UserAccess.Reporter + assert await PatchView.get_permission(request) == UserAccess.REPORTER for method in ("DELETE",): request = pytest.helpers.request("", "", method) - assert await PatchView.get_permission(request) == UserAccess.Full + assert await PatchView.get_permission(request) == UserAccess.FULL def test_routes() -> None: @@ -33,9 +33,9 @@ async def test_delete(client: TestClient, package_ahriman: Package, package_pyth must delete patch for package """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) await client.post(f"/api/v1/packages/{package_python_schedule.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_python_schedule.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_python_schedule.view()}) patch_key = "k" await client.post(f"/api/v1/packages/{package_ahriman.base}/patches", json={"key": patch_key, "value": "v"}) @@ -58,7 +58,7 @@ async def test_get(client: TestClient, package_ahriman: Package) -> None: """ patch = PkgbuildPatch("k", "v") await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) await client.post(f"/api/v1/packages/{package_ahriman.base}/patches", json=patch.view()) response_schema = pytest.helpers.schema_response(PatchView.get) @@ -75,7 +75,7 @@ async def test_get_patch_not_found(client: TestClient, package_ahriman: Package) must return not found for missing patch """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) response_schema = pytest.helpers.schema_response(PatchView.get, code=404) response = await client.get(f"/api/v1/packages/{package_ahriman.base}/patches/random") diff --git a/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_patches.py b/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_patches.py index efaeb06e..4d45f394 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_patches.py +++ b/ahriman-web/tests/ahriman/web/views/v1/packages/test_view_v1_packages_patches.py @@ -15,10 +15,10 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await PatchesView.get_permission(request) == UserAccess.Reporter + assert await PatchesView.get_permission(request) == UserAccess.REPORTER for method in ("POST",): request = pytest.helpers.request("", "", method) - assert await PatchesView.get_permission(request) == UserAccess.Full + assert await PatchesView.get_permission(request) == UserAccess.FULL def test_routes() -> None: @@ -34,7 +34,7 @@ async def test_get(client: TestClient, package_ahriman: Package) -> None: """ patch = PkgbuildPatch("k", "v") await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) await client.post(f"/api/v1/packages/{package_ahriman.base}/patches", json=patch.view()) response_schema = pytest.helpers.schema_response(PatchesView.get) @@ -51,7 +51,7 @@ async def test_post(client: TestClient, package_ahriman: Package) -> None: must create patch """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) request_schema = pytest.helpers.schema_request(PatchesView.post) payload = {"key": "k", "value": "v"} @@ -69,7 +69,7 @@ async def test_post_full_diff(client: TestClient, package_ahriman: Package) -> N must create patch from full diff """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) request_schema = pytest.helpers.schema_request(PatchesView.post) payload = {"value": "v"} @@ -87,7 +87,7 @@ async def test_post_array(client: TestClient, package_ahriman: Package) -> None: must create patch from list variable """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) request_schema = pytest.helpers.schema_request(PatchesView.post) payload = {"key": "k", "value": "(array value)"} diff --git a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_add.py b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_add.py index f80b8bab..ad10d3c1 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_add.py +++ b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_add.py @@ -16,7 +16,7 @@ async def test_get_permission() -> None: """ for method in ("POST",): request = pytest.helpers.request("", "", method) - assert await AddView.get_permission(request) == UserAccess.Full + assert await AddView.get_permission(request) == UserAccess.FULL def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_config.py b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_config.py index 008dbd99..da97a69f 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_config.py +++ b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_config.py @@ -14,10 +14,10 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await ConfigView.get_permission(request) == UserAccess.Full + assert await ConfigView.get_permission(request) == UserAccess.FULL for method in ("POST",): request = pytest.helpers.request("", "", method) - assert await ConfigView.get_permission(request) == UserAccess.Full + assert await ConfigView.get_permission(request) == UserAccess.FULL def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_logs.py b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_logs.py index 60648365..3ce95303 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_logs.py +++ b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_logs.py @@ -14,7 +14,7 @@ async def test_get_permission() -> None: """ for method in ("DELETE",): request = pytest.helpers.request("", "", method) - assert await LogsView.get_permission(request) == UserAccess.Full + assert await LogsView.get_permission(request) == UserAccess.FULL def test_routes() -> None: @@ -29,7 +29,7 @@ async def test_delete(client: TestClient, package_ahriman: Package) -> None: must delete all logs """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) await client.post(f"/api/v1/packages/{package_ahriman.base}/logs", json={"created": 42.0, "message": "message 1", "version": "42"}) await client.post(f"/api/v1/packages/{package_ahriman.base}/logs", @@ -48,7 +48,7 @@ async def test_delete_partially(client: TestClient, package_ahriman: Package) -> must delete logs based on count input """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) await client.post(f"/api/v1/packages/{package_ahriman.base}/logs", json={"created": 42.0, "message": "message 1", "version": "42"}) await client.post(f"/api/v1/packages/{package_ahriman.base}/logs", diff --git a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_pgp.py b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_pgp.py index a10de795..7b825965 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_pgp.py +++ b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_pgp.py @@ -13,10 +13,10 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await PGPView.get_permission(request) == UserAccess.Reporter + assert await PGPView.get_permission(request) == UserAccess.REPORTER for method in ("POST",): request = pytest.helpers.request("", "", method) - assert await PGPView.get_permission(request) == UserAccess.Full + assert await PGPView.get_permission(request) == UserAccess.FULL def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_process.py b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_process.py index 339972e2..6c8cd003 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_process.py +++ b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_process.py @@ -13,7 +13,7 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await ProcessView.get_permission(request) == UserAccess.Reporter + assert await ProcessView.get_permission(request) == UserAccess.REPORTER def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_rebuild.py b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_rebuild.py index fbe74b13..561b5833 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_rebuild.py +++ b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_rebuild.py @@ -15,7 +15,7 @@ async def test_get_permission() -> None: """ for method in ("POST",): request = pytest.helpers.request("", "", method) - assert await RebuildView.get_permission(request) == UserAccess.Full + assert await RebuildView.get_permission(request) == UserAccess.FULL def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_remove.py b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_remove.py index 3e823c9f..78049065 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_remove.py +++ b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_remove.py @@ -14,7 +14,7 @@ async def test_get_permission() -> None: """ for method in ("POST",): request = pytest.helpers.request("", "", method) - assert await RemoveView.get_permission(request) == UserAccess.Full + assert await RemoveView.get_permission(request) == UserAccess.FULL def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_request.py b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_request.py index 5cc9b789..7f3878e9 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_request.py +++ b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_request.py @@ -16,7 +16,7 @@ async def test_get_permission() -> None: """ for method in ("POST",): request = pytest.helpers.request("", "", method) - assert await RequestView.get_permission(request) == UserAccess.Reporter + assert await RequestView.get_permission(request) == UserAccess.REPORTER def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_rollback.py b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_rollback.py index d6d9156d..5f602892 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_rollback.py +++ b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_rollback.py @@ -15,7 +15,7 @@ async def test_get_permission() -> None: """ for method in ("POST",): request = pytest.helpers.request("", "", method) - assert await RollbackView.get_permission(request) == UserAccess.Full + assert await RollbackView.get_permission(request) == UserAccess.FULL def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_search.py b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_search.py index 23b9d0c5..b52fd81a 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_search.py +++ b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_search.py @@ -14,7 +14,7 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await SearchView.get_permission(request) == UserAccess.Reporter + assert await SearchView.get_permission(request) == UserAccess.REPORTER def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_update.py b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_update.py index 56121190..9ecb7240 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_update.py +++ b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_update.py @@ -15,7 +15,7 @@ async def test_get_permission() -> None: """ for method in ("POST",): request = pytest.helpers.request("", "", method) - assert await UpdateView.get_permission(request) == UserAccess.Full + assert await UpdateView.get_permission(request) == UserAccess.FULL def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_upload.py b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_upload.py index c8bef0f6..ca9a96de 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_upload.py +++ b/ahriman-web/tests/ahriman/web/views/v1/service/test_view_v1_service_upload.py @@ -20,7 +20,7 @@ async def test_get_permission() -> None: """ for method in ("POST",): request = pytest.helpers.request("", "", method) - assert await UploadView.get_permission(request) == UserAccess.Full + assert await UploadView.get_permission(request) == UserAccess.FULL def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/v1/status/test_view_v1_status_info.py b/ahriman-web/tests/ahriman/web/views/v1/status/test_view_v1_status_info.py index 14bc82b0..7335df9a 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/status/test_view_v1_status_info.py +++ b/ahriman-web/tests/ahriman/web/views/v1/status/test_view_v1_status_info.py @@ -14,7 +14,7 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await InfoView.get_permission(request) == UserAccess.Unauthorized + assert await InfoView.get_permission(request) == UserAccess.UNAUTHORIZED def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/v1/status/test_view_v1_status_metrics.py b/ahriman-web/tests/ahriman/web/views/v1/status/test_view_v1_status_metrics.py index c2870cc6..b40fc965 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/status/test_view_v1_status_metrics.py +++ b/ahriman-web/tests/ahriman/web/views/v1/status/test_view_v1_status_metrics.py @@ -16,7 +16,7 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await MetricsView.get_permission(request) == UserAccess.Unauthorized + assert await MetricsView.get_permission(request) == UserAccess.UNAUTHORIZED def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/v1/status/test_view_v1_status_repositories.py b/ahriman-web/tests/ahriman/web/views/v1/status/test_view_v1_status_repositories.py index 62ec0628..e750797d 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/status/test_view_v1_status_repositories.py +++ b/ahriman-web/tests/ahriman/web/views/v1/status/test_view_v1_status_repositories.py @@ -13,7 +13,7 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await RepositoriesView.get_permission(request) == UserAccess.Read + assert await RepositoriesView.get_permission(request) == UserAccess.READ def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/v1/status/test_view_v1_status_status.py b/ahriman-web/tests/ahriman/web/views/v1/status/test_view_v1_status_status.py index e584e5ab..54476370 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/status/test_view_v1_status_status.py +++ b/ahriman-web/tests/ahriman/web/views/v1/status/test_view_v1_status_status.py @@ -17,10 +17,10 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await StatusView.get_permission(request) == UserAccess.Read + assert await StatusView.get_permission(request) == UserAccess.READ for method in ("POST",): request = pytest.helpers.request("", "", method) - assert await StatusView.get_permission(request) == UserAccess.Full + assert await StatusView.get_permission(request) == UserAccess.FULL def test_routes() -> None: @@ -35,7 +35,7 @@ async def test_get(client: TestClient, package_ahriman: Package) -> None: must generate web service status correctly """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) response_schema = pytest.helpers.schema_response(StatusView.get) response = await client.get("/api/v1/status") @@ -54,7 +54,7 @@ async def test_post(client: TestClient) -> None: """ request_schema = pytest.helpers.schema_request(StatusView.post) - payload = {"status": BuildStatusEnum.Success.value} + payload = {"status": BuildStatusEnum.SUCCESS.value} assert not request_schema.validate(payload) post_response = await client.post("/api/v1/status", json=payload) assert post_response.status == 204 @@ -63,7 +63,7 @@ async def test_post(client: TestClient) -> None: status = InternalStatus.from_json(await response.json()) assert response.ok - assert status.status.status == BuildStatusEnum.Success + assert status.status.status == BuildStatusEnum.SUCCESS async def test_post_exception(client: TestClient) -> None: @@ -81,7 +81,7 @@ async def test_post_exception_inside(client: TestClient, mocker: MockerFixture) """ exception handler must handle 500 errors """ - payload = {"status": BuildStatusEnum.Success.value} + payload = {"status": BuildStatusEnum.SUCCESS.value} mocker.patch("ahriman.core.status.watcher.Watcher.status_update", side_effect=Exception) response_schema = pytest.helpers.schema_response(StatusView.post, code=500) diff --git a/ahriman-web/tests/ahriman/web/views/v1/user/test_view_v1_user_login.py b/ahriman-web/tests/ahriman/web/views/v1/user/test_view_v1_user_login.py index d64dd02d..89821ad3 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/user/test_view_v1_user_login.py +++ b/ahriman-web/tests/ahriman/web/views/v1/user/test_view_v1_user_login.py @@ -5,7 +5,7 @@ from pytest_mock import MockerFixture from ahriman.models.user import User from ahriman.models.user_access import UserAccess -from ahriman.web.keys import AuthKey +from ahriman.web.keys import AUTH_KEY from ahriman.web.views.v1.user.login import LoginView @@ -15,7 +15,7 @@ async def test_get_permission() -> None: """ for method in ("GET", "POST"): request = pytest.helpers.request("", "", method) - assert await LoginView.get_permission(request) == UserAccess.Unauthorized + assert await LoginView.get_permission(request) == UserAccess.UNAUTHORIZED def test_routes() -> None: @@ -46,7 +46,7 @@ async def test_get_redirect_to_oauth(client_with_oauth_auth: TestClient) -> None """ must redirect to OAuth service provider in case if no code is supplied """ - oauth = client_with_oauth_auth.app[AuthKey] + oauth = client_with_oauth_auth.app[AUTH_KEY] oauth.get_oauth_url.return_value = "http://localhost" request_schema = pytest.helpers.schema_request(LoginView.get, location="querystring") @@ -61,7 +61,7 @@ async def test_get_redirect_to_oauth_empty_code(client_with_oauth_auth: TestClie """ must redirect to OAuth service provider in case if empty code is supplied """ - oauth = client_with_oauth_auth.app[AuthKey] + oauth = client_with_oauth_auth.app[AUTH_KEY] oauth.get_oauth_url.return_value = "http://localhost" request_schema = pytest.helpers.schema_request(LoginView.get, location="querystring") @@ -78,7 +78,7 @@ async def test_get(client_with_oauth_auth: TestClient, mocker: MockerFixture) -> """ session = {"state": "state"} mocker.patch("ahriman.web.views.v1.user.login.get_session", return_value=session) - oauth = client_with_oauth_auth.app[AuthKey] + oauth = client_with_oauth_auth.app[AUTH_KEY] oauth.get_oauth_username.return_value = "user" oauth.known_username.return_value = True oauth.enabled = False # lol @@ -101,7 +101,7 @@ async def test_get_unauthorized(client_with_oauth_auth: TestClient, mocker: Mock """ must return unauthorized from OAuth """ - oauth = client_with_oauth_auth.app[AuthKey] + oauth = client_with_oauth_auth.app[AUTH_KEY] oauth.known_username.return_value = False oauth.max_age = 60 remember_mock = mocker.patch("ahriman.web.views.v1.user.login.remember") diff --git a/ahriman-web/tests/ahriman/web/views/v1/user/test_view_v1_user_logout.py b/ahriman-web/tests/ahriman/web/views/v1/user/test_view_v1_user_logout.py index fe4ec1a3..6e0dc748 100644 --- a/ahriman-web/tests/ahriman/web/views/v1/user/test_view_v1_user_logout.py +++ b/ahriman-web/tests/ahriman/web/views/v1/user/test_view_v1_user_logout.py @@ -14,7 +14,7 @@ async def test_get_permission() -> None: """ for method in ("POST",): request = pytest.helpers.request("", "", method) - assert await LogoutView.get_permission(request) == UserAccess.Unauthorized + assert await LogoutView.get_permission(request) == UserAccess.UNAUTHORIZED def test_routes() -> None: diff --git a/ahriman-web/tests/ahriman/web/views/v2/packages/test_view_v2_packages_logs.py b/ahriman-web/tests/ahriman/web/views/v2/packages/test_view_v2_packages_logs.py index c1b8b14c..06b35d9b 100644 --- a/ahriman-web/tests/ahriman/web/views/v2/packages/test_view_v2_packages_logs.py +++ b/ahriman-web/tests/ahriman/web/views/v2/packages/test_view_v2_packages_logs.py @@ -15,7 +15,7 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await LogsView.get_permission(request) == UserAccess.Reporter + assert await LogsView.get_permission(request) == UserAccess.REPORTER def test_routes() -> None: @@ -30,7 +30,7 @@ async def test_get(client: TestClient, package_ahriman: Package) -> None: must get logs for package """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) await client.post(f"/api/v1/packages/{package_ahriman.base}/logs", json={"created": 42.0, "message": "message 1", "version": "42"}) await client.post(f"/api/v1/packages/{package_ahriman.base}/logs", @@ -66,7 +66,7 @@ async def test_get_with_pagination(client: TestClient, package_ahriman: Package) must get logs with pagination """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) await client.post(f"/api/v1/packages/{package_ahriman.base}/logs", json={"created": 42.0, "message": "message 1", "version": "42"}) await client.post(f"/api/v1/packages/{package_ahriman.base}/logs", @@ -91,7 +91,7 @@ async def test_get_with_filter(client: TestClient, package_ahriman: Package) -> must get logs with filter by version and process identifier """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) await client.post(f"/api/v1/packages/{package_ahriman.base}/logs", json={"created": 42.0, "message": "message 1", "version": "42"}) await client.post(f"/api/v1/packages/{package_ahriman.base}/logs", @@ -116,7 +116,7 @@ async def test_get_bad_request(client: TestClient, package_ahriman: Package) -> must return bad request for invalid query parameters """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) await client.post(f"/api/v1/packages/{package_ahriman.base}/logs", json={"created": 42.0, "message": "message", "version": "42"}) response_schema = pytest.helpers.schema_response(LogsView.get, code=400) @@ -146,7 +146,7 @@ async def test_get_head(client: TestClient, package_ahriman: Package) -> None: must return only versions if head parameter is set """ await client.post(f"/api/v1/packages/{package_ahriman.base}", - json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()}) + json={"status": BuildStatusEnum.SUCCESS.value, "package": package_ahriman.view()}) await client.post(f"/api/v1/packages/{package_ahriman.base}/logs", json={"created": 42.0, "message": "message 1", "version": "42"}) await client.post(f"/api/v1/packages/{package_ahriman.base}/logs", diff --git a/ahriman-web/tests/ahriman/web/views/v2/status/test_view_v2_status_info.py b/ahriman-web/tests/ahriman/web/views/v2/status/test_view_v2_status_info.py index b77ed5e5..a12f6e7a 100644 --- a/ahriman-web/tests/ahriman/web/views/v2/status/test_view_v2_status_info.py +++ b/ahriman-web/tests/ahriman/web/views/v2/status/test_view_v2_status_info.py @@ -14,7 +14,7 @@ async def test_get_permission() -> None: """ for method in ("GET",): request = pytest.helpers.request("", "", method) - assert await InfoView.get_permission(request) == UserAccess.Unauthorized + assert await InfoView.get_permission(request) == UserAccess.UNAUTHORIZED def test_routes() -> None: diff --git a/docs/advanced-usage/index.rst b/docs/advanced-usage/index.rst index 161c050f..86e11af4 100644 --- a/docs/advanced-usage/index.rst +++ b/docs/advanced-usage/index.rst @@ -36,7 +36,7 @@ Almost all actions are wrapped by ``ahriman.core.repository.Repository`` class from ahriman.models.pacman_synchronization import PacmanSynchronization repository = Repository(repository_id, configuration, database, - report=True, refresh_pacman_database=PacmanSynchronization.Disabled) + report=True, refresh_pacman_database=PacmanSynchronization.DISABLED) And the ``repository`` instance can be used to perform repository maintenance diff --git a/docs/advanced-usage/views.rst b/docs/advanced-usage/views.rst index c9f5f96b..705b04f5 100644 --- a/docs/advanced-usage/views.rst +++ b/docs/advanced-usage/views.rst @@ -28,13 +28,13 @@ In order to view to be added to the route list correctly, few more properties ar ROUTES = ["/api/v1/ping"] -In addition, it is also recommended to specify permission level for using this endpoint. Since this endpoint neither does anything nor returns sensitive information, it can be set to ``UserAccess.Unauthorized``: +In addition, it is also recommended to specify permission level for using this endpoint. Since this endpoint neither does anything nor returns sensitive information, it can be set to ``UserAccess.UNAUTHORIZED``: .. code-block:: python ... - GET_PERMISSION = UserAccess.Unauthorized + GET_PERMISSION = UserAccess.UNAUTHORIZED That's all. Just save the file as ``/usr/lib/python3.12/site-packages/ahriman/web/views/ping.py`` (replace ``python3.12`` with actual python version) and restart web server. diff --git a/tools/pylint_plugins/definition_order/__init__.py b/tools/pylint_plugins/definition_order/__init__.py index 6237fe9d..0e8c0ece 100644 --- a/tools/pylint_plugins/definition_order/__init__.py +++ b/tools/pylint_plugins/definition_order/__init__.py @@ -30,24 +30,24 @@ class MethodType(StrEnum): method type enumeration Attributes: - Class(MethodType): (class attribute) class method - Delete(MethodType): (class attribute) destructor-like methods - Init(MethodType): (class attribute) initialization method - Magic(MethodType): (class attribute) other magical methods - New(MethodType): (class attribute) constructor method - Normal(MethodType): (class attribute) usual method - Property(MethodType): (class attribute) property method - Static(MethodType): (class attribute) static method + CLASS(MethodType): (class attribute) class method + DELETE(MethodType): (class attribute) destructor-like methods + INIT(MethodType): (class attribute) initialization method + MAGIC(MethodType): (class attribute) other magical methods + NEW(MethodType): (class attribute) constructor method + NORMAL(MethodType): (class attribute) usual method + PROPERTY(MethodType): (class attribute) property method + STATIC(MethodType): (class attribute) static method """ - Class = "classmethod" - Delete = "del" - Init = "init" - Magic = "magic" - New = "new" - Normal = "regular" - Property = "property" - Static = "staticmethod" + CLASS = "classmethod" + DELETE = "del" + INIT = "init" + MAGIC = "magic" + NEW = "new" + NORMAL = "regular" + PROPERTY = "property" + STATIC = "staticmethod" class DefinitionOrder(BaseRawFileChecker): @@ -59,14 +59,14 @@ class DefinitionOrder(BaseRawFileChecker): """ DECORATED_METHODS_ORDER = { - "cached_property": MethodType.Property, - "classmethod": MethodType.Class, - "property": MethodType.Property, - "staticmethod": MethodType.Static, + "cached_property": MethodType.PROPERTY, + "classmethod": MethodType.CLASS, + "property": MethodType.PROPERTY, + "staticmethod": MethodType.STATIC, } msgs = { - "W6001": ( + "E5101": ( "Invalid method order %s, expected %s", "methods-out-of-order", "Methods are defined out of recommended order.", @@ -126,11 +126,11 @@ class DefinitionOrder(BaseRawFileChecker): """ # init methods if function.name in ("__init__", "__post_init__"): - return MethodType.Init + return MethodType.INIT if function.name in ("__new__",): - return MethodType.New + return MethodType.NEW if function.name in ("__del__",): - return MethodType.Delete + return MethodType.DELETE # decorated methods decorators = [] @@ -142,10 +142,10 @@ class DefinitionOrder(BaseRawFileChecker): # magic methods if function.name.startswith("__") and function.name.endswith("__"): - return MethodType.Magic + return MethodType.MAGIC # normal method - return MethodType.Normal + return MethodType.NORMAL def check_class(self, clazz: nodes.ClassDef) -> None: """ diff --git a/tools/pylint_plugins/import_order/__init__.py b/tools/pylint_plugins/import_order/__init__.py index 3abd78c6..34488971 100644 --- a/tools/pylint_plugins/import_order/__init__.py +++ b/tools/pylint_plugins/import_order/__init__.py @@ -33,15 +33,15 @@ class ImportType(StrEnum): Future(MethodTypeOrder): (class attribute) from __future__ import Package(MethodTypeOrder): (class attribute) package import PackageFrom(MethodTypeOrder): (class attribute) package import, from clause - System(ImportType): (class attribute) system installed packages + SYSTEM(ImportType): (class attribute) system installed packages SystemFrom(MethodTypeOrder): (class attribute) system installed packages, from clause """ - Future = "future" - Package = "package" - PackageFrom = "package-from" - System = "system" - SystemFrom = "system-from" + FUTURE = "future" + PACKAGE = "package" + PACKAGE_FROM = "package-from" + SYSTEM = "system" + SYSTEM_FROM = "system-from" class ImportOrder(BaseRawFileChecker): @@ -50,17 +50,17 @@ class ImportOrder(BaseRawFileChecker): """ msgs = { - "W6002": ( + "E5201": ( "Invalid import order %s, expected before %s", "imports-out-of-order", "Imports are defined out of recommended order.", ), - "W6003": ( + "E5202": ( "Import contains more than one package: %s", "multiple-package-imports", "Multiple package imports are not allowed.", ), - "W6004": ( + "E5203": ( "Invalid from import order %s, expected %s", "from-imports-out-of-order", "From imports are defined out of recommended order.", @@ -157,17 +157,17 @@ class ImportOrder(BaseRawFileChecker): match statement: case nodes.ImportFrom() if statement.modname == "__future__": import_name = statement.modname - import_type = ImportType.Future + import_type = ImportType.FUTURE case nodes.ImportFrom(): import_name = statement.modname root, *_ = import_name.split(".", maxsplit=1) - import_type = ImportType.PackageFrom if root_package == root else ImportType.SystemFrom + import_type = ImportType.PACKAGE_FROM if root_package == root else ImportType.SYSTEM_FROM # check from import itself self.check_from_imports(statement) case nodes.Import(): import_name = next(name for name, _ in statement.names) root, *_ = import_name.split(".", maxsplit=1) - import_type = ImportType.Package if root_package == root else ImportType.System + import_type = ImportType.PACKAGE if root_package == root else ImportType.SYSTEM # check import itself self.check_package_imports(statement) case _: diff --git a/tools/pytest_plugins/ahriman_fixtures/__init__.py b/tools/pytest_plugins/ahriman_fixtures/__init__.py index 102d3734..b339c2e8 100644 --- a/tools/pytest_plugins/ahriman_fixtures/__init__.py +++ b/tools/pytest_plugins/ahriman_fixtures/__init__.py @@ -101,7 +101,7 @@ def get_package_status(package: Package) -> dict[str, Any]: Returns: dict[str, Any]: simplified package status map (with only status and view) """ - return {"status": BuildStatusEnum.Unknown.value, "package": package.view()} + return {"status": BuildStatusEnum.UNKNOWN.value, "package": package.view()} def get_package_status_extended(package: Package) -> dict[str, Any]: @@ -552,7 +552,7 @@ def user() -> User: Returns: User: user descriptor instance """ - return User(username="user", password="pa55w0rd", access=UserAccess.Reporter, packager_id="packager", key="key") + return User(username="user", password="pa55w0rd", access=UserAccess.REPORTER, packager_id="packager", key="key") @pytest.fixture