Skip to content

Commit

Permalink
Merge branch 'master' into feat-intelligent-related-posts
Browse files Browse the repository at this point in the history
  • Loading branch information
John Solly authored Nov 10, 2023
2 parents 0786024 + a854216 commit 4d2e9e1
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 17 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

[![awesome-django-blog-tests](https://github.com/jsolly/awesome-django-blog/actions/workflows/django-test-deploy-master.yaml/badge.svg)](https://github.com/jsolly/awesome-django-blog/actions/workflows/django-test-deploy-master.yaml)
[![Coverage Status](https://coveralls.io/repos/github/jsolly/awesome-django-blog/badge.svg?branch=master&service=github)](https://coveralls.io/github/jsolly/awesome-django-blog?branch=master)
![CodeStyle](https://img.shields.io/badge/code%20style-black-000000.svg)
![Linting](https://img.shields.io/badge/linting-ruff-orange)
[![Python Version](https://img.shields.io/badge/python-3.10-brightgreen.svg)](https://www.python.org/downloads/)
[![License](http://img.shields.io/:license-mit-blue.svg?style=flat-square)](http://badges.mit-license.org)
![CodeStyle](https://img.shields.io/badge/ruff-orange?logo=ruff&label=code-style)
![Linting](https://img.shields.io/badge/ruff-orange?logo=ruff&label=linting)
![PythonVersion](https://img.shields.io/badge/3.11-yellow?logo=Python&logoColor=yellow&label=Python)
[![License](https://img.shields.io/:license-mit-blue.svg?style=flat-square)](http://badges.mit-license.org)

Awesome-django-blog is a fully functional blogging platform built using the Django web framework. It includes features such as creating and managing blog posts, comments, and categories, as well as user authentication and authorization.

Expand Down Expand Up @@ -89,7 +89,7 @@ ruff --config ./config/pyproject.toml app
### Formating

```shell
black --config ./config/pyproject.toml app
ruff format app
```

Also see the [actions tab](https://github.com/jsolly/awesome-django-blog/actions)
Expand Down Expand Up @@ -143,7 +143,7 @@ $ pre-commit install
- 100% linted with [ruff](https://pypi.org/project/ruff/) and PEP8 compliant for beautiful Python code.
- Static scans with [CodeQL](https://codeql.github.com/) and pip
dependency checks with [Dependabot](https://github.com/dependabot) for automated security and updates.
- Formatted with [Black](https://pypi.org/project/black/) for beauty and readability
- Formatted with [Ruff](https://github.com/astral-sh/ruff) for beauty and speed.
- Strict Content Security Policy preventing inline styles and scripts for better security
- Subresource Integrity for better security
- [A+ Score on Mozilla Observatory](<[url](https://observatory.mozilla.org/analyze/blogthedata.com)>)
Expand Down
1 change: 0 additions & 1 deletion app/app/settings/docker_dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@
SECURE_SSL_REDIRECT = False
SECURE_BROWSER_XSS_FILTER = False
SECURE_CONTENT_TYPE_NOSNIFF = False

2 changes: 1 addition & 1 deletion app/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def test_update_post_view(self):
"content": "Long ago, the four nations lived together in harmony. Then everything changed when the fire nation attacked.",
"metaimg_alt_txt": "Meta Image Alt-Text Update",
# date_posted : ""
"author": self.admin_user
"author": self.admin_user,
# "likes"
# "views"
}
Expand Down
6 changes: 0 additions & 6 deletions config/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,3 @@ repos:
hooks:
- id: ruff
args: ["--config", "config/pyproject.toml"]

- repo: https://github.com/psf/black
rev: 23.1.0
hooks:
- id: black
args: ["--config", "config/pyproject.toml"]
2 changes: 1 addition & 1 deletion config/awesome-django-blog-MacOS.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
"editor.formatOnSave": true,
"[python]": {
"editor.defaultFormatter": "ms-python.black-formatter"
"editor.defaultFormatter": "charliermarsh.ruff"
},
}
}
2 changes: 1 addition & 1 deletion docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ If you find any bugs, issues or errors while using the app, please submit a new

## Contributions

We welcome any contributions to the project, including bug fixes, feature requests, and general improvements. When contributing, please make sure to follow our coding standards, which include using ruff for code linting and Black for code formatting. Additionally, we suggest using conventional commits for commit messages to maintain consistency in our commit history.
We welcome any contributions to the project, including bug fixes, feature requests, and general improvements. When contributing, please make sure to follow our coding standards, which include using ruff for code linting and code formatting. Additionally, we suggest using conventional commits for commit messages to maintain consistency in our commit history.

## Testing

Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ django-ckeditor==6.4.2


## Development Dependencies
black==23.9.1
coverage==7.2.7
django-coverage-plugin==3.1.0
django-fastdev==1.7.3
Expand Down

0 comments on commit 4d2e9e1

Please sign in to comment.