From 11bd5280820149b93e761d23c4975804c47c03be Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 23:21:13 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/pre-commit-hooks: v2.2.3 → v4.6.0](https://github.com/pre-commit/pre-commit-hooks/compare/v2.2.3...v4.6.0) - [github.com/PyCQA/isort: 5.6.4 → 5.13.2](https://github.com/PyCQA/isort/compare/5.6.4...5.13.2) - https://gitlab.com/pycqa/flake8 → https://github.com/PyCQA/flake8 - [github.com/PyCQA/flake8: 8f9b4931b9a28896fb43edccb23016a7540f5b82 → 7.0.0](https://github.com/PyCQA/flake8/compare/8f9b4931b9a28896fb43edccb23016a7540f5b82...7.0.0) - [github.com/humitos/mirrors-autoflake: v1.3 → v1.1](https://github.com/humitos/mirrors-autoflake/compare/v1.3...v1.1) - [github.com/psf/black: 19.10b0 → 24.4.2](https://github.com/psf/black/compare/19.10b0...24.4.2) --- .pre-commit-config.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9c988de..efff41a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ default_language_version: python: python3.9 repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.2.3 + rev: v4.6.0 hooks: - id: check-merge-conflict - id: check-added-large-files @@ -15,12 +15,12 @@ repos: - id: pretty-format-json args: ["--autofix", "--allow-missing-credentials"] - repo: https://github.com/PyCQA/isort - rev: 5.6.4 + rev: 5.13.2 hooks: - id: isort args: ["--profile", "black"] - - repo: https://gitlab.com/pycqa/flake8 - rev: "8f9b4931b9a28896fb43edccb23016a7540f5b82" + - repo: https://github.com/PyCQA/flake8 + rev: "7.0.0" hooks: - id: flake8 additional_dependencies: [flake8-print] @@ -28,14 +28,14 @@ repos: args: - --select=F401,F406,F821,T003 - repo: https://github.com/humitos/mirrors-autoflake - rev: v1.3 + rev: v1.1 hooks: - id: autoflake files: '\.py$' exclude: '^\..*' args: ["--in-place", "--remove-all-unused-imports"] - repo: https://github.com/psf/black - rev: 19.10b0 + rev: 24.4.2 hooks: - id: black args: ["--target-version", "py38"] From 7c4a3f0568ef27d3093f44d9777579c3fe4cfea7 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 23:21:50 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- accounts/migrations/0001_initial.py | 8 ++++++-- accounts/migrations/0003_auto_20200715_0405.py | 7 +++++-- common/views.py | 4 +++- invoices/migrations/0002_auto_20200510_0147.py | 4 +++- invoices/migrations/0003_auto_20200510_2040.py | 4 +++- invoices/migrations/0006_auto_20200610_0320.py | 13 ++++++++++--- invoices/views.py | 6 +++--- partners/migrations/0002_partner_notes.py | 4 +++- partners/migrations/0003_auto_20200510_2052.py | 12 +++++++++--- partners/migrations/0004_auto_20200609_0514.py | 4 +++- partners/migrations/0007_auto_20200715_0156.py | 3 ++- servers/migrations/0002_auto_20200612_0325.py | 14 +++++++++++--- tests/test_logic.py | 4 +++- 13 files changed, 64 insertions(+), 23 deletions(-) diff --git a/accounts/migrations/0001_initial.py b/accounts/migrations/0001_initial.py index 14c56b8..4d45a67 100644 --- a/accounts/migrations/0001_initial.py +++ b/accounts/migrations/0001_initial.py @@ -35,7 +35,11 @@ class Migration(migrations.Migration): ("last_name", models.CharField(max_length=32)), ("is_superuser", models.BooleanField()), ], - options={"abstract": False,}, - managers=[("objects", accounts.managers.AccountManager()),], + options={ + "abstract": False, + }, + managers=[ + ("objects", accounts.managers.AccountManager()), + ], ), ] diff --git a/accounts/migrations/0003_auto_20200715_0405.py b/accounts/migrations/0003_auto_20200715_0405.py index 7076137..fda5909 100644 --- a/accounts/migrations/0003_auto_20200715_0405.py +++ b/accounts/migrations/0003_auto_20200715_0405.py @@ -14,7 +14,8 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( - name="account", options={"ordering": ["first_name"]}, + name="account", + options={"ordering": ["first_name"]}, ), migrations.CreateModel( name="Shift", @@ -44,6 +45,8 @@ class Migration(migrations.Migration): ), ), ], - options={"ordering": ["-date"],}, + options={ + "ordering": ["-date"], + }, ), ] diff --git a/common/views.py b/common/views.py index f9ea1c0..a524922 100644 --- a/common/views.py +++ b/common/views.py @@ -26,7 +26,9 @@ def post(self, request): for chunk in new_template.chunks(): destination.write(chunk) messages.add_message( - request, messages.SUCCESS, "The settings have been sucessfully saved.", + request, + messages.SUCCESS, + "The settings have been sucessfully saved.", ) form = SettingsForm() diff --git a/invoices/migrations/0002_auto_20200510_0147.py b/invoices/migrations/0002_auto_20200510_0147.py index 8b583da..47ce150 100644 --- a/invoices/migrations/0002_auto_20200510_0147.py +++ b/invoices/migrations/0002_auto_20200510_0147.py @@ -11,6 +11,8 @@ class Migration(migrations.Migration): operations = [ migrations.RenameField( - model_name="invoiceitem", old_name="hours", new_name="worked_hours", + model_name="invoiceitem", + old_name="hours", + new_name="worked_hours", ), ] diff --git a/invoices/migrations/0003_auto_20200510_2040.py b/invoices/migrations/0003_auto_20200510_2040.py index 9943246..a27d2df 100644 --- a/invoices/migrations/0003_auto_20200510_2040.py +++ b/invoices/migrations/0003_auto_20200510_2040.py @@ -11,6 +11,8 @@ class Migration(migrations.Migration): operations = [ migrations.RenameField( - model_name="invoiceitem", old_name="title", new_name="description", + model_name="invoiceitem", + old_name="title", + new_name="description", ), ] diff --git a/invoices/migrations/0006_auto_20200610_0320.py b/invoices/migrations/0006_auto_20200610_0320.py index f0b8150..3833611 100644 --- a/invoices/migrations/0006_auto_20200610_0320.py +++ b/invoices/migrations/0006_auto_20200610_0320.py @@ -45,15 +45,22 @@ class Migration(migrations.Migration): ], ), migrations.RenameField( - model_name="invoice", old_name="guid", new_name="invoice_id", + model_name="invoice", + old_name="guid", + new_name="invoice_id", + ), + migrations.RemoveField( + model_name="invoice", + name="hourly_rate", ), - migrations.RemoveField(model_name="invoice", name="hourly_rate",), migrations.AlterField( model_name="invoice", name="status", field=models.PositiveSmallIntegerField(default=0), ), - migrations.DeleteModel(name="InvoiceItem",), + migrations.DeleteModel( + name="InvoiceItem", + ), migrations.AddField( model_name="item", name="invoice", diff --git a/invoices/views.py b/invoices/views.py index 4e59628..4cf0b86 100644 --- a/invoices/views.py +++ b/invoices/views.py @@ -99,9 +99,9 @@ def get(self, request): ) return HttpResponseRedirect(reverse("invoices:list")) response = HttpResponse(pdf, content_type="application/pdf") - response[ - "Content-Disposition" - ] = f'inline; filename="{self.invoice.invoice_id}.pdf"' + response["Content-Disposition"] = ( + f'inline; filename="{self.invoice.invoice_id}.pdf"' + ) return response diff --git a/partners/migrations/0002_partner_notes.py b/partners/migrations/0002_partner_notes.py index 566a479..61734f9 100644 --- a/partners/migrations/0002_partner_notes.py +++ b/partners/migrations/0002_partner_notes.py @@ -11,6 +11,8 @@ class Migration(migrations.Migration): operations = [ migrations.AddField( - model_name="partner", name="notes", field=models.TextField(blank=True), + model_name="partner", + name="notes", + field=models.TextField(blank=True), ), ] diff --git a/partners/migrations/0003_auto_20200510_2052.py b/partners/migrations/0003_auto_20200510_2052.py index cdda5fd..df0bf22 100644 --- a/partners/migrations/0003_auto_20200510_2052.py +++ b/partners/migrations/0003_auto_20200510_2052.py @@ -11,12 +11,18 @@ class Migration(migrations.Migration): operations = [ migrations.RenameField( - model_name="partner", old_name="manager_email", new_name="contact_email", + model_name="partner", + old_name="manager_email", + new_name="contact_email", ), migrations.RenameField( - model_name="partner", old_name="manager_name", new_name="contact_name", + model_name="partner", + old_name="manager_name", + new_name="contact_name", ), migrations.RenameField( - model_name="partner", old_name="manager_phone", new_name="contact_phone", + model_name="partner", + old_name="manager_phone", + new_name="contact_phone", ), ] diff --git a/partners/migrations/0004_auto_20200609_0514.py b/partners/migrations/0004_auto_20200609_0514.py index 3690106..21a0267 100644 --- a/partners/migrations/0004_auto_20200609_0514.py +++ b/partners/migrations/0004_auto_20200609_0514.py @@ -11,6 +11,8 @@ class Migration(migrations.Migration): operations = [ migrations.RenameField( - model_name="partner", old_name="guid", new_name="partner_id", + model_name="partner", + old_name="guid", + new_name="partner_id", ), ] diff --git a/partners/migrations/0007_auto_20200715_0156.py b/partners/migrations/0007_auto_20200715_0156.py index a622409..843415f 100644 --- a/partners/migrations/0007_auto_20200715_0156.py +++ b/partners/migrations/0007_auto_20200715_0156.py @@ -11,6 +11,7 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( - name="partner", options={"ordering": ["company"]}, + name="partner", + options={"ordering": ["company"]}, ), ] diff --git a/servers/migrations/0002_auto_20200612_0325.py b/servers/migrations/0002_auto_20200612_0325.py index e386d39..f910984 100644 --- a/servers/migrations/0002_auto_20200612_0325.py +++ b/servers/migrations/0002_auto_20200612_0325.py @@ -10,10 +10,18 @@ class Migration(migrations.Migration): ] operations = [ - migrations.RemoveField(model_name="server", name="ip_address",), - migrations.RemoveField(model_name="server", name="linode_label",), + migrations.RemoveField( + model_name="server", + name="ip_address", + ), + migrations.RemoveField( + model_name="server", + name="linode_label", + ), migrations.AlterField( - model_name="server", name="services", field=models.TextField(), + model_name="server", + name="services", + field=models.TextField(), ), migrations.AlterField( model_name="server", diff --git a/tests/test_logic.py b/tests/test_logic.py index 048dcc5..013a6e2 100644 --- a/tests/test_logic.py +++ b/tests/test_logic.py @@ -96,7 +96,9 @@ def test_incorrect_password(self): response, "The email and/or password you entered are incorrect." ) response = self.client.post( - "/accounts/login/", {"email": self.user.email, "password": ""}, follow=True, + "/accounts/login/", + {"email": self.user.email, "password": ""}, + follow=True, ) self.assertContains(response, "This field is required.") response = self.client.post(