From 711c6aff3e23e0507cd8cdfb7291cd2e0f9f9235 Mon Sep 17 00:00:00 2001 From: William Chu Date: Tue, 16 Jan 2024 11:12:50 +1100 Subject: [PATCH 01/10] chore: initial commit v2 --- django_pev/admin.py | 3 + django_pev/apps.py | 6 + django_pev/migrations/__init__.py | 0 django_pev/models.py | 3 + django_pev/templates/django_pev/base.html | 87 ++++ django_pev/templates/django_pev/index.html | 72 +++ .../templates/django_pev/indexes_view.html | 165 ++++++ .../templates/django_pev/maintenance.html | 49 ++ django_pev/templates/django_pev/space.html | 83 +++ django_pev/tests.py | 3 + django_pev/urls.py | 11 + django_pev/utils/__init__.py | 130 +++++ django_pev/utils/index_lookup.sql | 79 +++ django_pev/utils/indexes.py | 105 ++++ django_pev/utils/maintenance.py | 71 +++ django_pev/utils/space.py | 52 ++ django_pev/views.py | 52 ++ poetry.lock | 474 +++++++++--------- pyproject.toml | 1 + 19 files changed, 1207 insertions(+), 239 deletions(-) create mode 100644 django_pev/admin.py create mode 100644 django_pev/apps.py create mode 100644 django_pev/migrations/__init__.py create mode 100644 django_pev/models.py create mode 100644 django_pev/templates/django_pev/base.html create mode 100644 django_pev/templates/django_pev/index.html create mode 100644 django_pev/templates/django_pev/indexes_view.html create mode 100644 django_pev/templates/django_pev/maintenance.html create mode 100644 django_pev/templates/django_pev/space.html create mode 100644 django_pev/tests.py create mode 100755 django_pev/urls.py create mode 100644 django_pev/utils/__init__.py create mode 100644 django_pev/utils/index_lookup.sql create mode 100644 django_pev/utils/indexes.py create mode 100644 django_pev/utils/maintenance.py create mode 100644 django_pev/utils/space.py create mode 100644 django_pev/views.py diff --git a/django_pev/admin.py b/django_pev/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/django_pev/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/django_pev/apps.py b/django_pev/apps.py new file mode 100644 index 0000000..e67f559 --- /dev/null +++ b/django_pev/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class DjangoPevConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'django_pev' diff --git a/django_pev/migrations/__init__.py b/django_pev/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/django_pev/models.py b/django_pev/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/django_pev/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/django_pev/templates/django_pev/base.html b/django_pev/templates/django_pev/base.html new file mode 100644 index 0000000..a4054f1 --- /dev/null +++ b/django_pev/templates/django_pev/base.html @@ -0,0 +1,87 @@ + +{% load static %} + + + + + + CoreUI Free Bootstrap Admin Template + + + + + + + + +
+ + Django PEV + +
+ +
+ + +
+
+ {% block content %} +
+
+ {% block inner_content %} + {% endblock %} +
+
+ {% endblock %} +
+ +
+ {% comment %} End app-body {% endcomment %} +
+ + + + \ No newline at end of file diff --git a/django_pev/templates/django_pev/index.html b/django_pev/templates/django_pev/index.html new file mode 100644 index 0000000..b8c5858 --- /dev/null +++ b/django_pev/templates/django_pev/index.html @@ -0,0 +1,72 @@ +{% extends "django_pev/base.html" %} +{% block content %} +
+
+
+
+
+

Traffic

+
January - July 2022
+
+ +
+
+ +
+
+
+
+
+
Visits
+
29.703 Users (40%)
+
+
+
+
+
+
Unique
+
24.093 Users (20%)
+
+
+
+
+
+
Pageviews
+
78.706 Views (60%)
+
+
+
+
+
+
New Users
+
22.123 Users (80%)
+
+
+
+
+
+
Bounce Rate
+
40.15%
+
+
+
+
+
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/django_pev/templates/django_pev/indexes_view.html b/django_pev/templates/django_pev/indexes_view.html new file mode 100644 index 0000000..2eba302 --- /dev/null +++ b/django_pev/templates/django_pev/indexes_view.html @@ -0,0 +1,165 @@ +{% extends "django_pev/base.html" %} +{% block content %} +
+
+
+
+
+

Index Stats

+
+
+ +
+
+
+
Index Hit Rate
+
How often we are hitting index vs full table scan.
+
{{ total_index_hitrate |floatformat:2 }}%
+
+
+
+
+
+
+
Duplicated Indexes
+
{{ count_duplicated_indexes }} Indexes covered by other indexes
+
{{ total_duplicated_indexes_size | filesizeformat}} ({{percent_duplicated_indexes |floatformat:2}}%)
+
+
+
+
+
+
Unused Indexes
+
{{count_unused_indexes}} indexes not used enough to justify
+
{{total_unused_indexes_size |filesizeformat}} ({{percent_unused_indexes |floatformat:2}}%)
+
+
+
+
+
+
+ + +
+ +
+ + + + + + + + + + + + {% for row in duplicated_indexes %} + + + + + + + + {% endfor%} + +
NameColumnsSizeHit RateIndex Scans
{{ row.name }} + {% if row.is_unused %} + Unused + {% endif %} + {% if row.is_duplicated%} + Duplicated + {% endif %} +
+ + {{row.definition}} + +
+ Covered by: +
+ + {{row.covered_by.definition}} + + 		{{ row.columns_formatted }}{{ row.size_bytes | filesizeformat}}{{ row.hit_rate }}{{ row.index_scans }}
+
+
+ + + + + + + + + + + + {% for row in all_indexes %} + + + + + + + + {% endfor%} + +
NameColumnsSizeHit RateIndex Scans
{{ row.name }} + {% if row.is_unused %} + Unused + {% endif %} + {% if row.is_duplicated%} + Duplicated + {% endif %} + {{ row.columns_formatted }}{{ row.size_bytes | filesizeformat}}{{ row.hit_rate }}{{ row.index_scans }}
+
+
+ + +
+
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/django_pev/templates/django_pev/maintenance.html b/django_pev/templates/django_pev/maintenance.html new file mode 100644 index 0000000..9f012ac --- /dev/null +++ b/django_pev/templates/django_pev/maintenance.html @@ -0,0 +1,49 @@ +{% extends "django_pev/base.html" %} +{% block content %} +
+
+
+
+
+

Maintenance Stats

+
+
+ + + + + + + + + + + + + + + + {% for row in tables %} + + + + + + + + + + + + {% endfor%} + +
NameSchemaLast VacuumLast Auto VacuumLast AnalyzeLast Auto AnalyzeDead RowsLive RowsIndex Hit Rate
{{ row.name }} + {% if row.requires_index %}Requires Index {% endif %} + {{ row.schema }}{{ row.last_vacuum | timesince }}{{ row.last_autovacuum | timesince }}{{ row.last_analyze | timesince }}{{ row.last_autoanalyze | timesince }}{{ row.dead_rows }}{{ row.live_rows }}{{ row.index_hit_rate_formatted }}
+ +
+
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/django_pev/templates/django_pev/space.html b/django_pev/templates/django_pev/space.html new file mode 100644 index 0000000..50be380 --- /dev/null +++ b/django_pev/templates/django_pev/space.html @@ -0,0 +1,83 @@ +{% extends "django_pev/base.html" %} +{% block content %} +
+
+
+
+
+

Space Stats

+
    +
  • + Total database size: {{ database_size | filesizeformat}} +
    • +
  • + Total table size: {{ table_size | filesizeformat}} +
    • +
  • + Total indexes size: {{ indexes_size | filesizeformat}} +
    • +
+
+
+ + +
+ + +
+
+
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/django_pev/tests.py b/django_pev/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/django_pev/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/django_pev/urls.py b/django_pev/urls.py new file mode 100755 index 0000000..9d5c519 --- /dev/null +++ b/django_pev/urls.py @@ -0,0 +1,11 @@ +from django.contrib import admin +from django.urls import path + +from . import views + +urlpatterns = [ + path('', views.index, name="index"), + path('space', views.SpaceView.as_view(), name="space"), + path('maintenance', views.MaintenanceView.as_view(), name="maintenance"), + path('indexes', views.IndexesView.as_view(), name="indexes") +] diff --git a/django_pev/utils/__init__.py b/django_pev/utils/__init__.py new file mode 100644 index 0000000..5724866 --- /dev/null +++ b/django_pev/utils/__init__.py @@ -0,0 +1,130 @@ +import functools +import logging +import traceback +import webbrowser +from contextlib import contextmanager +from dataclasses import dataclass, field + +import sqlparse # type:ignore[import] +from django.core.signals import request_started +from django.db import connections, reset_queries + +from django_pev.dalibo import PevResponse, upload_sql_plan +from django_pev.exceptions import PevException + +logger = logging.Logger("django_pev") + + +@dataclass(frozen=True) +class Explain: + index: int + duration: float + sql: str + stack_trace: str + db_alias: str + + def __repr__(self) -> str: + return f"Explain(duration={self.duration} sql={self.sql[:20]})" + + def __str__(self) -> str: + return f"Explain(duration={self.duration} sql={self.sql[:20]})" + + @functools.cache # noqa + def visualize(self, upload_query: bool = False, analyze: bool = True, title: str = "") -> PevResponse: + """Uploads the query and plan to explain.dalibo + + By default we do not embed the SQL query unless `upload_query` is set to True. + + The PevResponse object can be used to delete the uploaded plan. + """ + with connections[self.db_alias].cursor() as cursor: + if analyze: + sql = f"EXPLAIN (ANALYZE, COSTS, VERBOSE, BUFFERS, FORMAT JSON) {self.sql}" + else: + sql = f"EXPLAIN (VERBOSE, FORMAT JSON) {self.sql}" + cursor.execute(sql) + plan = cursor.fetchone()[0] + response = upload_sql_plan(query=self.sql if upload_query else "", plan=plan, title=title) + logging.info(f"View Postgresql Explain @ {response.url}") + return response + + def visualize_in_browser(self, upload_query: bool = False, analyze: bool = True, title: str = "") -> PevResponse: + """Uploads the query and plan t oexplain.dalibo and then open in the browser""" + response = self.visualize(upload_query, analyze, title) + webbrowser.open(response.url) + return response + + def explain(self, analyze: bool = True) -> str: + with connections[self.db_alias].cursor() as cursor: + if analyze: + sql = f"EXPLAIN ANALYZE {self.sql}" + else: + sql = f"EXPLAIN {self.sql}" + cursor.execute(sql) + explain = cursor.fetchone()[0] + return explain + + +@dataclass +class ExplainSet: + queries: list[Explain] = field(default_factory=list) + + @property + def n_queries(self) -> int: + return len(self.queries) + + def __getitem__(self, index: int) -> Explain: + return self.queries[index] + + @property + def slowest(self) -> Explain: + if not self.queries: + raise PevException("Can not visualize results when there are no results.") + + return sorted(self.queries, key=lambda q: q.duration, reverse=True)[0] + + +@contextmanager +def explain( + db_alias: str = "default", + trace_limit: int = 10, +): + """Capture all queries within this context and returns an ExplainSet container. + + Captured queries contain timing information, a stack trace and allows for visualization + with explain.dalibo.com + + Usage: + >>> with explain() as queries: + >>> User.objects.count() + >>> result = queries.slowest.visualize(upload_query=True) + >>> result.delete() + >>> queries.slowest.explain() + """ + result = ExplainSet() + conn = connections[db_alias] + + force_debug_cursor = conn.force_debug_cursor + conn.force_debug_cursor = True + request_started.disconnect(reset_queries) + + logger.debug("Reseting queries") + reset_queries() + try: + yield result + finally: + conn.force_debug_cursor = force_debug_cursor + request_started.connect(reset_queries) + queries_after = conn.queries[:] + logger.debug(f"Captured {len(queries_after)} queries") + + for index, q in enumerate(queries_after): + result.queries.append( + Explain( + index=index, + duration=float(q["time"]), + sql=sqlparse.format(q["sql"], reindent=True, keyword_case="upper"), + stack_trace="".join(traceback.format_stack()[-trace_limit:-2]), + db_alias=db_alias, + ) + ) diff --git a/django_pev/utils/index_lookup.sql b/django_pev/utils/index_lookup.sql new file mode 100644 index 0000000..63b3cef --- /dev/null +++ b/django_pev/utils/index_lookup.sql @@ -0,0 +1,79 @@ +with index_columns as ( + select + n.nspname as schema, + t.relname as table, + i.relname as name, + array_agg(a.attname order by array_position(ix.indkey, a.attnum) ) as column_names + from + pg_catalog.pg_class t + join pg_catalog.pg_attribute a on t.oid = a.attrelid + join pg_catalog.pg_index ix on t.oid = ix.indrelid + join pg_catalog.pg_class i on a.attnum = any(ix.indkey) + and i.oid = ix.indexrelid + join pg_catalog.pg_namespace n on n.oid = t.relnamespace + where + t.relkind = 'r' + group by + 1,2,3 + order by + 1,2 +), +index_stats as ( + SELECT + ui.schemaname AS schema, + t.relname AS table, + ix.relname AS name, + regexp_replace(pg_get_indexdef(i.indexrelid), '.* USING ([^ ]*) \(.*', '\1') AS using, + indisunique AS unique, + indisprimary AS primary, + indisvalid AS valid, + indexprs::text, + indpred::text, + pg_get_indexdef(i.indexrelid) AS definition, + CASE WHEN pg_statio_user_indexes.idx_blks_hit + pg_statio_user_indexes.idx_blks_read = 0 THEN + 0 + ELSE + ROUND(1.0 * pg_statio_user_indexes.idx_blks_hit / (pg_statio_user_indexes.idx_blks_hit + pg_statio_user_indexes.idx_blks_read), 2) + END AS hit_rate, + idx_scan as index_scans, + pg_table_size(ix.oid) AS size_bytes + FROM + pg_index i + INNER JOIN + pg_class t ON t.oid = i.indrelid + INNER JOIN + pg_class ix ON ix.oid = i.indexrelid + LEFT JOIN + pg_stat_user_indexes ui ON ui.indexrelid = i.indexrelid + LEFT JOIN + pg_statio_user_indexes ON pg_statio_user_indexes.indexrelid = i.indexrelid + WHERE + ui.schemaname IS NOT NULL +) +select + index_columns.schema, + index_columns.table, + index_columns.name, + column_names, + index_stats.using, + index_stats.unique, + index_stats.primary, + index_stats.valid, + index_stats.indexprs, + index_stats.indpred, + index_stats.definition, + index_stats.hit_rate, + index_stats.index_scans, + index_stats.size_bytes, + null as covered_by +from + index_columns +join + index_stats on + ( index_columns.schema = index_stats.schema + and + index_columns.table = index_stats.table + and + index_columns.name = index_stats.name + ) + ; \ No newline at end of file diff --git a/django_pev/utils/indexes.py b/django_pev/utils/indexes.py new file mode 100644 index 0000000..e40686f --- /dev/null +++ b/django_pev/utils/indexes.py @@ -0,0 +1,105 @@ +import dataclasses +from decimal import Decimal +from itertools import groupby +from pathlib import Path + +from django.db import connection + + +@dataclasses.dataclass +class IndexInfo: + schema: str + table: str + name: str + columns: list[str] + using: str + unique: bool + primary: bool + valid: bool + indexprs: str | None + indpred: str | None + definition: str + hit_rate: Decimal + index_scans: int + size_bytes: int + covered_by: "IndexInfo | None" + + @property + def is_unused(self) -> bool: + return self.index_scans < 50 + + @property + def is_duplicated(self) -> bool: + return bool(self.covered_by) + + @property + def columns_formatted(self) -> str: + return ", ".join(self.columns) + + @property + def table_key(self) -> str: + return f"{self.schema}.{self.table}" + + def index_covers(self, columns: list[str]) -> bool: + """Returns true if this index covers the given columns""" + return self.columns[:len(columns)] == columns + +def get_indexes() -> list[IndexInfo]: + with connection.cursor() as cursor: + sql = (Path(__file__).parent / "index_lookup.sql").read_text() + cursor.execute(sql) + indexes = list(IndexInfo(*c) for c in cursor.fetchall()) + _update_indexes_with_duplicated_indexes(indexes) + return indexes + + +def get_total_index_hitrate() -> float: + """ Total hit rate with all indexes """ + with connection.cursor() as cursor: + cursor.execute(""" + SELECT + (sum(idx_blks_hit)) / nullif(sum(idx_blks_hit + idx_blks_read), 0) AS rate + FROM + pg_statio_user_indexes + """) + return cursor.fetchone()[0] + + +def _update_indexes_with_duplicated_indexes(indexes: list[IndexInfo] | None = None) -> None: + """Modifies a list of indexes a reference to the other index that covers it""" + indexes = indexes or get_indexes() + indexes_by_table = { + key: list(group) for key,group in groupby(indexes, lambda i: i.table_key) + } + for index in indexes: + if index.valid and not index.primary and not index.unique: + for other_index in indexes_by_table[index.table_key]: + if ( + other_index.valid \ + and other_index.name != index.name \ + and other_index.index_covers(index.columns) \ + and other_index.using == index.using \ + and other_index.indexprs == index.indexprs \ + and other_index.indpred == index.indpred + ): + index.covered_by = other_index + + +def get_index_stats(indexes: list[IndexInfo] | None = None) -> dict: + indexes = indexes or get_indexes() + + ret = { + "total_index_hitrate": get_total_index_hitrate() * 100, + "total_indexes_size": sum(i.size_bytes for i in indexes), + "total_duplicated_indexes_size": sum(i.size_bytes for i in indexes if i.is_duplicated), + "total_unused_indexes_size": sum(i.size_bytes for i in indexes if i.is_unused), + "count_indexes": len(indexes), + "count_duplicated_indexes": sum(1 for i in indexes if i.is_duplicated), + "count_unused_indexes": sum(1 for i in indexes if i.is_unused), + } + + ret["percent_duplicated_indexes"] = float(ret["total_duplicated_indexes_size"]) / ret["total_indexes_size"] * 100 # type:ignore + ret["percent_unused_indexes"] = float(ret["total_unused_indexes_size"]) / ret["total_indexes_size"] * 100 # type:ignore + + return ret + diff --git a/django_pev/utils/maintenance.py b/django_pev/utils/maintenance.py new file mode 100644 index 0000000..efbc9d4 --- /dev/null +++ b/django_pev/utils/maintenance.py @@ -0,0 +1,71 @@ +import dataclasses +from datetime import datetime + +from django.db import connection + + +def get_tables_missing_indexes() -> list[tuple[str, str, str, int]]: + with connection.cursor() as cursor: + sql = """ + SELECT + schemaname AS schema, + relname AS table, + FROM + pg_stat_user_tables + WHERE + idx_scan > 0 + AND (100 * idx_scan / (seq_scan + idx_scan)) < 95 + AND n_live_tup >= 10000 + ORDER BY + n_live_tup DESC, + relname ASC + """ + cursor.execute(sql) + return cursor.fetchall() + +@dataclasses.dataclass +class TableInfo: + schema: str + name: str + last_vacuum: datetime | None + last_autovacuum: datetime | None + last_analyze: datetime | None + last_autoanalyze: datetime | None + dead_rows: int + live_rows: int + idx_scan: int + seq_scan: int + + @property + def requires_index(self) -> bool: + return self.idx_scan > 0 and (100 * self.idx_scan / (self.seq_scan + self.idx_scan)) < 95 and self.live_rows >= 10000 + + @property + def index_hit_rate(self) -> float: + return self.idx_scan / (self.seq_scan + self.idx_scan) if self.idx_scan > 0 else 0 + + @property + def index_hit_rate_formatted(self) -> str: + return f"{self.index_hit_rate * 100:0.2f}%" if self.index_hit_rate else "" + +def get_maintenance_info() -> list[TableInfo]: + sql = """ + SELECT + schemaname AS schema, + relname AS name, + last_vacuum, + last_autovacuum, + last_analyze, + last_autoanalyze, + n_dead_tup AS dead_rows, + n_live_tup AS live_rows, + idx_scan, + seq_scan + FROM + pg_stat_user_tables + ORDER BY + 1, 2 + """ + with connection.cursor() as cursor: + cursor.execute(sql) + return [TableInfo(*row) for row in cursor.fetchall()] diff --git a/django_pev/utils/space.py b/django_pev/utils/space.py new file mode 100644 index 0000000..687b744 --- /dev/null +++ b/django_pev/utils/space.py @@ -0,0 +1,52 @@ +import dataclasses +from typing import Literal + +from django.db import connection + + +@dataclasses.dataclass +class RelationSpaceStat: + schema: str + name: str + type: Literal['table', 'index'] + size_bytes: int + row_estimate: int + +def get_database_size() -> int: + """Returns the size of the current database in bytes""" + with connection.cursor() as cursor: + cursor.execute(""" + SELECT pg_database_size(current_database()) as database_size + """) + return cursor.fetchone()[0] + + +def get_relation_sizes() -> list[RelationSpaceStat]: + with connection.cursor() as cursor: + cursor.execute(""" +SELECT + n.nspname AS schema, + c.relname AS name, + CASE WHEN c.relkind = 'r' THEN 'table' ELSE 'index' END AS type, + pg_table_size(c.oid) AS size_bytes, + (case WHEN reltuples < 0 THEN 0 else reltuples END)::int as row_estimate +FROM + pg_class c +LEFT JOIN + pg_namespace n ON n.oid = c.relnamespace +WHERE + n.nspname NOT IN ('pg_catalog', 'information_schema') + AND n.nspname !~ '^pg_toast' + AND c.relkind IN ('r', 'i') +ORDER BY + pg_table_size(c.oid) DESC, + 2 ASC +""") + return [RelationSpaceStat(*row) for row in cursor.fetchall()] + +def get_table_sizes() -> list[RelationSpaceStat]: + return [r for r in get_relation_sizes() if r.type == 'table'] + +def get_index_sizes() -> list[RelationSpaceStat]: + return [r for r in get_relation_sizes() if r.type == 'index'] + diff --git a/django_pev/views.py b/django_pev/views.py new file mode 100644 index 0000000..f0c5102 --- /dev/null +++ b/django_pev/views.py @@ -0,0 +1,52 @@ +from typing import Any + +from django.http import HttpResponse +from django.shortcuts import render +from django.views.generic import RedirectView, TemplateView + +from .utils import indexes, maintenance, space + +# Create your views here. + + +def index(request): + return render(request, "django_pev/index.html") + + +class SpaceView(TemplateView): + template_name = "django_pev/space.html" + + def get_context_data(self, **kwargs: Any) -> dict[str, Any]: + ctx = super().get_context_data(**kwargs) + + ctx['database_size'] = space.get_database_size() + ctx['tables'] = space.get_table_sizes() + # ctx['indexes'] = indexes.get_indexes() + ctx['indexes'] = space.get_index_sizes() + + ctx['indexes_size'] = sum(c.size_bytes for c in ctx['indexes']) + ctx['table_size'] = sum(c.size_bytes for c in ctx['tables']) + + return ctx + +class MaintenanceView(TemplateView): + template_name = "django_pev/maintenance.html" + + def get_context_data(self, **kwargs: Any) -> dict[str, Any]: + ctx = super().get_context_data(**kwargs) + + ctx['tables'] = maintenance.get_maintenance_info() + return ctx + +class IndexesView(TemplateView): + template_name = "django_pev/indexes_view.html" + + def get_context_data(self, **kwargs: Any) -> dict[str, Any]: + ctx = super().get_context_data(**kwargs) + all_indexes = indexes.get_indexes() + ctx['all_indexes'] = all_indexes + ctx['unused_indexes'] = sorted([i for i in all_indexes if i.is_unused], key=lambda i: i.size_bytes, reverse=True) + ctx['duplicated_indexes'] = sorted([i for i in all_indexes if i.is_duplicated], key=lambda i: i.size_bytes, reverse=True) + + ctx.update(indexes.get_index_stats()) + return ctx \ No newline at end of file diff --git a/poetry.lock b/poetry.lock index 50149b5..11c62cc 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,10 +1,15 @@ +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. + [[package]] name = "asgiref" version = "3.5.2" description = "ASGI specs, helper code, and adapters" -category = "main" optional = false python-versions = ">=3.7" +files = [ + {file = "asgiref-3.5.2-py3-none-any.whl", hash = "sha256:1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4"}, + {file = "asgiref-3.5.2.tar.gz", hash = "sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424"}, +] [package.dependencies] typing-extensions = {version = "*", markers = "python_version < \"3.8\""} @@ -16,9 +21,31 @@ tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"] name = "black" version = "22.10.0" description = "The uncompromising code formatter." -category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "black-22.10.0-1fixedarch-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:5cc42ca67989e9c3cf859e84c2bf014f6633db63d1cbdf8fdb666dcd9e77e3fa"}, + {file = "black-22.10.0-1fixedarch-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:5d8f74030e67087b219b032aa33a919fae8806d49c867846bfacde57f43972ef"}, + {file = "black-22.10.0-1fixedarch-cp37-cp37m-macosx_10_16_x86_64.whl", hash = "sha256:197df8509263b0b8614e1df1756b1dd41be6738eed2ba9e9769f3880c2b9d7b6"}, + {file = "black-22.10.0-1fixedarch-cp38-cp38-macosx_10_16_x86_64.whl", hash = "sha256:2644b5d63633702bc2c5f3754b1b475378fbbfb481f62319388235d0cd104c2d"}, + {file = "black-22.10.0-1fixedarch-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:e41a86c6c650bcecc6633ee3180d80a025db041a8e2398dcc059b3afa8382cd4"}, + {file = "black-22.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2039230db3c6c639bd84efe3292ec7b06e9214a2992cd9beb293d639c6402edb"}, + {file = "black-22.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:14ff67aec0a47c424bc99b71005202045dc09270da44a27848d534600ac64fc7"}, + {file = "black-22.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:819dc789f4498ecc91438a7de64427c73b45035e2e3680c92e18795a839ebb66"}, + {file = "black-22.10.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5b9b29da4f564ba8787c119f37d174f2b69cdfdf9015b7d8c5c16121ddc054ae"}, + {file = "black-22.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8b49776299fece66bffaafe357d929ca9451450f5466e997a7285ab0fe28e3b"}, + {file = "black-22.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:21199526696b8f09c3997e2b4db8d0b108d801a348414264d2eb8eb2532e540d"}, + {file = "black-22.10.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e464456d24e23d11fced2bc8c47ef66d471f845c7b7a42f3bd77bf3d1789650"}, + {file = "black-22.10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:9311e99228ae10023300ecac05be5a296f60d2fd10fff31cf5c1fa4ca4b1988d"}, + {file = "black-22.10.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:fba8a281e570adafb79f7755ac8721b6cf1bbf691186a287e990c7929c7692ff"}, + {file = "black-22.10.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:915ace4ff03fdfff953962fa672d44be269deb2eaf88499a0f8805221bc68c87"}, + {file = "black-22.10.0-cp38-cp38-win_amd64.whl", hash = "sha256:444ebfb4e441254e87bad00c661fe32df9969b2bf224373a448d8aca2132b395"}, + {file = "black-22.10.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:974308c58d057a651d182208a484ce80a26dac0caef2895836a92dd6ebd725e0"}, + {file = "black-22.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72ef3925f30e12a184889aac03d77d031056860ccae8a1e519f6cbb742736383"}, + {file = "black-22.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:432247333090c8c5366e69627ccb363bc58514ae3e63f7fc75c54b1ea80fa7de"}, + {file = "black-22.10.0-py3-none-any.whl", hash = "sha256:c957b2b4ea88587b46cf49d1dc17681c1e672864fd7af32fc1e9664d572b3458"}, + {file = "black-22.10.0.tar.gz", hash = "sha256:f513588da599943e0cde4e32cc9879e825d58720d6557062d1098c5ad80080e1"}, +] [package.dependencies] click = ">=8.0.0" @@ -39,9 +66,12 @@ uvloop = ["uvloop (>=0.15.2)"] name = "click" version = "8.1.3" description = "Composable command line interface toolkit" -category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"}, + {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"}, +] [package.dependencies] colorama = {version = "*", markers = "platform_system == \"Windows\""} @@ -51,17 +81,23 @@ importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} name = "colorama" version = "0.4.6" description = "Cross-platform colored terminal text." -category = "dev" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" +files = [ + {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, + {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, +] [[package]] name = "django" version = "3.2.16" description = "A high-level Python Web framework that encourages rapid development and clean, pragmatic design." -category = "main" optional = false python-versions = ">=3.6" +files = [ + {file = "Django-3.2.16-py3-none-any.whl", hash = "sha256:18ba8efa36b69cfcd4b670d0fa187c6fe7506596f0ababe580e16909bcdec121"}, + {file = "Django-3.2.16.tar.gz", hash = "sha256:3adc285124244724a394fa9b9839cc8cd116faf7d159554c43ecdaa8cdf0b94d"}, +] [package.dependencies] asgiref = ">=3.3.2,<4" @@ -76,9 +112,12 @@ bcrypt = ["bcrypt"] name = "django-stubs" version = "1.13.0" description = "Mypy stubs for Django" -category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "django-stubs-1.13.0.tar.gz", hash = "sha256:424fdd1935f859a802365056f9ccf4db12d1d93a5ab3de6d5633dddba0c5fc76"}, + {file = "django_stubs-1.13.0-py3-none-any.whl", hash = "sha256:eaecc1fc71532c1148f0c9687556651d880165476d7629bf318ff86a903a150c"}, +] [package.dependencies] django = "*" @@ -96,9 +135,12 @@ compatible-mypy = ["mypy (>=0.980,<0.990)"] name = "django-stubs-ext" version = "0.7.0" description = "Monkey-patching and extensions for django-stubs" -category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "django-stubs-ext-0.7.0.tar.gz", hash = "sha256:4fd8cdbc68d1a421f21bb7e0d9e76d50f6a4b504d350ba786405daf536e90c21"}, + {file = "django_stubs_ext-0.7.0-py3-none-any.whl", hash = "sha256:d729fbc7fe8970a7e26b35956c35b48502516f011d523c0577bdfb02ed956284"}, +] [package.dependencies] django = "*" @@ -108,9 +150,12 @@ typing-extensions = "*" name = "fancycompleter" version = "0.9.1" description = "colorful TAB completion for Python prompt" -category = "dev" optional = false python-versions = "*" +files = [ + {file = "fancycompleter-0.9.1-py3-none-any.whl", hash = "sha256:dd076bca7d9d524cc7f25ec8f35ef95388ffef9ef46def4d3d25e9b044ad7080"}, + {file = "fancycompleter-0.9.1.tar.gz", hash = "sha256:09e0feb8ae242abdfd7ef2ba55069a46f011814a80fe5476be48f51b00247272"}, +] [package.dependencies] pyreadline = {version = "*", markers = "platform_system == \"Windows\""} @@ -120,9 +165,12 @@ pyrepl = ">=0.8.2" name = "flake8" version = "5.0.4" description = "the modular source code checker: pep8 pyflakes and co" -category = "dev" optional = false python-versions = ">=3.6.1" +files = [ + {file = "flake8-5.0.4-py2.py3-none-any.whl", hash = "sha256:7a1cf6b73744f5806ab95e526f6f0d8c01c66d7bbe349562d22dfca20610b248"}, + {file = "flake8-5.0.4.tar.gz", hash = "sha256:6fbe320aad8d6b95cec8b8e47bc933004678dc63095be98528b7bdd2a9f510db"}, +] [package.dependencies] importlib-metadata = {version = ">=1.1.0,<4.3", markers = "python_version < \"3.8\""} @@ -134,9 +182,12 @@ pyflakes = ">=2.5.0,<2.6.0" name = "importlib-metadata" version = "4.2.0" description = "Read metadata from Python packages" -category = "dev" optional = false python-versions = ">=3.6" +files = [ + {file = "importlib_metadata-4.2.0-py3-none-any.whl", hash = "sha256:057e92c15bc8d9e8109738a48db0ccb31b4d9d5cfbee5a8670879a30be66304b"}, + {file = "importlib_metadata-4.2.0.tar.gz", hash = "sha256:b7e52a1f8dec14a75ea73e0891f3060099ca1d8e6a462a4dff11c3e119ea1b31"}, +] [package.dependencies] typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} @@ -150,9 +201,12 @@ testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pep517", name = "isort" version = "5.10.1" description = "A Python utility / library to sort Python imports." -category = "dev" optional = false python-versions = ">=3.6.1,<4.0" +files = [ + {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"}, + {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"}, +] [package.extras] colors = ["colorama (>=0.4.3,<0.5.0)"] @@ -164,17 +218,51 @@ requirements-deprecated-finder = ["pip-api", "pipreqs"] name = "mccabe" version = "0.7.0" description = "McCabe checker, plugin for flake8" -category = "dev" optional = false python-versions = ">=3.6" +files = [ + {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"}, + {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"}, +] [[package]] name = "mypy" version = "0.991" description = "Optional static typing for Python" -category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "mypy-0.991-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:7d17e0a9707d0772f4a7b878f04b4fd11f6f5bcb9b3813975a9b13c9332153ab"}, + {file = "mypy-0.991-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0714258640194d75677e86c786e80ccf294972cc76885d3ebbb560f11db0003d"}, + {file = "mypy-0.991-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0c8f3be99e8a8bd403caa8c03be619544bc2c77a7093685dcf308c6b109426c6"}, + {file = "mypy-0.991-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc9ec663ed6c8f15f4ae9d3c04c989b744436c16d26580eaa760ae9dd5d662eb"}, + {file = "mypy-0.991-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4307270436fd7694b41f913eb09210faff27ea4979ecbcd849e57d2da2f65305"}, + {file = "mypy-0.991-cp310-cp310-win_amd64.whl", hash = "sha256:901c2c269c616e6cb0998b33d4adbb4a6af0ac4ce5cd078afd7bc95830e62c1c"}, + {file = "mypy-0.991-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:d13674f3fb73805ba0c45eb6c0c3053d218aa1f7abead6e446d474529aafc372"}, + {file = "mypy-0.991-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1c8cd4fb70e8584ca1ed5805cbc7c017a3d1a29fb450621089ffed3e99d1857f"}, + {file = "mypy-0.991-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:209ee89fbb0deed518605edddd234af80506aec932ad28d73c08f1400ef80a33"}, + {file = "mypy-0.991-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37bd02ebf9d10e05b00d71302d2c2e6ca333e6c2a8584a98c00e038db8121f05"}, + {file = "mypy-0.991-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:26efb2fcc6b67e4d5a55561f39176821d2adf88f2745ddc72751b7890f3194ad"}, + {file = "mypy-0.991-cp311-cp311-win_amd64.whl", hash = "sha256:3a700330b567114b673cf8ee7388e949f843b356a73b5ab22dd7cff4742a5297"}, + {file = "mypy-0.991-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:1f7d1a520373e2272b10796c3ff721ea1a0712288cafaa95931e66aa15798813"}, + {file = "mypy-0.991-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:641411733b127c3e0dab94c45af15fea99e4468f99ac88b39efb1ad677da5711"}, + {file = "mypy-0.991-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:3d80e36b7d7a9259b740be6d8d906221789b0d836201af4234093cae89ced0cd"}, + {file = "mypy-0.991-cp37-cp37m-win_amd64.whl", hash = "sha256:e62ebaad93be3ad1a828a11e90f0e76f15449371ffeecca4a0a0b9adc99abcef"}, + {file = "mypy-0.991-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:b86ce2c1866a748c0f6faca5232059f881cda6dda2a893b9a8373353cfe3715a"}, + {file = "mypy-0.991-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ac6e503823143464538efda0e8e356d871557ef60ccd38f8824a4257acc18d93"}, + {file = "mypy-0.991-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0cca5adf694af539aeaa6ac633a7afe9bbd760df9d31be55ab780b77ab5ae8bf"}, + {file = "mypy-0.991-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a12c56bf73cdab116df96e4ff39610b92a348cc99a1307e1da3c3768bbb5b135"}, + {file = "mypy-0.991-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:652b651d42f155033a1967739788c436491b577b6a44e4c39fb340d0ee7f0d70"}, + {file = "mypy-0.991-cp38-cp38-win_amd64.whl", hash = "sha256:4175593dc25d9da12f7de8de873a33f9b2b8bdb4e827a7cae952e5b1a342e243"}, + {file = "mypy-0.991-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:98e781cd35c0acf33eb0295e8b9c55cdbef64fcb35f6d3aa2186f289bed6e80d"}, + {file = "mypy-0.991-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6d7464bac72a85cb3491c7e92b5b62f3dcccb8af26826257760a552a5e244aa5"}, + {file = "mypy-0.991-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c9166b3f81a10cdf9b49f2d594b21b31adadb3d5e9db9b834866c3258b695be3"}, + {file = "mypy-0.991-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8472f736a5bfb159a5e36740847808f6f5b659960115ff29c7cecec1741c648"}, + {file = "mypy-0.991-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5e80e758243b97b618cdf22004beb09e8a2de1af481382e4d84bc52152d1c476"}, + {file = "mypy-0.991-cp39-cp39-win_amd64.whl", hash = "sha256:74e259b5c19f70d35fcc1ad3d56499065c601dfe94ff67ae48b85596b9ec1461"}, + {file = "mypy-0.991-py3-none-any.whl", hash = "sha256:de32edc9b0a7e67c2775e574cb061a537660e51210fbf6006b0b36ea695ae9bb"}, + {file = "mypy-0.991.tar.gz", hash = "sha256:3c0165ba8f354a6d9881809ef29f1a9318a236a6d81c690094c5df32107bde06"}, +] [package.dependencies] mypy-extensions = ">=0.4.3" @@ -192,25 +280,34 @@ reports = ["lxml"] name = "mypy-extensions" version = "0.4.3" description = "Experimental type system extensions for programs checked with the mypy typechecker." -category = "dev" optional = false python-versions = "*" +files = [ + {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, + {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, +] [[package]] name = "pathspec" version = "0.10.2" description = "Utility library for gitignore style pattern matching of file paths." -category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "pathspec-0.10.2-py3-none-any.whl", hash = "sha256:88c2606f2c1e818b978540f73ecc908e13999c6c3a383daf3705652ae79807a5"}, + {file = "pathspec-0.10.2.tar.gz", hash = "sha256:8f6bf73e5758fd365ef5d58ce09ac7c27d2833a8d7da51712eac6e27e35141b0"}, +] [[package]] name = "pdbpp" version = "0.10.3" description = "pdb++, a drop-in replacement for pdb" -category = "dev" optional = false python-versions = "*" +files = [ + {file = "pdbpp-0.10.3-py2.py3-none-any.whl", hash = "sha256:79580568e33eb3d6f6b462b1187f53e10cd8e4538f7d31495c9181e2cf9665d1"}, + {file = "pdbpp-0.10.3.tar.gz", hash = "sha256:d9e43f4fda388eeb365f2887f4e7b66ac09dce9b6236b76f63616530e2f669f5"}, +] [package.dependencies] fancycompleter = ">=0.8" @@ -225,9 +322,12 @@ testing = ["funcsigs", "pytest"] name = "platformdirs" version = "2.5.4" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." -category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "platformdirs-2.5.4-py3-none-any.whl", hash = "sha256:af0276409f9a02373d540bf8480021a048711d572745aef4b7842dad245eba10"}, + {file = "platformdirs-2.5.4.tar.gz", hash = "sha256:1006647646d80f16130f052404c6b901e80ee4ed6bef6792e1f238a8969106f7"}, +] [package.extras] docs = ["furo (>=2022.9.29)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.4)"] @@ -237,33 +337,56 @@ test = ["appdirs (==1.4.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock name = "psycopg2" version = "2.9.5" description = "psycopg2 - Python-PostgreSQL Database Adapter" -category = "dev" optional = false python-versions = ">=3.6" +files = [ + {file = "psycopg2-2.9.5-cp310-cp310-win32.whl", hash = "sha256:d3ef67e630b0de0779c42912fe2cbae3805ebaba30cda27fea2a3de650a9414f"}, + {file = "psycopg2-2.9.5-cp310-cp310-win_amd64.whl", hash = "sha256:4cb9936316d88bfab614666eb9e32995e794ed0f8f6b3b718666c22819c1d7ee"}, + {file = "psycopg2-2.9.5-cp311-cp311-win32.whl", hash = "sha256:093e3894d2d3c592ab0945d9eba9d139c139664dcf83a1c440b8a7aa9bb21955"}, + {file = "psycopg2-2.9.5-cp311-cp311-win_amd64.whl", hash = "sha256:920bf418000dd17669d2904472efeab2b20546efd0548139618f8fa305d1d7ad"}, + {file = "psycopg2-2.9.5-cp36-cp36m-win32.whl", hash = "sha256:b9ac1b0d8ecc49e05e4e182694f418d27f3aedcfca854ebd6c05bb1cffa10d6d"}, + {file = "psycopg2-2.9.5-cp36-cp36m-win_amd64.whl", hash = "sha256:fc04dd5189b90d825509caa510f20d1d504761e78b8dfb95a0ede180f71d50e5"}, + {file = "psycopg2-2.9.5-cp37-cp37m-win32.whl", hash = "sha256:922cc5f0b98a5f2b1ff481f5551b95cd04580fd6f0c72d9b22e6c0145a4840e0"}, + {file = "psycopg2-2.9.5-cp37-cp37m-win_amd64.whl", hash = "sha256:1e5a38aa85bd660c53947bd28aeaafb6a97d70423606f1ccb044a03a1203fe4a"}, + {file = "psycopg2-2.9.5-cp38-cp38-win32.whl", hash = "sha256:f5b6320dbc3cf6cfb9f25308286f9f7ab464e65cfb105b64cc9c52831748ced2"}, + {file = "psycopg2-2.9.5-cp38-cp38-win_amd64.whl", hash = "sha256:1a5c7d7d577e0eabfcf15eb87d1e19314c8c4f0e722a301f98e0e3a65e238b4e"}, + {file = "psycopg2-2.9.5-cp39-cp39-win32.whl", hash = "sha256:322fd5fca0b1113677089d4ebd5222c964b1760e361f151cbb2706c4912112c5"}, + {file = "psycopg2-2.9.5-cp39-cp39-win_amd64.whl", hash = "sha256:190d51e8c1b25a47484e52a79638a8182451d6f6dff99f26ad9bd81e5359a0fa"}, + {file = "psycopg2-2.9.5.tar.gz", hash = "sha256:a5246d2e683a972e2187a8714b5c2cf8156c064629f9a9b1a873c1730d9e245a"}, +] [[package]] name = "pycodestyle" version = "2.9.1" description = "Python style guide checker" -category = "dev" optional = false python-versions = ">=3.6" +files = [ + {file = "pycodestyle-2.9.1-py2.py3-none-any.whl", hash = "sha256:d1735fc58b418fd7c5f658d28d943854f8a849b01a5d0a1e6f3f3fdd0166804b"}, + {file = "pycodestyle-2.9.1.tar.gz", hash = "sha256:2c9607871d58c76354b697b42f5d57e1ada7d261c261efac224b664affdc5785"}, +] [[package]] name = "pyflakes" version = "2.5.0" description = "passive checker of Python programs" -category = "dev" optional = false python-versions = ">=3.6" +files = [ + {file = "pyflakes-2.5.0-py2.py3-none-any.whl", hash = "sha256:4579f67d887f804e67edb544428f264b7b24f435b263c4614f384135cea553d2"}, + {file = "pyflakes-2.5.0.tar.gz", hash = "sha256:491feb020dca48ccc562a8c0cbe8df07ee13078df59813b83959cbdada312ea3"}, +] [[package]] name = "pygments" version = "2.13.0" description = "Pygments is a syntax highlighting package written in Python." -category = "dev" optional = false python-versions = ">=3.6" +files = [ + {file = "Pygments-2.13.0-py3-none-any.whl", hash = "sha256:f643f331ab57ba3c9d89212ee4a2dabc6e94f117cf4eefde99a0574720d14c42"}, + {file = "Pygments-2.13.0.tar.gz", hash = "sha256:56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1"}, +] [package.extras] plugins = ["importlib-metadata"] @@ -272,300 +395,173 @@ plugins = ["importlib-metadata"] name = "pyreadline" version = "2.1" description = "A python implmementation of GNU readline." -category = "dev" optional = false python-versions = "*" +files = [ + {file = "pyreadline-2.1.zip", hash = "sha256:4530592fc2e85b25b1a9f79664433da09237c1a270e4d78ea5aa3a2c7229e2d1"}, +] [[package]] name = "pyrepl" version = "0.9.0" description = "A library for building flexible command line interfaces" -category = "dev" optional = false python-versions = "*" +files = [ + {file = "pyrepl-0.9.0.tar.gz", hash = "sha256:292570f34b5502e871bbb966d639474f2b57fbfcd3373c2d6a2f3d56e681a775"}, +] [[package]] name = "pytz" version = "2022.6" description = "World timezone definitions, modern and historical" -category = "main" optional = false python-versions = "*" +files = [ + {file = "pytz-2022.6-py2.py3-none-any.whl", hash = "sha256:222439474e9c98fced559f1709d89e6c9cbf8d79c794ff3eb9f8800064291427"}, + {file = "pytz-2022.6.tar.gz", hash = "sha256:e89512406b793ca39f5971bc999cc538ce125c0e51c27941bef4568b460095e2"}, +] + +[[package]] +name = "ruff" +version = "0.1.13" +description = "An extremely fast Python linter and code formatter, written in Rust." +optional = false +python-versions = ">=3.7" +files = [ + {file = "ruff-0.1.13-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:e3fd36e0d48aeac672aa850045e784673449ce619afc12823ea7868fcc41d8ba"}, + {file = "ruff-0.1.13-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:9fb6b3b86450d4ec6a6732f9f60c4406061b6851c4b29f944f8c9d91c3611c7a"}, + {file = "ruff-0.1.13-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b13ba5d7156daaf3fd08b6b993360a96060500aca7e307d95ecbc5bb47a69296"}, + {file = "ruff-0.1.13-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:9ebb40442f7b531e136d334ef0851412410061e65d61ca8ce90d894a094feb22"}, + {file = "ruff-0.1.13-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:226b517f42d59a543d6383cfe03cccf0091e3e0ed1b856c6824be03d2a75d3b6"}, + {file = "ruff-0.1.13-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:5f0312ba1061e9b8c724e9a702d3c8621e3c6e6c2c9bd862550ab2951ac75c16"}, + {file = "ruff-0.1.13-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2f59bcf5217c661254bd6bc42d65a6fd1a8b80c48763cb5c2293295babd945dd"}, + {file = "ruff-0.1.13-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e6894b00495e00c27b6ba61af1fc666f17de6140345e5ef27dd6e08fb987259d"}, + {file = "ruff-0.1.13-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9a1600942485c6e66119da294c6294856b5c86fd6df591ce293e4a4cc8e72989"}, + {file = "ruff-0.1.13-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:ee3febce7863e231a467f90e681d3d89210b900d49ce88723ce052c8761be8c7"}, + {file = "ruff-0.1.13-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:dcaab50e278ff497ee4d1fe69b29ca0a9a47cd954bb17963628fa417933c6eb1"}, + {file = "ruff-0.1.13-py3-none-musllinux_1_2_i686.whl", hash = "sha256:f57de973de4edef3ad3044d6a50c02ad9fc2dff0d88587f25f1a48e3f72edf5e"}, + {file = "ruff-0.1.13-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:7a36fa90eb12208272a858475ec43ac811ac37e91ef868759770b71bdabe27b6"}, + {file = "ruff-0.1.13-py3-none-win32.whl", hash = "sha256:a623349a505ff768dad6bd57087e2461be8db58305ebd5577bd0e98631f9ae69"}, + {file = "ruff-0.1.13-py3-none-win_amd64.whl", hash = "sha256:f988746e3c3982bea7f824c8fa318ce7f538c4dfefec99cd09c8770bd33e6539"}, + {file = "ruff-0.1.13-py3-none-win_arm64.whl", hash = "sha256:6bbbc3042075871ec17f28864808540a26f0f79a4478c357d3e3d2284e832998"}, + {file = "ruff-0.1.13.tar.gz", hash = "sha256:e261f1baed6291f434ffb1d5c6bd8051d1c2a26958072d38dfbec39b3dda7352"}, +] [[package]] name = "sqlparse" version = "0.4.3" description = "A non-validating SQL parser." -category = "main" optional = false python-versions = ">=3.5" +files = [ + {file = "sqlparse-0.4.3-py3-none-any.whl", hash = "sha256:0323c0ec29cd52bceabc1b4d9d579e311f3e4961b98d174201d5622a23b85e34"}, + {file = "sqlparse-0.4.3.tar.gz", hash = "sha256:69ca804846bb114d2ec380e4360a8a340db83f0ccf3afceeb1404df028f57268"}, +] [[package]] name = "tomli" version = "2.0.1" description = "A lil' TOML parser" -category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, + {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, +] [[package]] name = "typed-ast" version = "1.5.4" description = "a fork of Python 2 and 3 ast modules with type comment support" -category = "dev" optional = false python-versions = ">=3.6" +files = [ + {file = "typed_ast-1.5.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:669dd0c4167f6f2cd9f57041e03c3c2ebf9063d0757dc89f79ba1daa2bfca9d4"}, + {file = "typed_ast-1.5.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:211260621ab1cd7324e0798d6be953d00b74e0428382991adfddb352252f1d62"}, + {file = "typed_ast-1.5.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:267e3f78697a6c00c689c03db4876dd1efdfea2f251a5ad6555e82a26847b4ac"}, + {file = "typed_ast-1.5.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c542eeda69212fa10a7ada75e668876fdec5f856cd3d06829e6aa64ad17c8dfe"}, + {file = "typed_ast-1.5.4-cp310-cp310-win_amd64.whl", hash = "sha256:a9916d2bb8865f973824fb47436fa45e1ebf2efd920f2b9f99342cb7fab93f72"}, + {file = "typed_ast-1.5.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:79b1e0869db7c830ba6a981d58711c88b6677506e648496b1f64ac7d15633aec"}, + {file = "typed_ast-1.5.4-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a94d55d142c9265f4ea46fab70977a1944ecae359ae867397757d836ea5a3f47"}, + {file = "typed_ast-1.5.4-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:183afdf0ec5b1b211724dfef3d2cad2d767cbefac291f24d69b00546c1837fb6"}, + {file = "typed_ast-1.5.4-cp36-cp36m-win_amd64.whl", hash = "sha256:639c5f0b21776605dd6c9dbe592d5228f021404dafd377e2b7ac046b0349b1a1"}, + {file = "typed_ast-1.5.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:cf4afcfac006ece570e32d6fa90ab74a17245b83dfd6655a6f68568098345ff6"}, + {file = "typed_ast-1.5.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ed855bbe3eb3715fca349c80174cfcfd699c2f9de574d40527b8429acae23a66"}, + {file = "typed_ast-1.5.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:6778e1b2f81dfc7bc58e4b259363b83d2e509a65198e85d5700dfae4c6c8ff1c"}, + {file = "typed_ast-1.5.4-cp37-cp37m-win_amd64.whl", hash = "sha256:0261195c2062caf107831e92a76764c81227dae162c4f75192c0d489faf751a2"}, + {file = "typed_ast-1.5.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2efae9db7a8c05ad5547d522e7dbe62c83d838d3906a3716d1478b6c1d61388d"}, + {file = "typed_ast-1.5.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7d5d014b7daa8b0bf2eaef684295acae12b036d79f54178b92a2b6a56f92278f"}, + {file = "typed_ast-1.5.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:370788a63915e82fd6f212865a596a0fefcbb7d408bbbb13dea723d971ed8bdc"}, + {file = "typed_ast-1.5.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4e964b4ff86550a7a7d56345c7864b18f403f5bd7380edf44a3c1fb4ee7ac6c6"}, + {file = "typed_ast-1.5.4-cp38-cp38-win_amd64.whl", hash = "sha256:683407d92dc953c8a7347119596f0b0e6c55eb98ebebd9b23437501b28dcbb8e"}, + {file = "typed_ast-1.5.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4879da6c9b73443f97e731b617184a596ac1235fe91f98d279a7af36c796da35"}, + {file = "typed_ast-1.5.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3e123d878ba170397916557d31c8f589951e353cc95fb7f24f6bb69adc1a8a97"}, + {file = "typed_ast-1.5.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ebd9d7f80ccf7a82ac5f88c521115cc55d84e35bf8b446fcd7836eb6b98929a3"}, + {file = "typed_ast-1.5.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98f80dee3c03455e92796b58b98ff6ca0b2a6f652120c263efdba4d6c5e58f72"}, + {file = "typed_ast-1.5.4-cp39-cp39-win_amd64.whl", hash = "sha256:0fdbcf2fef0ca421a3f5912555804296f0b0960f0418c440f5d6d3abb549f3e1"}, + {file = "typed_ast-1.5.4.tar.gz", hash = "sha256:39e21ceb7388e4bb37f4c679d72707ed46c2fbf2a5609b8b8ebc4b067d977df2"}, +] [[package]] name = "types-pytz" version = "2022.6.0.1" description = "Typing stubs for pytz" -category = "dev" optional = false python-versions = "*" +files = [ + {file = "types-pytz-2022.6.0.1.tar.gz", hash = "sha256:d078196374d1277e9f9984d49373ea043cf2c64d5d5c491fbc86c258557bd46f"}, + {file = "types_pytz-2022.6.0.1-py3-none-any.whl", hash = "sha256:bea605ce5d5a5d52a8e1afd7656c9b42476e18a0f888de6be91587355313ddf4"}, +] [[package]] name = "types-pyyaml" version = "6.0.12.2" description = "Typing stubs for PyYAML" -category = "dev" optional = false python-versions = "*" +files = [ + {file = "types-PyYAML-6.0.12.2.tar.gz", hash = "sha256:6840819871c92deebe6a2067fb800c11b8a063632eb4e3e755914e7ab3604e83"}, + {file = "types_PyYAML-6.0.12.2-py3-none-any.whl", hash = "sha256:1e94e80aafee07a7e798addb2a320e32956a373f376655128ae20637adb2655b"}, +] [[package]] name = "typing-extensions" version = "4.4.0" description = "Backported and Experimental Type Hints for Python 3.7+" -category = "main" optional = false python-versions = ">=3.7" +files = [ + {file = "typing_extensions-4.4.0-py3-none-any.whl", hash = "sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e"}, + {file = "typing_extensions-4.4.0.tar.gz", hash = "sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa"}, +] [[package]] name = "wmctrl" version = "0.4" description = "A tool to programmatically control windows inside X" -category = "dev" optional = false python-versions = "*" +files = [ + {file = "wmctrl-0.4.tar.gz", hash = "sha256:66cbff72b0ca06a22ec3883ac3a4d7c41078bdae4fb7310f52951769b10e14e0"}, +] [[package]] name = "zipp" version = "3.10.0" description = "Backport of pathlib-compatible object wrapper for zip files" -category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "zipp-3.10.0-py3-none-any.whl", hash = "sha256:4fcb6f278987a6605757302a6e40e896257570d11c51628968ccb2a47e80c6c1"}, + {file = "zipp-3.10.0.tar.gz", hash = "sha256:7a7262fd930bd3e36c50b9a64897aec3fafff3dfdeec9623ae22b40e93f99bb8"}, +] [package.extras] docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)"] testing = ["flake8 (<5)", "func-timeout", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] [metadata] -lock-version = "1.1" +lock-version = "2.0" python-versions = "^3.7" -content-hash = "cf759bfba2b66c5079d8f1ec46aed0d1f9755f683f03c93e4f5ea776573bc909" - -[metadata.files] -asgiref = [ - {file = "asgiref-3.5.2-py3-none-any.whl", hash = "sha256:1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4"}, - {file = "asgiref-3.5.2.tar.gz", hash = "sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424"}, -] -black = [ - {file = "black-22.10.0-1fixedarch-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:5cc42ca67989e9c3cf859e84c2bf014f6633db63d1cbdf8fdb666dcd9e77e3fa"}, - {file = "black-22.10.0-1fixedarch-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:5d8f74030e67087b219b032aa33a919fae8806d49c867846bfacde57f43972ef"}, - {file = "black-22.10.0-1fixedarch-cp37-cp37m-macosx_10_16_x86_64.whl", hash = "sha256:197df8509263b0b8614e1df1756b1dd41be6738eed2ba9e9769f3880c2b9d7b6"}, - {file = "black-22.10.0-1fixedarch-cp38-cp38-macosx_10_16_x86_64.whl", hash = "sha256:2644b5d63633702bc2c5f3754b1b475378fbbfb481f62319388235d0cd104c2d"}, - {file = "black-22.10.0-1fixedarch-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:e41a86c6c650bcecc6633ee3180d80a025db041a8e2398dcc059b3afa8382cd4"}, - {file = "black-22.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2039230db3c6c639bd84efe3292ec7b06e9214a2992cd9beb293d639c6402edb"}, - {file = "black-22.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:14ff67aec0a47c424bc99b71005202045dc09270da44a27848d534600ac64fc7"}, - {file = "black-22.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:819dc789f4498ecc91438a7de64427c73b45035e2e3680c92e18795a839ebb66"}, - {file = "black-22.10.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5b9b29da4f564ba8787c119f37d174f2b69cdfdf9015b7d8c5c16121ddc054ae"}, - {file = "black-22.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8b49776299fece66bffaafe357d929ca9451450f5466e997a7285ab0fe28e3b"}, - {file = "black-22.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:21199526696b8f09c3997e2b4db8d0b108d801a348414264d2eb8eb2532e540d"}, - {file = "black-22.10.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e464456d24e23d11fced2bc8c47ef66d471f845c7b7a42f3bd77bf3d1789650"}, - {file = "black-22.10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:9311e99228ae10023300ecac05be5a296f60d2fd10fff31cf5c1fa4ca4b1988d"}, - {file = "black-22.10.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:fba8a281e570adafb79f7755ac8721b6cf1bbf691186a287e990c7929c7692ff"}, - {file = "black-22.10.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:915ace4ff03fdfff953962fa672d44be269deb2eaf88499a0f8805221bc68c87"}, - {file = "black-22.10.0-cp38-cp38-win_amd64.whl", hash = "sha256:444ebfb4e441254e87bad00c661fe32df9969b2bf224373a448d8aca2132b395"}, - {file = "black-22.10.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:974308c58d057a651d182208a484ce80a26dac0caef2895836a92dd6ebd725e0"}, - {file = "black-22.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72ef3925f30e12a184889aac03d77d031056860ccae8a1e519f6cbb742736383"}, - {file = "black-22.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:432247333090c8c5366e69627ccb363bc58514ae3e63f7fc75c54b1ea80fa7de"}, - {file = "black-22.10.0-py3-none-any.whl", hash = "sha256:c957b2b4ea88587b46cf49d1dc17681c1e672864fd7af32fc1e9664d572b3458"}, - {file = "black-22.10.0.tar.gz", hash = "sha256:f513588da599943e0cde4e32cc9879e825d58720d6557062d1098c5ad80080e1"}, -] -click = [ - {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"}, - {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"}, -] -colorama = [ - {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, - {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, -] -django = [ - {file = "Django-3.2.16-py3-none-any.whl", hash = "sha256:18ba8efa36b69cfcd4b670d0fa187c6fe7506596f0ababe580e16909bcdec121"}, - {file = "Django-3.2.16.tar.gz", hash = "sha256:3adc285124244724a394fa9b9839cc8cd116faf7d159554c43ecdaa8cdf0b94d"}, -] -django-stubs = [ - {file = "django-stubs-1.13.0.tar.gz", hash = "sha256:424fdd1935f859a802365056f9ccf4db12d1d93a5ab3de6d5633dddba0c5fc76"}, - {file = "django_stubs-1.13.0-py3-none-any.whl", hash = "sha256:eaecc1fc71532c1148f0c9687556651d880165476d7629bf318ff86a903a150c"}, -] -django-stubs-ext = [ - {file = "django-stubs-ext-0.7.0.tar.gz", hash = "sha256:4fd8cdbc68d1a421f21bb7e0d9e76d50f6a4b504d350ba786405daf536e90c21"}, - {file = "django_stubs_ext-0.7.0-py3-none-any.whl", hash = "sha256:d729fbc7fe8970a7e26b35956c35b48502516f011d523c0577bdfb02ed956284"}, -] -fancycompleter = [ - {file = "fancycompleter-0.9.1-py3-none-any.whl", hash = "sha256:dd076bca7d9d524cc7f25ec8f35ef95388ffef9ef46def4d3d25e9b044ad7080"}, - {file = "fancycompleter-0.9.1.tar.gz", hash = "sha256:09e0feb8ae242abdfd7ef2ba55069a46f011814a80fe5476be48f51b00247272"}, -] -flake8 = [ - {file = "flake8-5.0.4-py2.py3-none-any.whl", hash = "sha256:7a1cf6b73744f5806ab95e526f6f0d8c01c66d7bbe349562d22dfca20610b248"}, - {file = "flake8-5.0.4.tar.gz", hash = "sha256:6fbe320aad8d6b95cec8b8e47bc933004678dc63095be98528b7bdd2a9f510db"}, -] -importlib-metadata = [ - {file = "importlib_metadata-4.2.0-py3-none-any.whl", hash = "sha256:057e92c15bc8d9e8109738a48db0ccb31b4d9d5cfbee5a8670879a30be66304b"}, - {file = "importlib_metadata-4.2.0.tar.gz", hash = "sha256:b7e52a1f8dec14a75ea73e0891f3060099ca1d8e6a462a4dff11c3e119ea1b31"}, -] -isort = [ - {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"}, - {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"}, -] -mccabe = [ - {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"}, - {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"}, -] -mypy = [ - {file = "mypy-0.991-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:7d17e0a9707d0772f4a7b878f04b4fd11f6f5bcb9b3813975a9b13c9332153ab"}, - {file = "mypy-0.991-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0714258640194d75677e86c786e80ccf294972cc76885d3ebbb560f11db0003d"}, - {file = "mypy-0.991-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0c8f3be99e8a8bd403caa8c03be619544bc2c77a7093685dcf308c6b109426c6"}, - {file = "mypy-0.991-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc9ec663ed6c8f15f4ae9d3c04c989b744436c16d26580eaa760ae9dd5d662eb"}, - {file = "mypy-0.991-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4307270436fd7694b41f913eb09210faff27ea4979ecbcd849e57d2da2f65305"}, - {file = "mypy-0.991-cp310-cp310-win_amd64.whl", hash = "sha256:901c2c269c616e6cb0998b33d4adbb4a6af0ac4ce5cd078afd7bc95830e62c1c"}, - {file = "mypy-0.991-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:d13674f3fb73805ba0c45eb6c0c3053d218aa1f7abead6e446d474529aafc372"}, - {file = "mypy-0.991-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1c8cd4fb70e8584ca1ed5805cbc7c017a3d1a29fb450621089ffed3e99d1857f"}, - {file = "mypy-0.991-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:209ee89fbb0deed518605edddd234af80506aec932ad28d73c08f1400ef80a33"}, - {file = "mypy-0.991-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37bd02ebf9d10e05b00d71302d2c2e6ca333e6c2a8584a98c00e038db8121f05"}, - {file = "mypy-0.991-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:26efb2fcc6b67e4d5a55561f39176821d2adf88f2745ddc72751b7890f3194ad"}, - {file = "mypy-0.991-cp311-cp311-win_amd64.whl", hash = "sha256:3a700330b567114b673cf8ee7388e949f843b356a73b5ab22dd7cff4742a5297"}, - {file = "mypy-0.991-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:1f7d1a520373e2272b10796c3ff721ea1a0712288cafaa95931e66aa15798813"}, - {file = "mypy-0.991-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:641411733b127c3e0dab94c45af15fea99e4468f99ac88b39efb1ad677da5711"}, - {file = "mypy-0.991-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:3d80e36b7d7a9259b740be6d8d906221789b0d836201af4234093cae89ced0cd"}, - {file = "mypy-0.991-cp37-cp37m-win_amd64.whl", hash = "sha256:e62ebaad93be3ad1a828a11e90f0e76f15449371ffeecca4a0a0b9adc99abcef"}, - {file = "mypy-0.991-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:b86ce2c1866a748c0f6faca5232059f881cda6dda2a893b9a8373353cfe3715a"}, - {file = "mypy-0.991-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ac6e503823143464538efda0e8e356d871557ef60ccd38f8824a4257acc18d93"}, - {file = "mypy-0.991-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0cca5adf694af539aeaa6ac633a7afe9bbd760df9d31be55ab780b77ab5ae8bf"}, - {file = "mypy-0.991-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a12c56bf73cdab116df96e4ff39610b92a348cc99a1307e1da3c3768bbb5b135"}, - {file = "mypy-0.991-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:652b651d42f155033a1967739788c436491b577b6a44e4c39fb340d0ee7f0d70"}, - {file = "mypy-0.991-cp38-cp38-win_amd64.whl", hash = "sha256:4175593dc25d9da12f7de8de873a33f9b2b8bdb4e827a7cae952e5b1a342e243"}, - {file = "mypy-0.991-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:98e781cd35c0acf33eb0295e8b9c55cdbef64fcb35f6d3aa2186f289bed6e80d"}, - {file = "mypy-0.991-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6d7464bac72a85cb3491c7e92b5b62f3dcccb8af26826257760a552a5e244aa5"}, - {file = "mypy-0.991-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c9166b3f81a10cdf9b49f2d594b21b31adadb3d5e9db9b834866c3258b695be3"}, - {file = "mypy-0.991-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8472f736a5bfb159a5e36740847808f6f5b659960115ff29c7cecec1741c648"}, - {file = "mypy-0.991-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5e80e758243b97b618cdf22004beb09e8a2de1af481382e4d84bc52152d1c476"}, - {file = "mypy-0.991-cp39-cp39-win_amd64.whl", hash = "sha256:74e259b5c19f70d35fcc1ad3d56499065c601dfe94ff67ae48b85596b9ec1461"}, - {file = "mypy-0.991-py3-none-any.whl", hash = "sha256:de32edc9b0a7e67c2775e574cb061a537660e51210fbf6006b0b36ea695ae9bb"}, - {file = "mypy-0.991.tar.gz", hash = "sha256:3c0165ba8f354a6d9881809ef29f1a9318a236a6d81c690094c5df32107bde06"}, -] -mypy-extensions = [ - {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, - {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, -] -pathspec = [ - {file = "pathspec-0.10.2-py3-none-any.whl", hash = "sha256:88c2606f2c1e818b978540f73ecc908e13999c6c3a383daf3705652ae79807a5"}, - {file = "pathspec-0.10.2.tar.gz", hash = "sha256:8f6bf73e5758fd365ef5d58ce09ac7c27d2833a8d7da51712eac6e27e35141b0"}, -] -pdbpp = [ - {file = "pdbpp-0.10.3-py2.py3-none-any.whl", hash = "sha256:79580568e33eb3d6f6b462b1187f53e10cd8e4538f7d31495c9181e2cf9665d1"}, - {file = "pdbpp-0.10.3.tar.gz", hash = "sha256:d9e43f4fda388eeb365f2887f4e7b66ac09dce9b6236b76f63616530e2f669f5"}, -] -platformdirs = [ - {file = "platformdirs-2.5.4-py3-none-any.whl", hash = "sha256:af0276409f9a02373d540bf8480021a048711d572745aef4b7842dad245eba10"}, - {file = "platformdirs-2.5.4.tar.gz", hash = "sha256:1006647646d80f16130f052404c6b901e80ee4ed6bef6792e1f238a8969106f7"}, -] -psycopg2 = [ - {file = "psycopg2-2.9.5-cp310-cp310-win32.whl", hash = "sha256:d3ef67e630b0de0779c42912fe2cbae3805ebaba30cda27fea2a3de650a9414f"}, - {file = "psycopg2-2.9.5-cp310-cp310-win_amd64.whl", hash = "sha256:4cb9936316d88bfab614666eb9e32995e794ed0f8f6b3b718666c22819c1d7ee"}, - {file = "psycopg2-2.9.5-cp36-cp36m-win32.whl", hash = "sha256:b9ac1b0d8ecc49e05e4e182694f418d27f3aedcfca854ebd6c05bb1cffa10d6d"}, - {file = "psycopg2-2.9.5-cp36-cp36m-win_amd64.whl", hash = "sha256:fc04dd5189b90d825509caa510f20d1d504761e78b8dfb95a0ede180f71d50e5"}, - {file = "psycopg2-2.9.5-cp37-cp37m-win32.whl", hash = "sha256:922cc5f0b98a5f2b1ff481f5551b95cd04580fd6f0c72d9b22e6c0145a4840e0"}, - {file = "psycopg2-2.9.5-cp37-cp37m-win_amd64.whl", hash = "sha256:1e5a38aa85bd660c53947bd28aeaafb6a97d70423606f1ccb044a03a1203fe4a"}, - {file = "psycopg2-2.9.5-cp38-cp38-win32.whl", hash = "sha256:f5b6320dbc3cf6cfb9f25308286f9f7ab464e65cfb105b64cc9c52831748ced2"}, - {file = "psycopg2-2.9.5-cp38-cp38-win_amd64.whl", hash = "sha256:1a5c7d7d577e0eabfcf15eb87d1e19314c8c4f0e722a301f98e0e3a65e238b4e"}, - {file = "psycopg2-2.9.5-cp39-cp39-win32.whl", hash = "sha256:322fd5fca0b1113677089d4ebd5222c964b1760e361f151cbb2706c4912112c5"}, - {file = "psycopg2-2.9.5-cp39-cp39-win_amd64.whl", hash = "sha256:190d51e8c1b25a47484e52a79638a8182451d6f6dff99f26ad9bd81e5359a0fa"}, - {file = "psycopg2-2.9.5.tar.gz", hash = "sha256:a5246d2e683a972e2187a8714b5c2cf8156c064629f9a9b1a873c1730d9e245a"}, -] -pycodestyle = [ - {file = "pycodestyle-2.9.1-py2.py3-none-any.whl", hash = "sha256:d1735fc58b418fd7c5f658d28d943854f8a849b01a5d0a1e6f3f3fdd0166804b"}, - {file = "pycodestyle-2.9.1.tar.gz", hash = "sha256:2c9607871d58c76354b697b42f5d57e1ada7d261c261efac224b664affdc5785"}, -] -pyflakes = [ - {file = "pyflakes-2.5.0-py2.py3-none-any.whl", hash = "sha256:4579f67d887f804e67edb544428f264b7b24f435b263c4614f384135cea553d2"}, - {file = "pyflakes-2.5.0.tar.gz", hash = "sha256:491feb020dca48ccc562a8c0cbe8df07ee13078df59813b83959cbdada312ea3"}, -] -pygments = [ - {file = "Pygments-2.13.0-py3-none-any.whl", hash = "sha256:f643f331ab57ba3c9d89212ee4a2dabc6e94f117cf4eefde99a0574720d14c42"}, - {file = "Pygments-2.13.0.tar.gz", hash = "sha256:56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1"}, -] -pyreadline = [ - {file = "pyreadline-2.1.zip", hash = "sha256:4530592fc2e85b25b1a9f79664433da09237c1a270e4d78ea5aa3a2c7229e2d1"}, -] -pyrepl = [ - {file = "pyrepl-0.9.0.tar.gz", hash = "sha256:292570f34b5502e871bbb966d639474f2b57fbfcd3373c2d6a2f3d56e681a775"}, -] -pytz = [ - {file = "pytz-2022.6-py2.py3-none-any.whl", hash = "sha256:222439474e9c98fced559f1709d89e6c9cbf8d79c794ff3eb9f8800064291427"}, - {file = "pytz-2022.6.tar.gz", hash = "sha256:e89512406b793ca39f5971bc999cc538ce125c0e51c27941bef4568b460095e2"}, -] -sqlparse = [ - {file = "sqlparse-0.4.3-py3-none-any.whl", hash = "sha256:0323c0ec29cd52bceabc1b4d9d579e311f3e4961b98d174201d5622a23b85e34"}, - {file = "sqlparse-0.4.3.tar.gz", hash = "sha256:69ca804846bb114d2ec380e4360a8a340db83f0ccf3afceeb1404df028f57268"}, -] -tomli = [ - {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, - {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, -] -typed-ast = [ - {file = "typed_ast-1.5.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:669dd0c4167f6f2cd9f57041e03c3c2ebf9063d0757dc89f79ba1daa2bfca9d4"}, - {file = "typed_ast-1.5.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:211260621ab1cd7324e0798d6be953d00b74e0428382991adfddb352252f1d62"}, - {file = "typed_ast-1.5.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:267e3f78697a6c00c689c03db4876dd1efdfea2f251a5ad6555e82a26847b4ac"}, - {file = "typed_ast-1.5.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c542eeda69212fa10a7ada75e668876fdec5f856cd3d06829e6aa64ad17c8dfe"}, - {file = "typed_ast-1.5.4-cp310-cp310-win_amd64.whl", hash = "sha256:a9916d2bb8865f973824fb47436fa45e1ebf2efd920f2b9f99342cb7fab93f72"}, - {file = "typed_ast-1.5.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:79b1e0869db7c830ba6a981d58711c88b6677506e648496b1f64ac7d15633aec"}, - {file = "typed_ast-1.5.4-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a94d55d142c9265f4ea46fab70977a1944ecae359ae867397757d836ea5a3f47"}, - {file = "typed_ast-1.5.4-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:183afdf0ec5b1b211724dfef3d2cad2d767cbefac291f24d69b00546c1837fb6"}, - {file = "typed_ast-1.5.4-cp36-cp36m-win_amd64.whl", hash = "sha256:639c5f0b21776605dd6c9dbe592d5228f021404dafd377e2b7ac046b0349b1a1"}, - {file = "typed_ast-1.5.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:cf4afcfac006ece570e32d6fa90ab74a17245b83dfd6655a6f68568098345ff6"}, - {file = "typed_ast-1.5.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ed855bbe3eb3715fca349c80174cfcfd699c2f9de574d40527b8429acae23a66"}, - {file = "typed_ast-1.5.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:6778e1b2f81dfc7bc58e4b259363b83d2e509a65198e85d5700dfae4c6c8ff1c"}, - {file = "typed_ast-1.5.4-cp37-cp37m-win_amd64.whl", hash = "sha256:0261195c2062caf107831e92a76764c81227dae162c4f75192c0d489faf751a2"}, - {file = "typed_ast-1.5.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2efae9db7a8c05ad5547d522e7dbe62c83d838d3906a3716d1478b6c1d61388d"}, - {file = "typed_ast-1.5.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7d5d014b7daa8b0bf2eaef684295acae12b036d79f54178b92a2b6a56f92278f"}, - {file = "typed_ast-1.5.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:370788a63915e82fd6f212865a596a0fefcbb7d408bbbb13dea723d971ed8bdc"}, - {file = "typed_ast-1.5.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4e964b4ff86550a7a7d56345c7864b18f403f5bd7380edf44a3c1fb4ee7ac6c6"}, - {file = "typed_ast-1.5.4-cp38-cp38-win_amd64.whl", hash = "sha256:683407d92dc953c8a7347119596f0b0e6c55eb98ebebd9b23437501b28dcbb8e"}, - {file = "typed_ast-1.5.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4879da6c9b73443f97e731b617184a596ac1235fe91f98d279a7af36c796da35"}, - {file = "typed_ast-1.5.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3e123d878ba170397916557d31c8f589951e353cc95fb7f24f6bb69adc1a8a97"}, - {file = "typed_ast-1.5.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ebd9d7f80ccf7a82ac5f88c521115cc55d84e35bf8b446fcd7836eb6b98929a3"}, - {file = "typed_ast-1.5.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98f80dee3c03455e92796b58b98ff6ca0b2a6f652120c263efdba4d6c5e58f72"}, - {file = "typed_ast-1.5.4-cp39-cp39-win_amd64.whl", hash = "sha256:0fdbcf2fef0ca421a3f5912555804296f0b0960f0418c440f5d6d3abb549f3e1"}, - {file = "typed_ast-1.5.4.tar.gz", hash = "sha256:39e21ceb7388e4bb37f4c679d72707ed46c2fbf2a5609b8b8ebc4b067d977df2"}, -] -types-pytz = [ - {file = "types-pytz-2022.6.0.1.tar.gz", hash = "sha256:d078196374d1277e9f9984d49373ea043cf2c64d5d5c491fbc86c258557bd46f"}, - {file = "types_pytz-2022.6.0.1-py3-none-any.whl", hash = "sha256:bea605ce5d5a5d52a8e1afd7656c9b42476e18a0f888de6be91587355313ddf4"}, -] -types-pyyaml = [ - {file = "types-PyYAML-6.0.12.2.tar.gz", hash = "sha256:6840819871c92deebe6a2067fb800c11b8a063632eb4e3e755914e7ab3604e83"}, - {file = "types_PyYAML-6.0.12.2-py3-none-any.whl", hash = "sha256:1e94e80aafee07a7e798addb2a320e32956a373f376655128ae20637adb2655b"}, -] -typing-extensions = [ - {file = "typing_extensions-4.4.0-py3-none-any.whl", hash = "sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e"}, - {file = "typing_extensions-4.4.0.tar.gz", hash = "sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa"}, -] -wmctrl = [ - {file = "wmctrl-0.4.tar.gz", hash = "sha256:66cbff72b0ca06a22ec3883ac3a4d7c41078bdae4fb7310f52951769b10e14e0"}, -] -zipp = [ - {file = "zipp-3.10.0-py3-none-any.whl", hash = "sha256:4fcb6f278987a6605757302a6e40e896257570d11c51628968ccb2a47e80c6c1"}, - {file = "zipp-3.10.0.tar.gz", hash = "sha256:7a7262fd930bd3e36c50b9a64897aec3fafff3dfdeec9623ae22b40e93f99bb8"}, -] +content-hash = "76c803c2daa00ae20e2b97deaee32e45baa6260ed095f262a817aa76a7c9930d" diff --git a/pyproject.toml b/pyproject.toml index f725ac4..1314ff7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,6 +19,7 @@ black = "^22.10.0" isort = "^5.10.1" flake8 = "^5.0.4" django-stubs = "^1.13.0" +ruff = "^0.1.13" [tool.nitpick] # Generated by the 'nitpick init' command From 9536745ca053e1e4e6363793adb4d2a9ef0e2d74 Mon Sep 17 00:00:00 2001 From: William Chu Date: Tue, 16 Jan 2024 11:17:14 +1100 Subject: [PATCH 02/10] chore: lint fixes --- django_pev/admin.py | 2 -- django_pev/apps.py | 4 ++-- django_pev/models.py | 2 -- django_pev/tests.py | 3 --- django_pev/urls.py | 1 - django_pev/utils/indexes.py | 38 ++++++++++++++++++--------------- django_pev/utils/maintenance.py | 10 +++++++-- django_pev/utils/space.py | 22 ++++++++++++------- django_pev/views.py | 29 ++++++++++++++----------- 9 files changed, 62 insertions(+), 49 deletions(-) diff --git a/django_pev/admin.py b/django_pev/admin.py index 8c38f3f..846f6b4 100644 --- a/django_pev/admin.py +++ b/django_pev/admin.py @@ -1,3 +1 @@ -from django.contrib import admin - # Register your models here. diff --git a/django_pev/apps.py b/django_pev/apps.py index e67f559..1312d0c 100644 --- a/django_pev/apps.py +++ b/django_pev/apps.py @@ -2,5 +2,5 @@ class DjangoPevConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'django_pev' + default_auto_field = "django.db.models.BigAutoField" + name = "django_pev" diff --git a/django_pev/models.py b/django_pev/models.py index 71a8362..6b20219 100644 --- a/django_pev/models.py +++ b/django_pev/models.py @@ -1,3 +1 @@ -from django.db import models - # Create your models here. diff --git a/django_pev/tests.py b/django_pev/tests.py index 7ce503c..e69de29 100644 --- a/django_pev/tests.py +++ b/django_pev/tests.py @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/django_pev/urls.py b/django_pev/urls.py index 9d5c519..b74e5db 100755 --- a/django_pev/urls.py +++ b/django_pev/urls.py @@ -1,4 +1,3 @@ -from django.contrib import admin from django.urls import path from . import views diff --git a/django_pev/utils/indexes.py b/django_pev/utils/indexes.py index e40686f..79a20a4 100644 --- a/django_pev/utils/indexes.py +++ b/django_pev/utils/indexes.py @@ -42,44 +42,45 @@ def table_key(self) -> str: def index_covers(self, columns: list[str]) -> bool: """Returns true if this index covers the given columns""" - return self.columns[:len(columns)] == columns + return self.columns[: len(columns)] == columns + def get_indexes() -> list[IndexInfo]: with connection.cursor() as cursor: sql = (Path(__file__).parent / "index_lookup.sql").read_text() cursor.execute(sql) - indexes = list(IndexInfo(*c) for c in cursor.fetchall()) + indexes = list(IndexInfo(*c) for c in cursor.fetchall()) _update_indexes_with_duplicated_indexes(indexes) return indexes def get_total_index_hitrate() -> float: - """ Total hit rate with all indexes """ + """Total hit rate with all indexes""" with connection.cursor() as cursor: - cursor.execute(""" + cursor.execute( + """ SELECT (sum(idx_blks_hit)) / nullif(sum(idx_blks_hit + idx_blks_read), 0) AS rate FROM pg_statio_user_indexes - """) + """ + ) return cursor.fetchone()[0] def _update_indexes_with_duplicated_indexes(indexes: list[IndexInfo] | None = None) -> None: """Modifies a list of indexes a reference to the other index that covers it""" indexes = indexes or get_indexes() - indexes_by_table = { - key: list(group) for key,group in groupby(indexes, lambda i: i.table_key) - } + indexes_by_table = {key: list(group) for key, group in groupby(indexes, lambda i: i.table_key)} for index in indexes: if index.valid and not index.primary and not index.unique: for other_index in indexes_by_table[index.table_key]: if ( - other_index.valid \ - and other_index.name != index.name \ - and other_index.index_covers(index.columns) \ - and other_index.using == index.using \ - and other_index.indexprs == index.indexprs \ + other_index.valid + and other_index.name != index.name + and other_index.index_covers(index.columns) + and other_index.using == index.using + and other_index.indexprs == index.indexprs and other_index.indpred == index.indpred ): index.covered_by = other_index @@ -91,15 +92,18 @@ def get_index_stats(indexes: list[IndexInfo] | None = None) -> dict: ret = { "total_index_hitrate": get_total_index_hitrate() * 100, "total_indexes_size": sum(i.size_bytes for i in indexes), - "total_duplicated_indexes_size": sum(i.size_bytes for i in indexes if i.is_duplicated), + "total_duplicated_indexes_size": sum(i.size_bytes for i in indexes if i.is_duplicated), "total_unused_indexes_size": sum(i.size_bytes for i in indexes if i.is_unused), "count_indexes": len(indexes), "count_duplicated_indexes": sum(1 for i in indexes if i.is_duplicated), "count_unused_indexes": sum(1 for i in indexes if i.is_unused), } - ret["percent_duplicated_indexes"] = float(ret["total_duplicated_indexes_size"]) / ret["total_indexes_size"] * 100 # type:ignore - ret["percent_unused_indexes"] = float(ret["total_unused_indexes_size"]) / ret["total_indexes_size"] * 100 # type:ignore + ret["percent_duplicated_indexes"] = ( + float(ret["total_duplicated_indexes_size"]) / ret["total_indexes_size"] * 100 + ) # type:ignore + ret["percent_unused_indexes"] = ( + float(ret["total_unused_indexes_size"]) / ret["total_indexes_size"] * 100 + ) # type:ignore return ret - diff --git a/django_pev/utils/maintenance.py b/django_pev/utils/maintenance.py index efbc9d4..65cdbf6 100644 --- a/django_pev/utils/maintenance.py +++ b/django_pev/utils/maintenance.py @@ -23,6 +23,7 @@ def get_tables_missing_indexes() -> list[tuple[str, str, str, int]]: cursor.execute(sql) return cursor.fetchall() + @dataclasses.dataclass class TableInfo: schema: str @@ -38,7 +39,11 @@ class TableInfo: @property def requires_index(self) -> bool: - return self.idx_scan > 0 and (100 * self.idx_scan / (self.seq_scan + self.idx_scan)) < 95 and self.live_rows >= 10000 + return ( + self.idx_scan > 0 + and (100 * self.idx_scan / (self.seq_scan + self.idx_scan)) < 95 + and self.live_rows >= 10000 + ) @property def index_hit_rate(self) -> float: @@ -46,7 +51,8 @@ def index_hit_rate(self) -> float: @property def index_hit_rate_formatted(self) -> str: - return f"{self.index_hit_rate * 100:0.2f}%" if self.index_hit_rate else "" + return f"{self.index_hit_rate * 100: 0.2f}%" if self.index_hit_rate else "" + def get_maintenance_info() -> list[TableInfo]: sql = """ diff --git a/django_pev/utils/space.py b/django_pev/utils/space.py index 687b744..d97b971 100644 --- a/django_pev/utils/space.py +++ b/django_pev/utils/space.py @@ -8,22 +8,26 @@ class RelationSpaceStat: schema: str name: str - type: Literal['table', 'index'] + type: Literal["table", "index"] size_bytes: int row_estimate: int + def get_database_size() -> int: """Returns the size of the current database in bytes""" with connection.cursor() as cursor: - cursor.execute(""" + cursor.execute( + """ SELECT pg_database_size(current_database()) as database_size - """) + """ + ) return cursor.fetchone()[0] def get_relation_sizes() -> list[RelationSpaceStat]: with connection.cursor() as cursor: - cursor.execute(""" + cursor.execute( + """ SELECT n.nspname AS schema, c.relname AS name, @@ -41,12 +45,14 @@ def get_relation_sizes() -> list[RelationSpaceStat]: ORDER BY pg_table_size(c.oid) DESC, 2 ASC -""") +""" + ) return [RelationSpaceStat(*row) for row in cursor.fetchall()] + def get_table_sizes() -> list[RelationSpaceStat]: - return [r for r in get_relation_sizes() if r.type == 'table'] + return [r for r in get_relation_sizes() if r.type == "table"] -def get_index_sizes() -> list[RelationSpaceStat]: - return [r for r in get_relation_sizes() if r.type == 'index'] +def get_index_sizes() -> list[RelationSpaceStat]: + return [r for r in get_relation_sizes() if r.type == "index"] diff --git a/django_pev/views.py b/django_pev/views.py index f0c5102..f4704c6 100644 --- a/django_pev/views.py +++ b/django_pev/views.py @@ -1,8 +1,7 @@ from typing import Any -from django.http import HttpResponse from django.shortcuts import render -from django.views.generic import RedirectView, TemplateView +from django.views.generic import TemplateView from .utils import indexes, maintenance, space @@ -19,34 +18,40 @@ class SpaceView(TemplateView): def get_context_data(self, **kwargs: Any) -> dict[str, Any]: ctx = super().get_context_data(**kwargs) - ctx['database_size'] = space.get_database_size() - ctx['tables'] = space.get_table_sizes() + ctx["database_size"] = space.get_database_size() + ctx["tables"] = space.get_table_sizes() # ctx['indexes'] = indexes.get_indexes() - ctx['indexes'] = space.get_index_sizes() + ctx["indexes"] = space.get_index_sizes() - ctx['indexes_size'] = sum(c.size_bytes for c in ctx['indexes']) - ctx['table_size'] = sum(c.size_bytes for c in ctx['tables']) + ctx["indexes_size"] = sum(c.size_bytes for c in ctx["indexes"]) + ctx["table_size"] = sum(c.size_bytes for c in ctx["tables"]) return ctx + class MaintenanceView(TemplateView): template_name = "django_pev/maintenance.html" def get_context_data(self, **kwargs: Any) -> dict[str, Any]: ctx = super().get_context_data(**kwargs) - ctx['tables'] = maintenance.get_maintenance_info() + ctx["tables"] = maintenance.get_maintenance_info() return ctx + class IndexesView(TemplateView): template_name = "django_pev/indexes_view.html" def get_context_data(self, **kwargs: Any) -> dict[str, Any]: ctx = super().get_context_data(**kwargs) all_indexes = indexes.get_indexes() - ctx['all_indexes'] = all_indexes - ctx['unused_indexes'] = sorted([i for i in all_indexes if i.is_unused], key=lambda i: i.size_bytes, reverse=True) - ctx['duplicated_indexes'] = sorted([i for i in all_indexes if i.is_duplicated], key=lambda i: i.size_bytes, reverse=True) + ctx["all_indexes"] = all_indexes + ctx["unused_indexes"] = sorted( + [i for i in all_indexes if i.is_unused], key=lambda i: i.size_bytes, reverse=True + ) + ctx["duplicated_indexes"] = sorted( + [i for i in all_indexes if i.is_duplicated], key=lambda i: i.size_bytes, reverse=True + ) ctx.update(indexes.get_index_stats()) - return ctx \ No newline at end of file + return ctx From 625ba2131ae7edcedac225598e1aaa04ed4c7867 Mon Sep 17 00:00:00 2001 From: William Chu Date: Tue, 16 Jan 2024 14:30:44 +1100 Subject: [PATCH 03/10] feat: add live-connections --- django_pev/templates/django_pev/base.html | 18 +++--- .../templates/django_pev/connections.html | 64 +++++++++++++++++++ django_pev/urls.py | 5 +- django_pev/utils/live_connections.py | 49 ++++++++++++++ django_pev/views.py | 20 ++++-- 5 files changed, 142 insertions(+), 14 deletions(-) create mode 100644 django_pev/templates/django_pev/connections.html create mode 100644 django_pev/utils/live_connections.py diff --git a/django_pev/templates/django_pev/base.html b/django_pev/templates/django_pev/base.html index a4054f1..c611a4b 100644 --- a/django_pev/templates/django_pev/base.html +++ b/django_pev/templates/django_pev/base.html @@ -5,7 +5,7 @@ - CoreUI Free Bootstrap Admin Template + Django Postgres Explain Visualiser Dashboard @@ -29,37 +29,37 @@

Django PEV

diff --git a/django_pev/templates/django_pev/connections.html b/django_pev/templates/django_pev/connections.html new file mode 100644 index 0000000..fcbbb51 --- /dev/null +++ b/django_pev/templates/django_pev/connections.html @@ -0,0 +1,64 @@ +{% extends "django_pev/base.html" %} +{% block content %} +
+
+
+
+
+

Live Connections

+
+
+ +
+
+
    +
  • + Total connections: {{ connections| length}} +
    • +
+
+
+ + + + + + + + + + + + + + + + + + {% for row in connections%} + + + + + + + + + + + + + {% endfor%} + +
PIDUserSourceIPOpen SinceQuery begin timeWait EventStateQuerySSL?
{{ row.pid }}{{ row.user }}{{ row.source }}{{ row.ip }}{{ row.backend_start | timesince }}{{ row.query_start | timesince }}{{ row.wait_event }}{{ row.start }}{{ row.query }} + {% if row.ssl %} + + {% endif%} +
+ +
+
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/django_pev/urls.py b/django_pev/urls.py index b74e5db..78077cb 100755 --- a/django_pev/urls.py +++ b/django_pev/urls.py @@ -6,5 +6,8 @@ path('', views.index, name="index"), path('space', views.SpaceView.as_view(), name="space"), path('maintenance', views.MaintenanceView.as_view(), name="maintenance"), - path('indexes', views.IndexesView.as_view(), name="indexes") + path('connections', views.ConnectionsView.as_view(), name="connections"), + path('indexes', views.IndexesView.as_view(), name="indexes"), + path('queries', views.IndexesView.as_view(), name="queries"), + path('live-queries', views.IndexesView.as_view(), name="live-queries"), ] diff --git a/django_pev/utils/live_connections.py b/django_pev/utils/live_connections.py new file mode 100644 index 0000000..c23d8f3 --- /dev/null +++ b/django_pev/utils/live_connections.py @@ -0,0 +1,49 @@ +import dataclasses +from datetime import datetime + +from django.db import connection + + +@dataclasses.dataclass +class ConnectionInfo: + pid: int + database: str + user: str + source: str + ip: str + backend_start: datetime + query_start: datetime | None + wait_event: str + state: str + query: str + ssl: bool + + +def get_connections_current_database() -> list[ConnectionInfo]: + """Returns list of postgres connections""" + sql = """ +SELECT + pg_stat_activity.pid, + datname AS database, + usename AS user, + application_name AS source, + client_addr AS ip, + backend_start, + query_start, + wait_event, + state, + query, + ssl +FROM + pg_stat_activity +LEFT JOIN + pg_stat_ssl ON pg_stat_activity.pid = pg_stat_ssl.pid +WHERE + datname = %s +ORDER BY + pg_stat_activity.pid + """ + with connection.cursor() as cursor: + database_name = connection.get_connection_params()['database'] + cursor.execute(sql, [database_name]) + return list(ConnectionInfo(*c) for c in cursor.fetchall()) \ No newline at end of file diff --git a/django_pev/views.py b/django_pev/views.py index f4704c6..c137c0f 100644 --- a/django_pev/views.py +++ b/django_pev/views.py @@ -3,7 +3,7 @@ from django.shortcuts import render from django.views.generic import TemplateView -from .utils import indexes, maintenance, space +from .utils import indexes, live_connections, maintenance, space # Create your views here. @@ -12,7 +12,11 @@ def index(request): return render(request, "django_pev/index.html") -class SpaceView(TemplateView): +class BaseView(TemplateView): + template_name = "django_pev/indexes_view.html" + pass + +class SpaceView(BaseView): template_name = "django_pev/space.html" def get_context_data(self, **kwargs: Any) -> dict[str, Any]: @@ -29,7 +33,7 @@ def get_context_data(self, **kwargs: Any) -> dict[str, Any]: return ctx -class MaintenanceView(TemplateView): +class MaintenanceView(BaseView): template_name = "django_pev/maintenance.html" def get_context_data(self, **kwargs: Any) -> dict[str, Any]: @@ -39,7 +43,7 @@ def get_context_data(self, **kwargs: Any) -> dict[str, Any]: return ctx -class IndexesView(TemplateView): +class IndexesView(BaseView): template_name = "django_pev/indexes_view.html" def get_context_data(self, **kwargs: Any) -> dict[str, Any]: @@ -55,3 +59,11 @@ def get_context_data(self, **kwargs: Any) -> dict[str, Any]: ctx.update(indexes.get_index_stats()) return ctx + +class ConnectionsView(BaseView): + template_name = "django_pev/connections.html" + + def get_context_data(self, **kwargs: Any) -> dict[str, Any]: + ctx = super().get_context_data(**kwargs) + ctx['connections'] = live_connections.get_connections_current_database() + return ctx From e392dfdd5962351908eebbda6a0b85a0b32f6071 Mon Sep 17 00:00:00 2001 From: William Chu Date: Tue, 16 Jan 2024 17:58:52 +1100 Subject: [PATCH 04/10] feat: add queries views --- django_pev/templates/django_pev/base.html | 11 +- .../templates/django_pev/live_queries.html | 66 ++++++ django_pev/templates/django_pev/queries.html | 164 ++++++++++++++ django_pev/urls.py | 6 +- django_pev/utils.py | 24 +- django_pev/utils/queries.py | 208 ++++++++++++++++++ django_pev/views.py | 21 +- 7 files changed, 486 insertions(+), 14 deletions(-) create mode 100644 django_pev/templates/django_pev/live_queries.html create mode 100644 django_pev/templates/django_pev/queries.html create mode 100644 django_pev/utils/queries.py diff --git a/django_pev/templates/django_pev/base.html b/django_pev/templates/django_pev/base.html index c611a4b..a39231b 100644 --- a/django_pev/templates/django_pev/base.html +++ b/django_pev/templates/django_pev/base.html @@ -29,12 +29,7 @@

Django PEV

  • - Overview - -
    • -
  • - - Queries TODO + Queries
  • @@ -48,8 +43,8 @@

    Django PEV

  • - - Live Queries TODO + + Live Queries
  • diff --git a/django_pev/templates/django_pev/live_queries.html b/django_pev/templates/django_pev/live_queries.html new file mode 100644 index 0000000..6f5aad4 --- /dev/null +++ b/django_pev/templates/django_pev/live_queries.html @@ -0,0 +1,66 @@ +{% extends "django_pev/base.html" %} +{% block content %} +
    +
    +
    +
    +
    +

    Live Queries

    +
    +
    + +
    +
    +
      +
    • + Total queries: {{ queries| length}} +
      • +
    +
    +
    + + + + + + + + + + + + + + + + + + + {% for row in queries %} + + + + + + + + + + + + + + {% endfor%} + +
    PIDDatabaseUserBackend TypeStateSourceDurationWaitingQueryStarted AtDuration ms
    {{ row.pid }} + {% if row.is_long_running%} + Long + {% endif %} + {{ row.database}}{{ row.user}}{{ row.backend_type}}{{ row.state}}{{ row.source}}{{ row.duration}}{{ row.waiting}}{{ row.query }}{{ row.started_at}}{{ row.duration_ms}}
    + +
    +
    +
    +
    +
    +{% endblock %} \ No newline at end of file diff --git a/django_pev/templates/django_pev/queries.html b/django_pev/templates/django_pev/queries.html new file mode 100644 index 0000000..19d3ae9 --- /dev/null +++ b/django_pev/templates/django_pev/queries.html @@ -0,0 +1,164 @@ +{% extends "django_pev/base.html" %} +{% block content %} +{% load humanize %} +
    +
    +
    +
    +
    +

    Slow Queries

    + This page shows queries that consumed the most time in the database. +
    +
    + +
    + +
    + + + + + + + + + + + + + + + {% for row in queries_by_io %} + + + + + + + + + + + + + + + + {% endfor%} + +
    Total TimeAverage TimeCallsCalls/sRows/callBLKS/sBLKS/call% of total BLKS
    {{ row.total_time_formatted }} ({{row.total_percent_time |floatformat:2 }}%){{ row.mean_time_formatted }} σ={{ row.stddev_time_formatted }} + {{ row.calls |intcomma}} + + {{ row.calls_per_second |floatformat:1 |intcomma}} + + {{ row.rows_per_call|floatformat:1 |intcomma}} + {{ row.shared_blks_per_second | floatformat:1 |intcomma}} {{ row.shared_blks_per_call|floatformat:1 |intcomma}} {{ row.total_percent_shared_blks|floatformat:2}} %
    + + {{ row.query }} + +
    +
    +
    + + + + + + + + + + + + + + + {% for row in queries_by_slowest %} + + + + + + + + + + + + + + + + {% endfor%} + +
    Total TimeAverage TimeCallsCalls/sRows/callBLKS/sBLKS/call% of total BLKS
    {{ row.total_time_formatted }} ({{row.total_percent_time |floatformat:2 }}%){{ row.mean_time_formatted }} σ={{ row.stddev_time_formatted }} + {{ row.calls |intcomma}} + + {{ row.calls_per_second |floatformat:1 |intcomma}} + + {{ row.rows_per_call|floatformat:1 |intcomma}} + {{ row.shared_blks_per_second | floatformat:1 |intcomma}} {{ row.shared_blks_per_call|floatformat:1 |intcomma}} {{ row.total_percent_shared_blks|floatformat:2}} %
    + + {{ row.query }} + +
    +
    + +
    + +
    +
    +
    +
    +
    +{% endblock %} \ No newline at end of file diff --git a/django_pev/urls.py b/django_pev/urls.py index 78077cb..61a2dad 100755 --- a/django_pev/urls.py +++ b/django_pev/urls.py @@ -3,11 +3,11 @@ from . import views urlpatterns = [ - path('', views.index, name="index"), + path('', views.QueriesView.as_view(), name="index"), path('space', views.SpaceView.as_view(), name="space"), path('maintenance', views.MaintenanceView.as_view(), name="maintenance"), path('connections', views.ConnectionsView.as_view(), name="connections"), path('indexes', views.IndexesView.as_view(), name="indexes"), - path('queries', views.IndexesView.as_view(), name="queries"), - path('live-queries', views.IndexesView.as_view(), name="live-queries"), + path('live-queries', views.LiveQueriesView.as_view(), name="live-queries"), + path('queries', views.QueriesView.as_view(), name="queries"), ] diff --git a/django_pev/utils.py b/django_pev/utils.py index 6adaea7..7ebb29d 100644 --- a/django_pev/utils.py +++ b/django_pev/utils.py @@ -5,17 +5,36 @@ from contextlib import contextmanager from dataclasses import dataclass, field +import sqlparse # type:ignore[import] from django.core.signals import request_started from django.db import connections, reset_queries -import sqlparse # type:ignore[import] - from django_pev.dalibo import PevResponse, upload_sql_plan from django_pev.exceptions import PevException logger = logging.Logger("django_pev") +TIME_DURATION_UNITS = ( + ('week', 60*60*24*7*1000), + ('day', 60*60*24*1000), + ('hour', 60*60*1000), + ('min', 60*1000), + ('sec', 1000), + ('ms', 1) +) + +def human_time_duration(milliseconds: int) -> str: + if milliseconds == 0: + return 'inf' + parts = [] + for unit, div in TIME_DURATION_UNITS: + amount, milliseconds = divmod(int(milliseconds), div) + if amount > 0: + parts.append('{} {}{}'.format(amount, unit, "" if amount == 1 else "ms")) + return ', '.join(parts) + + @dataclass(frozen=True) class Explain: index: int @@ -129,3 +148,4 @@ def explain( db_alias=db_alias, ) ) + diff --git a/django_pev/utils/queries.py b/django_pev/utils/queries.py new file mode 100644 index 0000000..7890710 --- /dev/null +++ b/django_pev/utils/queries.py @@ -0,0 +1,208 @@ +import dataclasses +from datetime import datetime + +from django.db import OperationalError, connection + +TIME_DURATION_UNITS = ( + ('week', 60*60*24*7*1000), + ('day', 60*60*24*1000), + ('hour', 60*60*1000), + ('min', 60*1000), + ('sec', 1000), + ('ms', 1) +) + +def human_time_duration(milliseconds: float) -> str: + if milliseconds == 0: + return 'inf' + parts = [] + for unit, div in TIME_DURATION_UNITS: + amount, milliseconds = divmod(int(milliseconds), div) + if amount > 0: + parts.append('{} {}'.format(amount, unit)) + return ' '.join(parts[:2]) + + +@dataclasses.dataclass +class LiveQueryInfo: + pid: int + database: str + state: str + source: str + duration: int + waiting: bool + query: str + started_at: datetime + duration_ms: float + user: str + backend_type: str + + @property + def is_long_running(self) -> bool: + if self.duration_ms: + return self.duration_ms > 1000 + return False + + +def get_live_queries_current_database() -> list[LiveQueryInfo]: + """Returns list of live queries""" + sql = """ +SELECT + pid, + datname as database, + state, + application_name AS source, + age(NOW(), COALESCE(query_start, xact_start)) AS duration, + wait_event is not null as waiting, + query, + COALESCE(query_start, xact_start) AS started_at, + EXTRACT(EPOCH FROM NOW() - COALESCE(query_start, xact_start)) * 1000.0 AS duration_ms, + usename AS user, + backend_type +FROM + pg_stat_activity +WHERE + pid <> pg_backend_pid() +and + datname = current_database() +ORDER BY +COALESCE(query_start, xact_start) DESC +""" + + with connection.cursor() as cursor: + cursor.execute(sql) + return list(LiveQueryInfo(*c) for c in cursor.fetchall()) + + +@dataclasses.dataclass +class QueryStatInfo: + + query: str + query_id: str + query_md5: str + user: str + total_time: float + mean_time: float + stddev_time: float + shared_blks_hit: int + shared_blks_dirtied: int + blk_read_time: int + temp_blks_written: int + temp_blks_read: int + rows: int + calls: int + total_percent_time: float + total_percent_calls: float + total_percent_shared_blks: float + calls_per_second: float + shared_blks_per_second: float + rows_per_second: float + rows_per_call: float + shared_blks_per_call: float + + @property + def total_time_formatted(self) -> str: + return human_time_duration(self.total_time) + + @property + def mean_time_formatted(self) -> str: + return human_time_duration(self.mean_time) + + @property + def stddev_time_formatted(self) -> str: + return human_time_duration(self.stddev_time) + + +def is_pg_stat_statements_installed() -> bool: + try: + with connection.cursor() as cursor: + cursor.execute("SELECT 1 FROM pg_extension WHERE extname = 'pg_stat_statements'") + assert cursor.fetchone() + cursor.execute("SELECT 1 FROM pg_stat_statements limit 1") + assert cursor.fetchone() + return True + except (AssertionError, OperationalError): + return False + + +def enable_pg_stat_statements(): + with connection.cursor() as cursor: + cursor.execute("CREATE EXTENSION IF NOT EXISTS pg_stat_statements") + +def reset_pg_stat_statements(): + with connection.cursor() as cursor: + cursor.execute("SELECT pg_stat_statements_reset()") + + +def get_query_stats() -> list[QueryStatInfo]: + if not is_pg_stat_statements_installed(): + return [] + + sql = """ +WITH query_stats AS ( + SELECT + LEFT(query, 10000) AS query, + queryid as query_id, + md5(query) as query_md5, + rolname AS user, + (total_plan_time + total_exec_time) as total_time, + mean_exec_time as mean_time, + stddev_exec_time as stddev_time, + shared_blks_hit, + shared_blks_dirtied, + blk_read_time, + temp_blks_written, + temp_blks_read, + rows, + calls + FROM + pg_stat_statements + INNER JOIN + pg_database ON pg_database.oid = pg_stat_statements.dbid + INNER JOIN + pg_roles ON pg_roles.oid = pg_stat_statements.userid + WHERE + calls > 0 + AND + pg_database.datname = current_database() +), totals AS ( + SELECT + SUM(total_plan_time + total_exec_time) as total_time, + SUM(calls) as total_calls, + SUM(shared_blks_hit) as total_shared_blks_hit, + SUM(shared_blks_dirtied) as total_shared_blks_dirtied, + (extract(epoch from now()) - (select extract( epoch from stats_reset) from pg_stat_statements_info)) as total_seconds + FROM pg_stat_statements +) +SELECT + query, + query_id, + query_md5, + query_stats.user, + query_stats.total_time, + mean_time, + stddev_time, + shared_blks_hit, + shared_blks_dirtied, + blk_read_time, + temp_blks_written, + temp_blks_read, + rows, + calls, + query_stats.total_time * 100.0 / totals.total_time AS total_percent_time, + calls * 100.0 / total_calls as total_percent_calls, + (shared_blks_hit + shared_blks_dirtied) * 100.0 / (totals.total_shared_blks_hit + totals.total_shared_blks_dirtied) as total_percent_shared_blks, + calls::float / total_seconds as calls_per_second, + (shared_blks_hit + shared_blks_dirtied)::float / total_seconds as shared_blks_per_second, + rows::float / total_seconds as rows_per_second, + (shared_blks_hit + shared_blks_dirtied)::float / calls as shared_blks_per_call, + rows::float/ calls as rows_per_call +FROM + query_stats +CROSS JOIN totals +ORDER BY query_stats.TOTAL_TIME desc +LIMIT 100 +""" + with connection.cursor() as cursor: + cursor.execute(sql) + return list(QueryStatInfo(*c) for c in cursor.fetchall()) diff --git a/django_pev/views.py b/django_pev/views.py index c137c0f..ae95542 100644 --- a/django_pev/views.py +++ b/django_pev/views.py @@ -3,7 +3,7 @@ from django.shortcuts import render from django.views.generic import TemplateView -from .utils import indexes, live_connections, maintenance, space +from .utils import indexes, live_connections, maintenance, queries, space # Create your views here. @@ -67,3 +67,22 @@ def get_context_data(self, **kwargs: Any) -> dict[str, Any]: ctx = super().get_context_data(**kwargs) ctx['connections'] = live_connections.get_connections_current_database() return ctx + +class LiveQueriesView(BaseView): + template_name = "django_pev/live_queries.html" + + def get_context_data(self, **kwargs: Any) -> dict[str, Any]: + ctx = super().get_context_data(**kwargs) + ctx['queries'] = queries.get_live_queries_current_database() + return ctx + +class QueriesView(BaseView): + template_name = "django_pev/queries.html" + + def get_context_data(self, **kwargs: Any) -> dict[str, Any]: + ctx = super().get_context_data(**kwargs) + ctx['queries'] = queries.get_query_stats() + ctx['is_pg_stats_enabled'] = queries.is_pg_stat_statements_installed() + ctx['queries_by_io'] = sorted(queries.get_query_stats(), key=lambda i: i.shared_blks_hit, reverse=True) + ctx['queries_by_slowest'] = sorted(queries.get_query_stats(), key=lambda i: i.mean_time, reverse=True) + return ctx From 1d0ec0308ec83fdfa0ac347219260f87813e3ddd Mon Sep 17 00:00:00 2001 From: William Chu Date: Tue, 16 Jan 2024 17:59:23 +1100 Subject: [PATCH 05/10] chore: formatted --- django_pev/urls.py | 14 +++--- django_pev/utils.py | 20 ++++----- django_pev/utils/indexes.py | 4 +- django_pev/utils/live_connections.py | 4 +- django_pev/utils/queries.py | 21 ++++----- django_pev/views.py | 24 ++++++---- example/school/migrations/0001_initial.py | 55 +++++++++++++++++------ example/urls.py | 2 +- 8 files changed, 91 insertions(+), 53 deletions(-) diff --git a/django_pev/urls.py b/django_pev/urls.py index 61a2dad..e9f643d 100755 --- a/django_pev/urls.py +++ b/django_pev/urls.py @@ -3,11 +3,11 @@ from . import views urlpatterns = [ - path('', views.QueriesView.as_view(), name="index"), - path('space', views.SpaceView.as_view(), name="space"), - path('maintenance', views.MaintenanceView.as_view(), name="maintenance"), - path('connections', views.ConnectionsView.as_view(), name="connections"), - path('indexes', views.IndexesView.as_view(), name="indexes"), - path('live-queries', views.LiveQueriesView.as_view(), name="live-queries"), - path('queries', views.QueriesView.as_view(), name="queries"), + path("", views.QueriesView.as_view(), name="index"), + path("space", views.SpaceView.as_view(), name="space"), + path("maintenance", views.MaintenanceView.as_view(), name="maintenance"), + path("connections", views.ConnectionsView.as_view(), name="connections"), + path("indexes", views.IndexesView.as_view(), name="indexes"), + path("live-queries", views.LiveQueriesView.as_view(), name="live-queries"), + path("queries", views.QueriesView.as_view(), name="queries"), ] diff --git a/django_pev/utils.py b/django_pev/utils.py index 7ebb29d..96efcb7 100644 --- a/django_pev/utils.py +++ b/django_pev/utils.py @@ -16,23 +16,24 @@ TIME_DURATION_UNITS = ( - ('week', 60*60*24*7*1000), - ('day', 60*60*24*1000), - ('hour', 60*60*1000), - ('min', 60*1000), - ('sec', 1000), - ('ms', 1) + ("week", 60 * 60 * 24 * 7 * 1000), + ("day", 60 * 60 * 24 * 1000), + ("hour", 60 * 60 * 1000), + ("min", 60 * 1000), + ("sec", 1000), + ("ms", 1), ) + def human_time_duration(milliseconds: int) -> str: if milliseconds == 0: - return 'inf' + return "inf" parts = [] for unit, div in TIME_DURATION_UNITS: amount, milliseconds = divmod(int(milliseconds), div) if amount > 0: - parts.append('{} {}{}'.format(amount, unit, "" if amount == 1 else "ms")) - return ', '.join(parts) + parts.append("{} {}{}".format(amount, unit, "" if amount == 1 else "ms")) + return ", ".join(parts) @dataclass(frozen=True) @@ -148,4 +149,3 @@ def explain( db_alias=db_alias, ) ) - diff --git a/django_pev/utils/indexes.py b/django_pev/utils/indexes.py index 79a20a4..3d36f59 100644 --- a/django_pev/utils/indexes.py +++ b/django_pev/utils/indexes.py @@ -68,7 +68,9 @@ def get_total_index_hitrate() -> float: return cursor.fetchone()[0] -def _update_indexes_with_duplicated_indexes(indexes: list[IndexInfo] | None = None) -> None: +def _update_indexes_with_duplicated_indexes( + indexes: list[IndexInfo] | None = None, +) -> None: """Modifies a list of indexes a reference to the other index that covers it""" indexes = indexes or get_indexes() indexes_by_table = {key: list(group) for key, group in groupby(indexes, lambda i: i.table_key)} diff --git a/django_pev/utils/live_connections.py b/django_pev/utils/live_connections.py index c23d8f3..04190f4 100644 --- a/django_pev/utils/live_connections.py +++ b/django_pev/utils/live_connections.py @@ -44,6 +44,6 @@ def get_connections_current_database() -> list[ConnectionInfo]: pg_stat_activity.pid """ with connection.cursor() as cursor: - database_name = connection.get_connection_params()['database'] + database_name = connection.get_connection_params()["database"] cursor.execute(sql, [database_name]) - return list(ConnectionInfo(*c) for c in cursor.fetchall()) \ No newline at end of file + return list(ConnectionInfo(*c) for c in cursor.fetchall()) diff --git a/django_pev/utils/queries.py b/django_pev/utils/queries.py index 7890710..041fdaf 100644 --- a/django_pev/utils/queries.py +++ b/django_pev/utils/queries.py @@ -4,23 +4,24 @@ from django.db import OperationalError, connection TIME_DURATION_UNITS = ( - ('week', 60*60*24*7*1000), - ('day', 60*60*24*1000), - ('hour', 60*60*1000), - ('min', 60*1000), - ('sec', 1000), - ('ms', 1) + ("week", 60 * 60 * 24 * 7 * 1000), + ("day", 60 * 60 * 24 * 1000), + ("hour", 60 * 60 * 1000), + ("min", 60 * 1000), + ("sec", 1000), + ("ms", 1), ) + def human_time_duration(milliseconds: float) -> str: if milliseconds == 0: - return 'inf' + return "inf" parts = [] for unit, div in TIME_DURATION_UNITS: amount, milliseconds = divmod(int(milliseconds), div) if amount > 0: - parts.append('{} {}'.format(amount, unit)) - return ' '.join(parts[:2]) + parts.append("{} {}".format(amount, unit)) + return " ".join(parts[:2]) @dataclasses.dataclass @@ -76,7 +77,6 @@ def get_live_queries_current_database() -> list[LiveQueryInfo]: @dataclasses.dataclass class QueryStatInfo: - query: str query_id: str query_md5: str @@ -129,6 +129,7 @@ def enable_pg_stat_statements(): with connection.cursor() as cursor: cursor.execute("CREATE EXTENSION IF NOT EXISTS pg_stat_statements") + def reset_pg_stat_statements(): with connection.cursor() as cursor: cursor.execute("SELECT pg_stat_statements_reset()") diff --git a/django_pev/views.py b/django_pev/views.py index ae95542..1717a4a 100644 --- a/django_pev/views.py +++ b/django_pev/views.py @@ -16,6 +16,7 @@ class BaseView(TemplateView): template_name = "django_pev/indexes_view.html" pass + class SpaceView(BaseView): template_name = "django_pev/space.html" @@ -51,38 +52,45 @@ def get_context_data(self, **kwargs: Any) -> dict[str, Any]: all_indexes = indexes.get_indexes() ctx["all_indexes"] = all_indexes ctx["unused_indexes"] = sorted( - [i for i in all_indexes if i.is_unused], key=lambda i: i.size_bytes, reverse=True + [i for i in all_indexes if i.is_unused], + key=lambda i: i.size_bytes, + reverse=True, ) ctx["duplicated_indexes"] = sorted( - [i for i in all_indexes if i.is_duplicated], key=lambda i: i.size_bytes, reverse=True + [i for i in all_indexes if i.is_duplicated], + key=lambda i: i.size_bytes, + reverse=True, ) ctx.update(indexes.get_index_stats()) return ctx + class ConnectionsView(BaseView): template_name = "django_pev/connections.html" def get_context_data(self, **kwargs: Any) -> dict[str, Any]: ctx = super().get_context_data(**kwargs) - ctx['connections'] = live_connections.get_connections_current_database() + ctx["connections"] = live_connections.get_connections_current_database() return ctx + class LiveQueriesView(BaseView): template_name = "django_pev/live_queries.html" def get_context_data(self, **kwargs: Any) -> dict[str, Any]: ctx = super().get_context_data(**kwargs) - ctx['queries'] = queries.get_live_queries_current_database() + ctx["queries"] = queries.get_live_queries_current_database() return ctx + class QueriesView(BaseView): template_name = "django_pev/queries.html" def get_context_data(self, **kwargs: Any) -> dict[str, Any]: ctx = super().get_context_data(**kwargs) - ctx['queries'] = queries.get_query_stats() - ctx['is_pg_stats_enabled'] = queries.is_pg_stat_statements_installed() - ctx['queries_by_io'] = sorted(queries.get_query_stats(), key=lambda i: i.shared_blks_hit, reverse=True) - ctx['queries_by_slowest'] = sorted(queries.get_query_stats(), key=lambda i: i.mean_time, reverse=True) + ctx["queries"] = queries.get_query_stats() + ctx["is_pg_stats_enabled"] = queries.is_pg_stat_statements_installed() + ctx["queries_by_io"] = sorted(queries.get_query_stats(), key=lambda i: i.shared_blks_hit, reverse=True) + ctx["queries_by_slowest"] = sorted(queries.get_query_stats(), key=lambda i: i.mean_time, reverse=True) return ctx diff --git a/example/school/migrations/0001_initial.py b/example/school/migrations/0001_initial.py index 285f497..170fda6 100644 --- a/example/school/migrations/0001_initial.py +++ b/example/school/migrations/0001_initial.py @@ -5,34 +5,61 @@ class Migration(migrations.Migration): - initial = True - dependencies = [ - ] + dependencies = [] operations = [ migrations.CreateModel( - name='Teacher', + name="Teacher", fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.TextField()), + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("name", models.TextField()), ], ), migrations.CreateModel( - name='Subject', + name="Subject", fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.TextField()), - ('teacher', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='school.teacher')), + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("name", models.TextField()), + ( + "teacher", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, to="school.teacher" + ), + ), ], ), migrations.CreateModel( - name='Student', + name="Student", fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.TextField()), - ('subjects', models.ManyToManyField(to='school.Subject')), + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("name", models.TextField()), + ("subjects", models.ManyToManyField(to="school.Subject")), ], ), ] diff --git a/example/urls.py b/example/urls.py index b4b4bc0..64ab2f9 100644 --- a/example/urls.py +++ b/example/urls.py @@ -17,5 +17,5 @@ from django.urls import path urlpatterns = [ - path('admin/', admin.site.urls), + path("admin/", admin.site.urls), ] From aeabe363caf3a2f65c9e670bb4d35cdc3ec75502 Mon Sep 17 00:00:00 2001 From: William Chu Date: Tue, 16 Jan 2024 18:02:14 +1100 Subject: [PATCH 06/10] feat: protect the view with superuser --- django_pev/templates/django_pev/base.html | 2 +- django_pev/views.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/django_pev/templates/django_pev/base.html b/django_pev/templates/django_pev/base.html index a39231b..356fa5b 100644 --- a/django_pev/templates/django_pev/base.html +++ b/django_pev/templates/django_pev/base.html @@ -54,7 +54,7 @@

    Django PEV

  • - Maintenance + Table Maintenance
diff --git a/django_pev/views.py b/django_pev/views.py index 1717a4a..4a91c82 100644 --- a/django_pev/views.py +++ b/django_pev/views.py @@ -1,5 +1,6 @@ from typing import Any +from django.contrib.auth.mixins import UserPassesTestMixin from django.shortcuts import render from django.views.generic import TemplateView @@ -12,9 +13,10 @@ def index(request): return render(request, "django_pev/index.html") -class BaseView(TemplateView): +class BaseView(UserPassesTestMixin, TemplateView): template_name = "django_pev/indexes_view.html" - pass + def test_func(self): + return self.request.user.is_superuser class SpaceView(BaseView): @@ -25,7 +27,6 @@ def get_context_data(self, **kwargs: Any) -> dict[str, Any]: ctx["database_size"] = space.get_database_size() ctx["tables"] = space.get_table_sizes() - # ctx['indexes'] = indexes.get_indexes() ctx["indexes"] = space.get_index_sizes() ctx["indexes_size"] = sum(c.size_bytes for c in ctx["indexes"]) From f922a09f5bdbed2a9281c462339a38fd93c4b1c1 Mon Sep 17 00:00:00 2001 From: William Chu Date: Wed, 17 Jan 2024 08:29:04 +1100 Subject: [PATCH 07/10] chore: add queries to nav --- django_pev/templates/django_pev/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_pev/templates/django_pev/base.html b/django_pev/templates/django_pev/base.html index 356fa5b..6dd8f40 100644 --- a/django_pev/templates/django_pev/base.html +++ b/django_pev/templates/django_pev/base.html @@ -28,7 +28,7 @@

Django PEV

  • - + Queries
    • From 8717eccd9849c3c5071d06f4af40e7c6f6bc52af Mon Sep 17 00:00:00 2001 From: William Chu Date: Wed, 17 Jan 2024 08:43:21 +1100 Subject: [PATCH 08/10] chore: update ruff config --- .pre-commit-config.yaml | 41 +- Makefile | 24 +- django_pev/utils/indexes.py | 8 +- django_pev/views.py | 1 + example/school/migrations/0001_initial.py | 4 +- poetry.lock | 462 ++++++---------------- pyproject.toml | 25 +- ruff.toml | 77 ++++ 8 files changed, 233 insertions(+), 409 deletions(-) create mode 100644 ruff.toml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5056ec8..e1e2734 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,26 +1,13 @@ repos: - - repo: https://github.com/hadialqattan/pycln - rev: v2.1.2 + - repo: https://github.com/astral-sh/ruff-pre-commit + # Ruff version. + rev: v0.1.13 hooks: - - id: pycln - args: - - --all - - repo: https://github.com/psf/black - rev: 22.10.0 - hooks: - - id: black - - repo: https://github.com/PyCQA/isort - rev: 5.10.1 - hooks: - - id: isort - - repo: https://github.com/PyCQA/flake8 - rev: 5.0.4 - hooks: - - id: flake8 - additional_dependencies: - - flake8-blind-except - - flake8-bugbear - - flake8-comprehensions + # Run the linter. + - id: ruff + args: [ --fix ] + # Run the formatter. + - id: ruff-format - repo: local hooks: - id: poetry run mypy @@ -37,14 +24,4 @@ repos: hooks: - id: commitizen stages: - - commit-msg - - repo: local - hooks: - - id: mypy - args: - - --show-error-codes - name: mypy - files: ^.*\.(py)$ - entry: poetry run mypy - require_serial: true - language: python + - commit-msg \ No newline at end of file diff --git a/Makefile b/Makefile index 6a87db5..14bec36 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,12 @@ -isort: - @echo "--- 🐍 Isorting 🐍 ---" - poetry run isort example test django_pev +format: + @echo "--- 🐶 Ruff Format 🐶 ---" + poetry run ruff format . -flake8: - @echo "--- 👏 Flaking 👏 ---" - poetry run flake8 +ruff: + @echo "--- 🐶 Ruff Lint 🐶 ---" + poetry run ruff check . --fix -black: - @echo "--- 🎩 Blacking 🎩 ---" - poetry run black . --check - -mypy: - @echo "--- ⚡ Mypying ⚡ ---" - poetry run mypy - -lint: isort flake8 black mypy +lint: ruff postgres: docker-compose up -d @@ -24,7 +16,7 @@ test: postgres @echo "--- 💃 Testing 💃 ---" poetry run python manage.py test -publish:ci +publish: ci poetry publish --build ci: test lint diff --git a/django_pev/utils/indexes.py b/django_pev/utils/indexes.py index 3d36f59..0dd16a5 100644 --- a/django_pev/utils/indexes.py +++ b/django_pev/utils/indexes.py @@ -101,11 +101,7 @@ def get_index_stats(indexes: list[IndexInfo] | None = None) -> dict: "count_unused_indexes": sum(1 for i in indexes if i.is_unused), } - ret["percent_duplicated_indexes"] = ( - float(ret["total_duplicated_indexes_size"]) / ret["total_indexes_size"] * 100 - ) # type:ignore - ret["percent_unused_indexes"] = ( - float(ret["total_unused_indexes_size"]) / ret["total_indexes_size"] * 100 - ) # type:ignore + ret["percent_duplicated_indexes"] = float(ret["total_duplicated_indexes_size"]) / ret["total_indexes_size"] * 100 # type:ignore + ret["percent_unused_indexes"] = float(ret["total_unused_indexes_size"]) / ret["total_indexes_size"] * 100 # type:ignore return ret diff --git a/django_pev/views.py b/django_pev/views.py index 4a91c82..9de6dd9 100644 --- a/django_pev/views.py +++ b/django_pev/views.py @@ -15,6 +15,7 @@ def index(request): class BaseView(UserPassesTestMixin, TemplateView): template_name = "django_pev/indexes_view.html" + def test_func(self): return self.request.user.is_superuser diff --git a/example/school/migrations/0001_initial.py b/example/school/migrations/0001_initial.py index 170fda6..a7792a0 100644 --- a/example/school/migrations/0001_initial.py +++ b/example/school/migrations/0001_initial.py @@ -40,9 +40,7 @@ class Migration(migrations.Migration): ("name", models.TextField()), ( "teacher", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, to="school.teacher" - ), + models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="school.teacher"), ), ], ), diff --git a/poetry.lock b/poetry.lock index 11c62cc..a8137dc 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2,107 +2,55 @@ [[package]] name = "asgiref" -version = "3.5.2" +version = "3.7.2" description = "ASGI specs, helper code, and adapters" optional = false python-versions = ">=3.7" files = [ - {file = "asgiref-3.5.2-py3-none-any.whl", hash = "sha256:1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4"}, - {file = "asgiref-3.5.2.tar.gz", hash = "sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424"}, + {file = "asgiref-3.7.2-py3-none-any.whl", hash = "sha256:89b2ef2247e3b562a16eef663bc0e2e703ec6468e2fa8a5cd61cd449786d4f6e"}, + {file = "asgiref-3.7.2.tar.gz", hash = "sha256:9e0ce3aa93a819ba5b45120216b23878cf6e8525eb3848653452b4192b92afed"}, ] [package.dependencies] -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} +typing-extensions = {version = ">=4", markers = "python_version < \"3.11\""} [package.extras] tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"] [[package]] -name = "black" -version = "22.10.0" -description = "The uncompromising code formatter." +name = "attrs" +version = "23.2.0" +description = "Classes Without Boilerplate" optional = false python-versions = ">=3.7" files = [ - {file = "black-22.10.0-1fixedarch-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:5cc42ca67989e9c3cf859e84c2bf014f6633db63d1cbdf8fdb666dcd9e77e3fa"}, - {file = "black-22.10.0-1fixedarch-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:5d8f74030e67087b219b032aa33a919fae8806d49c867846bfacde57f43972ef"}, - {file = "black-22.10.0-1fixedarch-cp37-cp37m-macosx_10_16_x86_64.whl", hash = "sha256:197df8509263b0b8614e1df1756b1dd41be6738eed2ba9e9769f3880c2b9d7b6"}, - {file = "black-22.10.0-1fixedarch-cp38-cp38-macosx_10_16_x86_64.whl", hash = "sha256:2644b5d63633702bc2c5f3754b1b475378fbbfb481f62319388235d0cd104c2d"}, - {file = "black-22.10.0-1fixedarch-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:e41a86c6c650bcecc6633ee3180d80a025db041a8e2398dcc059b3afa8382cd4"}, - {file = "black-22.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2039230db3c6c639bd84efe3292ec7b06e9214a2992cd9beb293d639c6402edb"}, - {file = "black-22.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:14ff67aec0a47c424bc99b71005202045dc09270da44a27848d534600ac64fc7"}, - {file = "black-22.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:819dc789f4498ecc91438a7de64427c73b45035e2e3680c92e18795a839ebb66"}, - {file = "black-22.10.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5b9b29da4f564ba8787c119f37d174f2b69cdfdf9015b7d8c5c16121ddc054ae"}, - {file = "black-22.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8b49776299fece66bffaafe357d929ca9451450f5466e997a7285ab0fe28e3b"}, - {file = "black-22.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:21199526696b8f09c3997e2b4db8d0b108d801a348414264d2eb8eb2532e540d"}, - {file = "black-22.10.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e464456d24e23d11fced2bc8c47ef66d471f845c7b7a42f3bd77bf3d1789650"}, - {file = "black-22.10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:9311e99228ae10023300ecac05be5a296f60d2fd10fff31cf5c1fa4ca4b1988d"}, - {file = "black-22.10.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:fba8a281e570adafb79f7755ac8721b6cf1bbf691186a287e990c7929c7692ff"}, - {file = "black-22.10.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:915ace4ff03fdfff953962fa672d44be269deb2eaf88499a0f8805221bc68c87"}, - {file = "black-22.10.0-cp38-cp38-win_amd64.whl", hash = "sha256:444ebfb4e441254e87bad00c661fe32df9969b2bf224373a448d8aca2132b395"}, - {file = "black-22.10.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:974308c58d057a651d182208a484ce80a26dac0caef2895836a92dd6ebd725e0"}, - {file = "black-22.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72ef3925f30e12a184889aac03d77d031056860ccae8a1e519f6cbb742736383"}, - {file = "black-22.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:432247333090c8c5366e69627ccb363bc58514ae3e63f7fc75c54b1ea80fa7de"}, - {file = "black-22.10.0-py3-none-any.whl", hash = "sha256:c957b2b4ea88587b46cf49d1dc17681c1e672864fd7af32fc1e9664d572b3458"}, - {file = "black-22.10.0.tar.gz", hash = "sha256:f513588da599943e0cde4e32cc9879e825d58720d6557062d1098c5ad80080e1"}, + {file = "attrs-23.2.0-py3-none-any.whl", hash = "sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1"}, + {file = "attrs-23.2.0.tar.gz", hash = "sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30"}, ] -[package.dependencies] -click = ">=8.0.0" -mypy-extensions = ">=0.4.3" -pathspec = ">=0.9.0" -platformdirs = ">=2" -tomli = {version = ">=1.1.0", markers = "python_full_version < \"3.11.0a7\""} -typed-ast = {version = ">=1.4.2", markers = "python_version < \"3.8\" and implementation_name == \"cpython\""} -typing-extensions = {version = ">=3.10.0.0", markers = "python_version < \"3.10\""} - [package.extras] -colorama = ["colorama (>=0.4.3)"] -d = ["aiohttp (>=3.7.4)"] -jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] -uvloop = ["uvloop (>=0.15.2)"] - -[[package]] -name = "click" -version = "8.1.3" -description = "Composable command line interface toolkit" -optional = false -python-versions = ">=3.7" -files = [ - {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"}, - {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"}, -] - -[package.dependencies] -colorama = {version = "*", markers = "platform_system == \"Windows\""} -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} - -[[package]] -name = "colorama" -version = "0.4.6" -description = "Cross-platform colored terminal text." -optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" -files = [ - {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, - {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, -] +cov = ["attrs[tests]", "coverage[toml] (>=5.3)"] +dev = ["attrs[tests]", "pre-commit"] +docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"] +tests = ["attrs[tests-no-zope]", "zope-interface"] +tests-mypy = ["mypy (>=1.6)", "pytest-mypy-plugins"] +tests-no-zope = ["attrs[tests-mypy]", "cloudpickle", "hypothesis", "pympler", "pytest (>=4.3.0)", "pytest-xdist[psutil]"] [[package]] name = "django" -version = "3.2.16" -description = "A high-level Python Web framework that encourages rapid development and clean, pragmatic design." +version = "4.2.9" +description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design." optional = false -python-versions = ">=3.6" +python-versions = ">=3.8" files = [ - {file = "Django-3.2.16-py3-none-any.whl", hash = "sha256:18ba8efa36b69cfcd4b670d0fa187c6fe7506596f0ababe580e16909bcdec121"}, - {file = "Django-3.2.16.tar.gz", hash = "sha256:3adc285124244724a394fa9b9839cc8cd116faf7d159554c43ecdaa8cdf0b94d"}, + {file = "Django-4.2.9-py3-none-any.whl", hash = "sha256:2cc2fc7d1708ada170ddd6c99f35cc25db664f165d3794bc7723f46b2f8c8984"}, + {file = "Django-4.2.9.tar.gz", hash = "sha256:12498cc3cb8bc8038539fef9e90e95f507502436c1f0c3a673411324fa675d14"}, ] [package.dependencies] -asgiref = ">=3.3.2,<4" -pytz = "*" -sqlparse = ">=0.2.2" +asgiref = ">=3.6.0,<4" +sqlparse = ">=0.3.1" +tzdata = {version = "*", markers = "sys_platform == \"win32\""} [package.extras] argon2 = ["argon2-cffi (>=19.1.0)"] @@ -110,36 +58,35 @@ bcrypt = ["bcrypt"] [[package]] name = "django-stubs" -version = "1.13.0" +version = "4.2.7" description = "Mypy stubs for Django" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "django-stubs-1.13.0.tar.gz", hash = "sha256:424fdd1935f859a802365056f9ccf4db12d1d93a5ab3de6d5633dddba0c5fc76"}, - {file = "django_stubs-1.13.0-py3-none-any.whl", hash = "sha256:eaecc1fc71532c1148f0c9687556651d880165476d7629bf318ff86a903a150c"}, + {file = "django-stubs-4.2.7.tar.gz", hash = "sha256:8ccd2ff4ee5adf22b9e3b7b1a516d2e1c2191e9d94e672c35cc2bc3dd61e0f6b"}, + {file = "django_stubs-4.2.7-py3-none-any.whl", hash = "sha256:4cf4de258fa71adc6f2799e983091b9d46cfc67c6eebc68fe111218c9a62b3b8"}, ] [package.dependencies] django = "*" -django-stubs-ext = ">=0.7.0" -mypy = ">=0.980" -tomli = "*" +django-stubs-ext = ">=4.2.7" +tomli = {version = "*", markers = "python_version < \"3.11\""} types-pytz = "*" types-PyYAML = "*" typing-extensions = "*" [package.extras] -compatible-mypy = ["mypy (>=0.980,<0.990)"] +compatible-mypy = ["mypy (>=1.7.0,<1.8.0)"] [[package]] name = "django-stubs-ext" -version = "0.7.0" +version = "4.2.7" description = "Monkey-patching and extensions for django-stubs" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "django-stubs-ext-0.7.0.tar.gz", hash = "sha256:4fd8cdbc68d1a421f21bb7e0d9e76d50f6a4b504d350ba786405daf536e90c21"}, - {file = "django_stubs_ext-0.7.0-py3-none-any.whl", hash = "sha256:d729fbc7fe8970a7e26b35956c35b48502516f011d523c0577bdfb02ed956284"}, + {file = "django-stubs-ext-4.2.7.tar.gz", hash = "sha256:519342ac0849cda1559746c9a563f03ff99f636b0ebe7c14b75e816a00dfddc3"}, + {file = "django_stubs_ext-4.2.7-py3-none-any.whl", hash = "sha256:45a5d102417a412e3606e3c358adb4744988a92b7b58ccf3fd64bddd5d04d14c"}, ] [package.dependencies] @@ -161,141 +108,62 @@ files = [ pyreadline = {version = "*", markers = "platform_system == \"Windows\""} pyrepl = ">=0.8.2" -[[package]] -name = "flake8" -version = "5.0.4" -description = "the modular source code checker: pep8 pyflakes and co" -optional = false -python-versions = ">=3.6.1" -files = [ - {file = "flake8-5.0.4-py2.py3-none-any.whl", hash = "sha256:7a1cf6b73744f5806ab95e526f6f0d8c01c66d7bbe349562d22dfca20610b248"}, - {file = "flake8-5.0.4.tar.gz", hash = "sha256:6fbe320aad8d6b95cec8b8e47bc933004678dc63095be98528b7bdd2a9f510db"}, -] - -[package.dependencies] -importlib-metadata = {version = ">=1.1.0,<4.3", markers = "python_version < \"3.8\""} -mccabe = ">=0.7.0,<0.8.0" -pycodestyle = ">=2.9.0,<2.10.0" -pyflakes = ">=2.5.0,<2.6.0" - -[[package]] -name = "importlib-metadata" -version = "4.2.0" -description = "Read metadata from Python packages" -optional = false -python-versions = ">=3.6" -files = [ - {file = "importlib_metadata-4.2.0-py3-none-any.whl", hash = "sha256:057e92c15bc8d9e8109738a48db0ccb31b4d9d5cfbee5a8670879a30be66304b"}, - {file = "importlib_metadata-4.2.0.tar.gz", hash = "sha256:b7e52a1f8dec14a75ea73e0891f3060099ca1d8e6a462a4dff11c3e119ea1b31"}, -] - -[package.dependencies] -typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} -zipp = ">=0.5" - -[package.extras] -docs = ["jaraco.packaging (>=8.2)", "rst.linker (>=1.9)", "sphinx"] -testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pep517", "pyfakefs", "pytest (>=4.6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.0.1)", "pytest-flake8", "pytest-mypy"] - -[[package]] -name = "isort" -version = "5.10.1" -description = "A Python utility / library to sort Python imports." -optional = false -python-versions = ">=3.6.1,<4.0" -files = [ - {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"}, - {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"}, -] - -[package.extras] -colors = ["colorama (>=0.4.3,<0.5.0)"] -pipfile-deprecated-finder = ["pipreqs", "requirementslib"] -plugins = ["setuptools"] -requirements-deprecated-finder = ["pip-api", "pipreqs"] - -[[package]] -name = "mccabe" -version = "0.7.0" -description = "McCabe checker, plugin for flake8" -optional = false -python-versions = ">=3.6" -files = [ - {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"}, - {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"}, -] - [[package]] name = "mypy" -version = "0.991" +version = "1.8.0" description = "Optional static typing for Python" optional = false -python-versions = ">=3.7" -files = [ - {file = "mypy-0.991-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:7d17e0a9707d0772f4a7b878f04b4fd11f6f5bcb9b3813975a9b13c9332153ab"}, - {file = "mypy-0.991-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0714258640194d75677e86c786e80ccf294972cc76885d3ebbb560f11db0003d"}, - {file = "mypy-0.991-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0c8f3be99e8a8bd403caa8c03be619544bc2c77a7093685dcf308c6b109426c6"}, - {file = "mypy-0.991-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc9ec663ed6c8f15f4ae9d3c04c989b744436c16d26580eaa760ae9dd5d662eb"}, - {file = "mypy-0.991-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4307270436fd7694b41f913eb09210faff27ea4979ecbcd849e57d2da2f65305"}, - {file = "mypy-0.991-cp310-cp310-win_amd64.whl", hash = "sha256:901c2c269c616e6cb0998b33d4adbb4a6af0ac4ce5cd078afd7bc95830e62c1c"}, - {file = "mypy-0.991-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:d13674f3fb73805ba0c45eb6c0c3053d218aa1f7abead6e446d474529aafc372"}, - {file = "mypy-0.991-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1c8cd4fb70e8584ca1ed5805cbc7c017a3d1a29fb450621089ffed3e99d1857f"}, - {file = "mypy-0.991-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:209ee89fbb0deed518605edddd234af80506aec932ad28d73c08f1400ef80a33"}, - {file = "mypy-0.991-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37bd02ebf9d10e05b00d71302d2c2e6ca333e6c2a8584a98c00e038db8121f05"}, - {file = "mypy-0.991-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:26efb2fcc6b67e4d5a55561f39176821d2adf88f2745ddc72751b7890f3194ad"}, - {file = "mypy-0.991-cp311-cp311-win_amd64.whl", hash = "sha256:3a700330b567114b673cf8ee7388e949f843b356a73b5ab22dd7cff4742a5297"}, - {file = "mypy-0.991-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:1f7d1a520373e2272b10796c3ff721ea1a0712288cafaa95931e66aa15798813"}, - {file = "mypy-0.991-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:641411733b127c3e0dab94c45af15fea99e4468f99ac88b39efb1ad677da5711"}, - {file = "mypy-0.991-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:3d80e36b7d7a9259b740be6d8d906221789b0d836201af4234093cae89ced0cd"}, - {file = "mypy-0.991-cp37-cp37m-win_amd64.whl", hash = "sha256:e62ebaad93be3ad1a828a11e90f0e76f15449371ffeecca4a0a0b9adc99abcef"}, - {file = "mypy-0.991-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:b86ce2c1866a748c0f6faca5232059f881cda6dda2a893b9a8373353cfe3715a"}, - {file = "mypy-0.991-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ac6e503823143464538efda0e8e356d871557ef60ccd38f8824a4257acc18d93"}, - {file = "mypy-0.991-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0cca5adf694af539aeaa6ac633a7afe9bbd760df9d31be55ab780b77ab5ae8bf"}, - {file = "mypy-0.991-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a12c56bf73cdab116df96e4ff39610b92a348cc99a1307e1da3c3768bbb5b135"}, - {file = "mypy-0.991-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:652b651d42f155033a1967739788c436491b577b6a44e4c39fb340d0ee7f0d70"}, - {file = "mypy-0.991-cp38-cp38-win_amd64.whl", hash = "sha256:4175593dc25d9da12f7de8de873a33f9b2b8bdb4e827a7cae952e5b1a342e243"}, - {file = "mypy-0.991-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:98e781cd35c0acf33eb0295e8b9c55cdbef64fcb35f6d3aa2186f289bed6e80d"}, - {file = "mypy-0.991-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6d7464bac72a85cb3491c7e92b5b62f3dcccb8af26826257760a552a5e244aa5"}, - {file = "mypy-0.991-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c9166b3f81a10cdf9b49f2d594b21b31adadb3d5e9db9b834866c3258b695be3"}, - {file = "mypy-0.991-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8472f736a5bfb159a5e36740847808f6f5b659960115ff29c7cecec1741c648"}, - {file = "mypy-0.991-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5e80e758243b97b618cdf22004beb09e8a2de1af481382e4d84bc52152d1c476"}, - {file = "mypy-0.991-cp39-cp39-win_amd64.whl", hash = "sha256:74e259b5c19f70d35fcc1ad3d56499065c601dfe94ff67ae48b85596b9ec1461"}, - {file = "mypy-0.991-py3-none-any.whl", hash = "sha256:de32edc9b0a7e67c2775e574cb061a537660e51210fbf6006b0b36ea695ae9bb"}, - {file = "mypy-0.991.tar.gz", hash = "sha256:3c0165ba8f354a6d9881809ef29f1a9318a236a6d81c690094c5df32107bde06"}, +python-versions = ">=3.8" +files = [ + {file = "mypy-1.8.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:485a8942f671120f76afffff70f259e1cd0f0cfe08f81c05d8816d958d4577d3"}, + {file = "mypy-1.8.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:df9824ac11deaf007443e7ed2a4a26bebff98d2bc43c6da21b2b64185da011c4"}, + {file = "mypy-1.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2afecd6354bbfb6e0160f4e4ad9ba6e4e003b767dd80d85516e71f2e955ab50d"}, + {file = "mypy-1.8.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:8963b83d53ee733a6e4196954502b33567ad07dfd74851f32be18eb932fb1cb9"}, + {file = "mypy-1.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:e46f44b54ebddbeedbd3d5b289a893219065ef805d95094d16a0af6630f5d410"}, + {file = "mypy-1.8.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:855fe27b80375e5c5878492f0729540db47b186509c98dae341254c8f45f42ae"}, + {file = "mypy-1.8.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4c886c6cce2d070bd7df4ec4a05a13ee20c0aa60cb587e8d1265b6c03cf91da3"}, + {file = "mypy-1.8.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d19c413b3c07cbecf1f991e2221746b0d2a9410b59cb3f4fb9557f0365a1a817"}, + {file = "mypy-1.8.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9261ed810972061388918c83c3f5cd46079d875026ba97380f3e3978a72f503d"}, + {file = "mypy-1.8.0-cp311-cp311-win_amd64.whl", hash = "sha256:51720c776d148bad2372ca21ca29256ed483aa9a4cdefefcef49006dff2a6835"}, + {file = "mypy-1.8.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:52825b01f5c4c1c4eb0db253ec09c7aa17e1a7304d247c48b6f3599ef40db8bd"}, + {file = "mypy-1.8.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f5ac9a4eeb1ec0f1ccdc6f326bcdb464de5f80eb07fb38b5ddd7b0de6bc61e55"}, + {file = "mypy-1.8.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:afe3fe972c645b4632c563d3f3eff1cdca2fa058f730df2b93a35e3b0c538218"}, + {file = "mypy-1.8.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:42c6680d256ab35637ef88891c6bd02514ccb7e1122133ac96055ff458f93fc3"}, + {file = "mypy-1.8.0-cp312-cp312-win_amd64.whl", hash = "sha256:720a5ca70e136b675af3af63db533c1c8c9181314d207568bbe79051f122669e"}, + {file = "mypy-1.8.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:028cf9f2cae89e202d7b6593cd98db6759379f17a319b5faf4f9978d7084cdc6"}, + {file = "mypy-1.8.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:4e6d97288757e1ddba10dd9549ac27982e3e74a49d8d0179fc14d4365c7add66"}, + {file = "mypy-1.8.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7f1478736fcebb90f97e40aff11a5f253af890c845ee0c850fe80aa060a267c6"}, + {file = "mypy-1.8.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:42419861b43e6962a649068a61f4a4839205a3ef525b858377a960b9e2de6e0d"}, + {file = "mypy-1.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:2b5b6c721bd4aabaadead3a5e6fa85c11c6c795e0c81a7215776ef8afc66de02"}, + {file = "mypy-1.8.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5c1538c38584029352878a0466f03a8ee7547d7bd9f641f57a0f3017a7c905b8"}, + {file = "mypy-1.8.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4ef4be7baf08a203170f29e89d79064463b7fc7a0908b9d0d5114e8009c3a259"}, + {file = "mypy-1.8.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7178def594014aa6c35a8ff411cf37d682f428b3b5617ca79029d8ae72f5402b"}, + {file = "mypy-1.8.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ab3c84fa13c04aeeeabb2a7f67a25ef5d77ac9d6486ff33ded762ef353aa5592"}, + {file = "mypy-1.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:99b00bc72855812a60d253420d8a2eae839b0afa4938f09f4d2aa9bb4654263a"}, + {file = "mypy-1.8.0-py3-none-any.whl", hash = "sha256:538fd81bb5e430cc1381a443971c0475582ff9f434c16cd46d2c66763ce85d9d"}, + {file = "mypy-1.8.0.tar.gz", hash = "sha256:6ff8b244d7085a0b425b56d327b480c3b29cafbd2eff27316a004f9a7391ae07"}, ] [package.dependencies] -mypy-extensions = ">=0.4.3" +mypy-extensions = ">=1.0.0" tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} -typed-ast = {version = ">=1.4.0,<2", markers = "python_version < \"3.8\""} -typing-extensions = ">=3.10" +typing-extensions = ">=4.1.0" [package.extras] dmypy = ["psutil (>=4.0)"] install-types = ["pip"] -python2 = ["typed-ast (>=1.4.0,<2)"] +mypyc = ["setuptools (>=50)"] reports = ["lxml"] [[package]] name = "mypy-extensions" -version = "0.4.3" -description = "Experimental type system extensions for programs checked with the mypy typechecker." +version = "1.0.0" +description = "Type system extensions for programs checked with the mypy type checker." optional = false -python-versions = "*" -files = [ - {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, - {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, -] - -[[package]] -name = "pathspec" -version = "0.10.2" -description = "Utility library for gitignore style pattern matching of file paths." -optional = false -python-versions = ">=3.7" +python-versions = ">=3.5" files = [ - {file = "pathspec-0.10.2-py3-none-any.whl", hash = "sha256:88c2606f2c1e818b978540f73ecc908e13999c6c3a383daf3705652ae79807a5"}, - {file = "pathspec-0.10.2.tar.gz", hash = "sha256:8f6bf73e5758fd365ef5d58ce09ac7c27d2833a8d7da51712eac6e27e35141b0"}, + {file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"}, + {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"}, ] [[package]] @@ -318,78 +186,42 @@ wmctrl = "*" funcsigs = ["funcsigs"] testing = ["funcsigs", "pytest"] -[[package]] -name = "platformdirs" -version = "2.5.4" -description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." -optional = false -python-versions = ">=3.7" -files = [ - {file = "platformdirs-2.5.4-py3-none-any.whl", hash = "sha256:af0276409f9a02373d540bf8480021a048711d572745aef4b7842dad245eba10"}, - {file = "platformdirs-2.5.4.tar.gz", hash = "sha256:1006647646d80f16130f052404c6b901e80ee4ed6bef6792e1f238a8969106f7"}, -] - -[package.extras] -docs = ["furo (>=2022.9.29)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.4)"] -test = ["appdirs (==1.4.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"] - [[package]] name = "psycopg2" -version = "2.9.5" +version = "2.9.9" description = "psycopg2 - Python-PostgreSQL Database Adapter" optional = false -python-versions = ">=3.6" -files = [ - {file = "psycopg2-2.9.5-cp310-cp310-win32.whl", hash = "sha256:d3ef67e630b0de0779c42912fe2cbae3805ebaba30cda27fea2a3de650a9414f"}, - {file = "psycopg2-2.9.5-cp310-cp310-win_amd64.whl", hash = "sha256:4cb9936316d88bfab614666eb9e32995e794ed0f8f6b3b718666c22819c1d7ee"}, - {file = "psycopg2-2.9.5-cp311-cp311-win32.whl", hash = "sha256:093e3894d2d3c592ab0945d9eba9d139c139664dcf83a1c440b8a7aa9bb21955"}, - {file = "psycopg2-2.9.5-cp311-cp311-win_amd64.whl", hash = "sha256:920bf418000dd17669d2904472efeab2b20546efd0548139618f8fa305d1d7ad"}, - {file = "psycopg2-2.9.5-cp36-cp36m-win32.whl", hash = "sha256:b9ac1b0d8ecc49e05e4e182694f418d27f3aedcfca854ebd6c05bb1cffa10d6d"}, - {file = "psycopg2-2.9.5-cp36-cp36m-win_amd64.whl", hash = "sha256:fc04dd5189b90d825509caa510f20d1d504761e78b8dfb95a0ede180f71d50e5"}, - {file = "psycopg2-2.9.5-cp37-cp37m-win32.whl", hash = "sha256:922cc5f0b98a5f2b1ff481f5551b95cd04580fd6f0c72d9b22e6c0145a4840e0"}, - {file = "psycopg2-2.9.5-cp37-cp37m-win_amd64.whl", hash = "sha256:1e5a38aa85bd660c53947bd28aeaafb6a97d70423606f1ccb044a03a1203fe4a"}, - {file = "psycopg2-2.9.5-cp38-cp38-win32.whl", hash = "sha256:f5b6320dbc3cf6cfb9f25308286f9f7ab464e65cfb105b64cc9c52831748ced2"}, - {file = "psycopg2-2.9.5-cp38-cp38-win_amd64.whl", hash = "sha256:1a5c7d7d577e0eabfcf15eb87d1e19314c8c4f0e722a301f98e0e3a65e238b4e"}, - {file = "psycopg2-2.9.5-cp39-cp39-win32.whl", hash = "sha256:322fd5fca0b1113677089d4ebd5222c964b1760e361f151cbb2706c4912112c5"}, - {file = "psycopg2-2.9.5-cp39-cp39-win_amd64.whl", hash = "sha256:190d51e8c1b25a47484e52a79638a8182451d6f6dff99f26ad9bd81e5359a0fa"}, - {file = "psycopg2-2.9.5.tar.gz", hash = "sha256:a5246d2e683a972e2187a8714b5c2cf8156c064629f9a9b1a873c1730d9e245a"}, -] - -[[package]] -name = "pycodestyle" -version = "2.9.1" -description = "Python style guide checker" -optional = false -python-versions = ">=3.6" -files = [ - {file = "pycodestyle-2.9.1-py2.py3-none-any.whl", hash = "sha256:d1735fc58b418fd7c5f658d28d943854f8a849b01a5d0a1e6f3f3fdd0166804b"}, - {file = "pycodestyle-2.9.1.tar.gz", hash = "sha256:2c9607871d58c76354b697b42f5d57e1ada7d261c261efac224b664affdc5785"}, -] - -[[package]] -name = "pyflakes" -version = "2.5.0" -description = "passive checker of Python programs" -optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" files = [ - {file = "pyflakes-2.5.0-py2.py3-none-any.whl", hash = "sha256:4579f67d887f804e67edb544428f264b7b24f435b263c4614f384135cea553d2"}, - {file = "pyflakes-2.5.0.tar.gz", hash = "sha256:491feb020dca48ccc562a8c0cbe8df07ee13078df59813b83959cbdada312ea3"}, + {file = "psycopg2-2.9.9-cp310-cp310-win32.whl", hash = "sha256:38a8dcc6856f569068b47de286b472b7c473ac7977243593a288ebce0dc89516"}, + {file = "psycopg2-2.9.9-cp310-cp310-win_amd64.whl", hash = "sha256:426f9f29bde126913a20a96ff8ce7d73fd8a216cfb323b1f04da402d452853c3"}, + {file = "psycopg2-2.9.9-cp311-cp311-win32.whl", hash = "sha256:ade01303ccf7ae12c356a5e10911c9e1c51136003a9a1d92f7aa9d010fb98372"}, + {file = "psycopg2-2.9.9-cp311-cp311-win_amd64.whl", hash = "sha256:121081ea2e76729acfb0673ff33755e8703d45e926e416cb59bae3a86c6a4981"}, + {file = "psycopg2-2.9.9-cp312-cp312-win32.whl", hash = "sha256:d735786acc7dd25815e89cc4ad529a43af779db2e25aa7c626de864127e5a024"}, + {file = "psycopg2-2.9.9-cp312-cp312-win_amd64.whl", hash = "sha256:a7653d00b732afb6fc597e29c50ad28087dcb4fbfb28e86092277a559ae4e693"}, + {file = "psycopg2-2.9.9-cp37-cp37m-win32.whl", hash = "sha256:5e0d98cade4f0e0304d7d6f25bbfbc5bd186e07b38eac65379309c4ca3193efa"}, + {file = "psycopg2-2.9.9-cp37-cp37m-win_amd64.whl", hash = "sha256:7e2dacf8b009a1c1e843b5213a87f7c544b2b042476ed7755be813eaf4e8347a"}, + {file = "psycopg2-2.9.9-cp38-cp38-win32.whl", hash = "sha256:ff432630e510709564c01dafdbe996cb552e0b9f3f065eb89bdce5bd31fabf4c"}, + {file = "psycopg2-2.9.9-cp38-cp38-win_amd64.whl", hash = "sha256:bac58c024c9922c23550af2a581998624d6e02350f4ae9c5f0bc642c633a2d5e"}, + {file = "psycopg2-2.9.9-cp39-cp39-win32.whl", hash = "sha256:c92811b2d4c9b6ea0285942b2e7cac98a59e166d59c588fe5cfe1eda58e72d59"}, + {file = "psycopg2-2.9.9-cp39-cp39-win_amd64.whl", hash = "sha256:de80739447af31525feddeb8effd640782cf5998e1a4e9192ebdf829717e3913"}, + {file = "psycopg2-2.9.9.tar.gz", hash = "sha256:d1454bde93fb1e224166811694d600e746430c006fbb031ea06ecc2ea41bf156"}, ] [[package]] name = "pygments" -version = "2.13.0" +version = "2.17.2" description = "Pygments is a syntax highlighting package written in Python." optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" files = [ - {file = "Pygments-2.13.0-py3-none-any.whl", hash = "sha256:f643f331ab57ba3c9d89212ee4a2dabc6e94f117cf4eefde99a0574720d14c42"}, - {file = "Pygments-2.13.0.tar.gz", hash = "sha256:56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1"}, + {file = "pygments-2.17.2-py3-none-any.whl", hash = "sha256:b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c"}, + {file = "pygments-2.17.2.tar.gz", hash = "sha256:da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367"}, ] [package.extras] plugins = ["importlib-metadata"] +windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pyreadline" @@ -411,17 +243,6 @@ files = [ {file = "pyrepl-0.9.0.tar.gz", hash = "sha256:292570f34b5502e871bbb966d639474f2b57fbfcd3373c2d6a2f3d56e681a775"}, ] -[[package]] -name = "pytz" -version = "2022.6" -description = "World timezone definitions, modern and historical" -optional = false -python-versions = "*" -files = [ - {file = "pytz-2022.6-py2.py3-none-any.whl", hash = "sha256:222439474e9c98fced559f1709d89e6c9cbf8d79c794ff3eb9f8800064291427"}, - {file = "pytz-2022.6.tar.gz", hash = "sha256:e89512406b793ca39f5971bc999cc538ce125c0e51c27941bef4568b460095e2"}, -] - [[package]] name = "ruff" version = "0.1.13" @@ -450,15 +271,20 @@ files = [ [[package]] name = "sqlparse" -version = "0.4.3" +version = "0.4.4" description = "A non-validating SQL parser." optional = false python-versions = ">=3.5" files = [ - {file = "sqlparse-0.4.3-py3-none-any.whl", hash = "sha256:0323c0ec29cd52bceabc1b4d9d579e311f3e4961b98d174201d5622a23b85e34"}, - {file = "sqlparse-0.4.3.tar.gz", hash = "sha256:69ca804846bb114d2ec380e4360a8a340db83f0ccf3afceeb1404df028f57268"}, + {file = "sqlparse-0.4.4-py3-none-any.whl", hash = "sha256:5430a4fe2ac7d0f93e66f1efc6e1338a41884b7ddf2a350cedd20ccc4d9d28f3"}, + {file = "sqlparse-0.4.4.tar.gz", hash = "sha256:d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c"}, ] +[package.extras] +dev = ["build", "flake8"] +doc = ["sphinx"] +test = ["pytest", "pytest-cov"] + [[package]] name = "tomli" version = "2.0.1" @@ -470,98 +296,68 @@ files = [ {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, ] -[[package]] -name = "typed-ast" -version = "1.5.4" -description = "a fork of Python 2 and 3 ast modules with type comment support" -optional = false -python-versions = ">=3.6" -files = [ - {file = "typed_ast-1.5.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:669dd0c4167f6f2cd9f57041e03c3c2ebf9063d0757dc89f79ba1daa2bfca9d4"}, - {file = "typed_ast-1.5.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:211260621ab1cd7324e0798d6be953d00b74e0428382991adfddb352252f1d62"}, - {file = "typed_ast-1.5.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:267e3f78697a6c00c689c03db4876dd1efdfea2f251a5ad6555e82a26847b4ac"}, - {file = "typed_ast-1.5.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c542eeda69212fa10a7ada75e668876fdec5f856cd3d06829e6aa64ad17c8dfe"}, - {file = "typed_ast-1.5.4-cp310-cp310-win_amd64.whl", hash = "sha256:a9916d2bb8865f973824fb47436fa45e1ebf2efd920f2b9f99342cb7fab93f72"}, - {file = "typed_ast-1.5.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:79b1e0869db7c830ba6a981d58711c88b6677506e648496b1f64ac7d15633aec"}, - {file = "typed_ast-1.5.4-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a94d55d142c9265f4ea46fab70977a1944ecae359ae867397757d836ea5a3f47"}, - {file = "typed_ast-1.5.4-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:183afdf0ec5b1b211724dfef3d2cad2d767cbefac291f24d69b00546c1837fb6"}, - {file = "typed_ast-1.5.4-cp36-cp36m-win_amd64.whl", hash = "sha256:639c5f0b21776605dd6c9dbe592d5228f021404dafd377e2b7ac046b0349b1a1"}, - {file = "typed_ast-1.5.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:cf4afcfac006ece570e32d6fa90ab74a17245b83dfd6655a6f68568098345ff6"}, - {file = "typed_ast-1.5.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ed855bbe3eb3715fca349c80174cfcfd699c2f9de574d40527b8429acae23a66"}, - {file = "typed_ast-1.5.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:6778e1b2f81dfc7bc58e4b259363b83d2e509a65198e85d5700dfae4c6c8ff1c"}, - {file = "typed_ast-1.5.4-cp37-cp37m-win_amd64.whl", hash = "sha256:0261195c2062caf107831e92a76764c81227dae162c4f75192c0d489faf751a2"}, - {file = "typed_ast-1.5.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2efae9db7a8c05ad5547d522e7dbe62c83d838d3906a3716d1478b6c1d61388d"}, - {file = "typed_ast-1.5.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7d5d014b7daa8b0bf2eaef684295acae12b036d79f54178b92a2b6a56f92278f"}, - {file = "typed_ast-1.5.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:370788a63915e82fd6f212865a596a0fefcbb7d408bbbb13dea723d971ed8bdc"}, - {file = "typed_ast-1.5.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4e964b4ff86550a7a7d56345c7864b18f403f5bd7380edf44a3c1fb4ee7ac6c6"}, - {file = "typed_ast-1.5.4-cp38-cp38-win_amd64.whl", hash = "sha256:683407d92dc953c8a7347119596f0b0e6c55eb98ebebd9b23437501b28dcbb8e"}, - {file = "typed_ast-1.5.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4879da6c9b73443f97e731b617184a596ac1235fe91f98d279a7af36c796da35"}, - {file = "typed_ast-1.5.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3e123d878ba170397916557d31c8f589951e353cc95fb7f24f6bb69adc1a8a97"}, - {file = "typed_ast-1.5.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ebd9d7f80ccf7a82ac5f88c521115cc55d84e35bf8b446fcd7836eb6b98929a3"}, - {file = "typed_ast-1.5.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98f80dee3c03455e92796b58b98ff6ca0b2a6f652120c263efdba4d6c5e58f72"}, - {file = "typed_ast-1.5.4-cp39-cp39-win_amd64.whl", hash = "sha256:0fdbcf2fef0ca421a3f5912555804296f0b0960f0418c440f5d6d3abb549f3e1"}, - {file = "typed_ast-1.5.4.tar.gz", hash = "sha256:39e21ceb7388e4bb37f4c679d72707ed46c2fbf2a5609b8b8ebc4b067d977df2"}, -] - [[package]] name = "types-pytz" -version = "2022.6.0.1" +version = "2023.3.1.1" description = "Typing stubs for pytz" optional = false python-versions = "*" files = [ - {file = "types-pytz-2022.6.0.1.tar.gz", hash = "sha256:d078196374d1277e9f9984d49373ea043cf2c64d5d5c491fbc86c258557bd46f"}, - {file = "types_pytz-2022.6.0.1-py3-none-any.whl", hash = "sha256:bea605ce5d5a5d52a8e1afd7656c9b42476e18a0f888de6be91587355313ddf4"}, + {file = "types-pytz-2023.3.1.1.tar.gz", hash = "sha256:cc23d0192cd49c8f6bba44ee0c81e4586a8f30204970fc0894d209a6b08dab9a"}, + {file = "types_pytz-2023.3.1.1-py3-none-any.whl", hash = "sha256:1999a123a3dc0e39a2ef6d19f3f8584211de9e6a77fe7a0259f04a524e90a5cf"}, ] [[package]] name = "types-pyyaml" -version = "6.0.12.2" +version = "6.0.12.12" description = "Typing stubs for PyYAML" optional = false python-versions = "*" files = [ - {file = "types-PyYAML-6.0.12.2.tar.gz", hash = "sha256:6840819871c92deebe6a2067fb800c11b8a063632eb4e3e755914e7ab3604e83"}, - {file = "types_PyYAML-6.0.12.2-py3-none-any.whl", hash = "sha256:1e94e80aafee07a7e798addb2a320e32956a373f376655128ae20637adb2655b"}, + {file = "types-PyYAML-6.0.12.12.tar.gz", hash = "sha256:334373d392fde0fdf95af5c3f1661885fa10c52167b14593eb856289e1855062"}, + {file = "types_PyYAML-6.0.12.12-py3-none-any.whl", hash = "sha256:c05bc6c158facb0676674b7f11fe3960db4f389718e19e62bd2b84d6205cfd24"}, ] [[package]] name = "typing-extensions" -version = "4.4.0" -description = "Backported and Experimental Type Hints for Python 3.7+" +version = "4.9.0" +description = "Backported and Experimental Type Hints for Python 3.8+" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "typing_extensions-4.4.0-py3-none-any.whl", hash = "sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e"}, - {file = "typing_extensions-4.4.0.tar.gz", hash = "sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa"}, + {file = "typing_extensions-4.9.0-py3-none-any.whl", hash = "sha256:af72aea155e91adfc61c3ae9e0e342dbc0cba726d6cba4b6c72c1f34e47291cd"}, + {file = "typing_extensions-4.9.0.tar.gz", hash = "sha256:23478f88c37f27d76ac8aee6c905017a143b0b1b886c3c9f66bc2fd94f9f5783"}, ] [[package]] -name = "wmctrl" -version = "0.4" -description = "A tool to programmatically control windows inside X" +name = "tzdata" +version = "2023.4" +description = "Provider of IANA time zone data" optional = false -python-versions = "*" +python-versions = ">=2" files = [ - {file = "wmctrl-0.4.tar.gz", hash = "sha256:66cbff72b0ca06a22ec3883ac3a4d7c41078bdae4fb7310f52951769b10e14e0"}, + {file = "tzdata-2023.4-py2.py3-none-any.whl", hash = "sha256:aa3ace4329eeacda5b7beb7ea08ece826c28d761cda36e747cfbf97996d39bf3"}, + {file = "tzdata-2023.4.tar.gz", hash = "sha256:dd54c94f294765522c77399649b4fefd95522479a664a0cec87f41bebc6148c9"}, ] [[package]] -name = "zipp" -version = "3.10.0" -description = "Backport of pathlib-compatible object wrapper for zip files" +name = "wmctrl" +version = "0.5" +description = "A tool to programmatically control windows inside X" optional = false -python-versions = ">=3.7" +python-versions = ">=2.7" files = [ - {file = "zipp-3.10.0-py3-none-any.whl", hash = "sha256:4fcb6f278987a6605757302a6e40e896257570d11c51628968ccb2a47e80c6c1"}, - {file = "zipp-3.10.0.tar.gz", hash = "sha256:7a7262fd930bd3e36c50b9a64897aec3fafff3dfdeec9623ae22b40e93f99bb8"}, + {file = "wmctrl-0.5-py2.py3-none-any.whl", hash = "sha256:ae695c1863a314c899e7cf113f07c0da02a394b968c4772e1936219d9234ddd7"}, + {file = "wmctrl-0.5.tar.gz", hash = "sha256:7839a36b6fe9e2d6fd22304e5dc372dbced2116ba41283ea938b2da57f53e962"}, ] +[package.dependencies] +attrs = "*" + [package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)"] -testing = ["flake8 (<5)", "func-timeout", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] +test = ["pytest"] [metadata] lock-version = "2.0" -python-versions = "^3.7" -content-hash = "76c803c2daa00ae20e2b97deaee32e45baa6260ed095f262a817aa76a7c9930d" +python-versions = "^3.10" +content-hash = "2d9f92c07fe0246a29e89d43ba5f1f786cf8cf3244bfe761270a62549e8794a8" diff --git a/pyproject.toml b/pyproject.toml index 1314ff7..bb25979 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,25 +1,22 @@ [tool.poetry] name = "django-pev" -version = "0.1.4" +version = "0.1.5" description = "Context manager to upload explain plans to https://explain.dalibo.com/" authors = ["william chu "] readme = "README.md" packages = [{ include = "django_pev" }] [tool.poetry.dependencies] -python = "^3.7" +python = "^3.10" sqlparse = "*" django = ">=3.2, <5.0.0" [tool.poetry.group.dev.dependencies] psycopg2 = "^2.9.5" pdbpp = "^0.10.3" -mypy = "^0.991" -black = "^22.10.0" -isort = "^5.10.1" -flake8 = "^5.0.4" -django-stubs = "^1.13.0" -ruff = "^0.1.13" +mypy = "^1.8.0" +django-stubs = "4.2.7" +ruff = "*" [tool.nitpick] # Generated by the 'nitpick init' command @@ -28,14 +25,4 @@ style = [ 'https://raw.githubusercontent.com/uptick/.github/main/nitpick/python.toml', 'py://nitpick/resources/any/commitizen', ] -cache = "never" - -[tool.black] -target-version = ["py310"] -line-length = 120 -include = "\\.pyi?$" -preview = true -force_exclude = "(\n /(\n | migrations\n )/\n | urls\\.py\n)\n" -[build-system] -requires = ["poetry-core"] -build-backend = "poetry.core.masonry.api" +cache = "never" \ No newline at end of file diff --git a/ruff.toml b/ruff.toml new file mode 100644 index 0000000..752be24 --- /dev/null +++ b/ruff.toml @@ -0,0 +1,77 @@ +# Exclude a variety of commonly ignored directories. +exclude = [ + ".bzr", + ".direnv", + ".eggs", + ".git", + ".git-rewrite", + ".hg", + ".ipynb_checkpoints", + ".mypy_cache", + ".nox", + ".pants.d", + ".pyenv", + ".pytest_cache", + ".pytype", + ".ruff_cache", + ".svn", + ".tox", + ".venv", + ".vscode", + "__pypackages__", + "_build", + "buck-out", + "build", + "dist", + "node_modules", + "site-packages", + "venv", +] + +# Same as Black. +line-length = 120 +indent-width = 4 + +# Assume Python 3.8 +target-version = "py310" + +[lint] +# Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`) codes by default. +# Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or +# McCabe complexity (`C901`) by default. +select = ["E4", "E7", "E9", "F", "W", "C901"] +ignore = [] + +# Allow fix for all enabled rules (when `--fix`) is provided. +fixable = ["ALL"] +unfixable = [] + +# Allow unused variables when underscore-prefixed. +dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$" + +[format] +# Like Black, use double quotes for strings. +quote-style = "double" + +# Like Black, indent with spaces, rather than tabs. +indent-style = "space" + +# Like Black, respect magic trailing commas. +skip-magic-trailing-comma = false + +# Like Black, automatically detect the appropriate line ending. +line-ending = "auto" + +# Enable auto-formatting of code examples in docstrings. Markdown, +# reStructuredText code/literal blocks and doctests are all supported. +# +# This is currently disabled by default, but it is planned for this +# to be opt-out in the future. +docstring-code-format = false + +# Set the line length limit used when formatting code snippets in +# docstrings. +# +# This only has an effect when the `docstring-code-format` setting is +# enabled. +docstring-code-line-length = "dynamic" \ No newline at end of file From da455d3f87ddb04741b48b158c7496ebfd089306 Mon Sep 17 00:00:00 2001 From: William Chu Date: Wed, 17 Jan 2024 08:47:06 +1100 Subject: [PATCH 09/10] chore: adding some vscode files to git --- .gitignore | 9 +++++++-- .vscode/settings.json | 10 ++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100755 .vscode/settings.json diff --git a/.gitignore b/.gitignore index 8b84167..68ec250 100644 --- a/.gitignore +++ b/.gitignore @@ -67,8 +67,13 @@ yarn-error.log *.sublime-workspace *.code-workspace -# VS Code editor -.vscode/ +### VisualStudioCode ### +.vscode/* # Maybe .vscode/**/* instead - see comments +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json + # Intellij IDEA and Pycharm per-user project settings .idea/ diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100755 index 0000000..f4c4e3d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,10 @@ +{ + "[python]": { + "editor.formatOnSave": true, + "editor.defaultFormatter": "charliermarsh.ruff", + "editor.codeActionsOnSave": { + "source.fixAll": true, + "source.organizeImports": true + } + } +} From d781ec0e0b1166c7509c642e9469bdbc3313f576 Mon Sep 17 00:00:00 2001 From: William Chu Date: Wed, 17 Jan 2024 09:03:50 +1100 Subject: [PATCH 10/10] chore: update lint configs --- .pre-commit-config.yaml | 25 +++++++++++++------------ pyproject.toml | 1 - 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e1e2734..2b53db2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,23 +5,24 @@ repos: hooks: # Run the linter. - id: ruff - args: [ --fix ] + args: [--fix] # Run the formatter. - id: ruff-format + + - repo: https://github.com/commitizen-tools/commitizen + rev: v3.13.0 + hooks: + - id: commitizen + stages: ["commit-msg"] + - repo: local hooks: - - id: poetry run mypy + - id: mypy args: - --show-error-codes name: mypy - files: ^.*\.(py)$ - entry: mypy + entry: poetry run mypy require_serial: true - language: python - - - repo: https://github.com/commitizen-tools/commitizen - rev: v2.37.0 - hooks: - - id: commitizen - stages: - - commit-msg \ No newline at end of file + language: system + types: + - python diff --git a/pyproject.toml b/pyproject.toml index bb25979..e97217b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,6 +23,5 @@ ruff = "*" # More info at https://nitpick.rtfd.io/en/latest/configuration.html style = [ 'https://raw.githubusercontent.com/uptick/.github/main/nitpick/python.toml', - 'py://nitpick/resources/any/commitizen', ] cache = "never" \ No newline at end of file