Skip to content

Commit

Permalink
Merge branch 'main' into setup
Browse files Browse the repository at this point in the history
  • Loading branch information
vmagueta authored Jan 6, 2025
2 parents 9d28173 + bcd83c0 commit 30d3f00
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ipython:
test:
@.venv/bin/pytest -vs -s


lint:
@.venv/bin/pflake8 app kamila_project

Expand Down
3 changes: 2 additions & 1 deletion app/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ def base(request):
return render(request, "app/base.html")



def index(request):
return render(request, "app/index.html")


def blog(request):
posts = Post.objects.all().order_by("-created_at")
Expand Down
4 changes: 2 additions & 2 deletions kamila_project/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"django.contrib.messages",
"django.contrib.staticfiles",
"app",
# "livereload",
# "livereload",
]

MIDDLEWARE = [
Expand All @@ -51,7 +51,7 @@
"django.contrib.auth.middleware.AuthenticationMiddleware",
"django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware",
# "livereload.middleware.LiveReloadScript",
# "livereload.middleware.LiveReloadScript",
]

ROOT_URLCONF = "kamila_project.urls"
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ dependencies = [
[tool.setuptools.packages]
find = { where = ["app", "kamila_project"] }


[project.optional-dependencies]
test = [
"flake8",
"black",
"isort",
"pytest",
"pytest-django",
"livereload",
# "livereload",
]

[tool.flake8]
Expand Down
4 changes: 2 additions & 2 deletions requirements.dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ pytest-watch


# auto reload
django-livereload
django-livereload-server
# django-livereload
# django-livereload-server


# Code Quality
Expand Down

0 comments on commit 30d3f00

Please # to comment.