Skip to content

Commit

Permalink
black format
Browse files Browse the repository at this point in the history
  • Loading branch information
jlariza committed May 7, 2024
1 parent 38865b4 commit 3456edf
Show file tree
Hide file tree
Showing 17 changed files with 88 additions and 60 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ En este repositorio encontrarás tres carpetas:
```
docker compose -f local.yml build
docker compose -f local.yml up
```

Luego, ve a [http://localhost:3000/](http://localhost:3000/). Verás la página de inicio por defecto de cookie cutter
Expand Down
8 changes: 3 additions & 5 deletions django_project/config/settings/local.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# ruff: noqa: E501
from .base import * # noqa: F403
from .base import INSTALLED_APPS
from .base import MIDDLEWARE
from .base import WEBPACK_LOADER
from .base import env
from .base import INSTALLED_APPS, MIDDLEWARE, WEBPACK_LOADER, env

# GENERAL
# ------------------------------------------------------------------------------
Expand Down Expand Up @@ -31,7 +28,8 @@
# ------------------------------------------------------------------------------
# https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
EMAIL_BACKEND = env(
"DJANGO_EMAIL_BACKEND", default="django.core.mail.backends.console.EmailBackend",
"DJANGO_EMAIL_BACKEND",
default="django.core.mail.backends.console.EmailBackend",
)

# WhiteNoise
Expand Down
4 changes: 1 addition & 3 deletions django_project/config/settings/production.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# ruff: noqa: E501
from .base import * # noqa: F403
from .base import DATABASES
from .base import INSTALLED_APPS
from .base import env
from .base import DATABASES, INSTALLED_APPS, env

# GENERAL
# ------------------------------------------------------------------------------
Expand Down
7 changes: 4 additions & 3 deletions django_project/config/settings/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"""

from .base import * # noqa: F403
from .base import TEMPLATES
from .base import env
from .base import TEMPLATES, env

# GENERAL
# ------------------------------------------------------------------------------
Expand Down Expand Up @@ -36,6 +35,8 @@
MEDIA_URL = "http://media.testserver"
# django-webpack-loader
# ------------------------------------------------------------------------------
WEBPACK_LOADER["DEFAULT"]["LOADER_CLASS"] = "webpack_loader.loaders.FakeWebpackLoader" # noqa: F405
WEBPACK_LOADER["DEFAULT"][
"LOADER_CLASS"
] = "webpack_loader.loaders.FakeWebpackLoader" # noqa: F405
# Your stuff...
# ------------------------------------------------------------------------------
1 change: 1 addition & 0 deletions django_project/docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

import os
import sys

import django

if os.getenv("READTHEDOCS", default=False) == "True":
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import django.contrib.sites.models
from django.contrib.sites.models import _simple_domain_name_validator
from django.db import migrations
from django.db import models
from django.db import migrations, models


class Migration(migrations.Migration):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import django.contrib.sites.models
from django.db import migrations
from django.db import models
from django.db import migrations, models


class Migration(migrations.Migration):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
http://cookiecutter-django.readthedocs.io/en/latest/faq.html#why-is-there-a-django-contrib-sites-directory-in-cookiecutter-django
"""

from django.conf import settings
from django.db import migrations

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,41 +7,72 @@ class Migration(migrations.Migration):

initial = True

dependencies = [
]
dependencies = []

operations = [
migrations.CreateModel(
name='PokeAbility',
name="PokeAbility",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=255)),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=255)),
],
),
migrations.CreateModel(
name='PokeMove',
name="PokeMove",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=255)),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=255)),
],
),
migrations.CreateModel(
name='PokeType',
name="PokeType",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=255)),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=255)),
],
),
migrations.CreateModel(
name='Pokemon',
name="Pokemon",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('pokemon_id', models.IntegerField(unique=True)),
('name', models.CharField(max_length=255)),
('image', models.CharField(max_length=255)),
('abilities', models.ManyToManyField(to='pokemons.pokeability')),
('moves', models.ManyToManyField(to='pokemons.pokemove')),
('types', models.ManyToManyField(to='pokemons.poketype')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("pokemon_id", models.IntegerField(unique=True)),
("name", models.CharField(max_length=255)),
("image", models.CharField(max_length=255)),
("abilities", models.ManyToManyField(to="pokemons.pokeability")),
("moves", models.ManyToManyField(to="pokemons.pokemove")),
("types", models.ManyToManyField(to="pokemons.poketype")),
],
),
]
1 change: 1 addition & 0 deletions django_project/opensearch_workshop/pokemons/utils.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import requests
from django.conf import settings

from .models import PokeAbility, Pokemon, PokeMove, PokeType


Expand Down
3 changes: 1 addition & 2 deletions django_project/opensearch_workshop/users/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
from django.contrib.auth.decorators import login_required
from django.utils.translation import gettext_lazy as _

from .forms import UserAdminChangeForm
from .forms import UserAdminCreationForm
from .forms import UserAdminChangeForm, UserAdminCreationForm
from .models import User

if settings.DJANGO_ADMIN_FORCE_ALLAUTH:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import django.contrib.auth.models
import django.contrib.auth.validators
import django.utils.timezone
from django.db import migrations
from django.db import models
from django.db import migrations, models

import opensearch_workshop.users.models

Expand Down Expand Up @@ -32,7 +31,9 @@ class Migration(migrations.Migration):
(
"last_login",
models.DateTimeField(
blank=True, null=True, verbose_name="last login",
blank=True,
null=True,
verbose_name="last login",
),
),
(
Expand All @@ -42,7 +43,8 @@ class Migration(migrations.Migration):
help_text="Designates that this user has all permissions without explicitly assigning them.",
verbose_name="superuser status",
),
),(
),
(
"username",
models.CharField(
error_messages={
Expand All @@ -60,7 +62,9 @@ class Migration(migrations.Migration):
(
"email",
models.EmailField(
blank=True, max_length=254, verbose_name="email address",
blank=True,
max_length=254,
verbose_name="email address",
),
),
(
Expand All @@ -82,13 +86,16 @@ class Migration(migrations.Migration):
(
"date_joined",
models.DateTimeField(
default=django.utils.timezone.now, verbose_name="date joined",
default=django.utils.timezone.now,
verbose_name="date joined",
),
),
(
"name",
models.CharField(
blank=True, max_length=255, verbose_name="Name of User",
blank=True,
max_length=255,
verbose_name="Name of User",
),
),
(
Expand Down
7 changes: 4 additions & 3 deletions django_project/opensearch_workshop/users/tests/factories.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
from collections.abc import Sequence
from typing import Any

from factory import Faker
from factory import post_generation
from factory import Faker, post_generation
from factory.django import DjangoModelFactory

from opensearch_workshop.users.models import User
Expand All @@ -14,7 +13,9 @@ class UserFactory(DjangoModelFactory):
name = Faker("name")

@post_generation
def password(self, create: bool, extracted: Sequence[Any], **kwargs): # noqa: FBT001
def password(
self, create: bool, extracted: Sequence[Any], **kwargs
): # noqa: FBT001
password = (
extracted
if extracted
Expand Down
3 changes: 1 addition & 2 deletions django_project/opensearch_workshop/users/tests/test_urls.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from django.urls import resolve
from django.urls import reverse
from django.urls import resolve, reverse

from opensearch_workshop.users.models import User

Expand Down
8 changes: 3 additions & 5 deletions django_project/opensearch_workshop/users/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,16 @@
from django.contrib.auth.models import AnonymousUser
from django.contrib.messages.middleware import MessageMiddleware
from django.contrib.sessions.middleware import SessionMiddleware
from django.http import HttpRequest
from django.http import HttpResponseRedirect
from django.http import HttpRequest, HttpResponseRedirect
from django.test import RequestFactory
from django.urls import reverse
from django.utils.translation import gettext_lazy as _

from opensearch_workshop.users.forms import UserAdminChangeForm
from opensearch_workshop.users.models import User
from opensearch_workshop.users.tests.factories import UserFactory
from opensearch_workshop.users.views import UserRedirectView
from opensearch_workshop.users.views import UserUpdateView
from opensearch_workshop.users.views import user_detail_view
from opensearch_workshop.users.views import (UserRedirectView, UserUpdateView,
user_detail_view)

pytestmark = pytest.mark.django_db

Expand Down
4 changes: 1 addition & 3 deletions django_project/opensearch_workshop/users/urls.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
from django.urls import path

from .views import user_detail_view
from .views import user_redirect_view
from .views import user_update_view
from .views import user_detail_view, user_redirect_view, user_update_view

app_name = "users"
urlpatterns = [
Expand Down
4 changes: 1 addition & 3 deletions django_project/opensearch_workshop/users/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
from django.contrib.messages.views import SuccessMessageMixin
from django.urls import reverse
from django.utils.translation import gettext_lazy as _
from django.views.generic import DetailView
from django.views.generic import RedirectView
from django.views.generic import UpdateView
from django.views.generic import DetailView, RedirectView, UpdateView

from opensearch_workshop.users.models import User

Expand Down

0 comments on commit 3456edf

Please sign in to comment.