Merge branch 'master' into prompt-engineering

Author: martin-martin

.github/workflows/linters.yml

@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {name: Linux311, python: '3.11.0-rc.1', os: ubuntu-latest}
+          - {name: Linux311, python: '3.11.5', os: ubuntu-latest}
     steps:
     - name: Check out repository
       uses: actions/checkout@v2
@@ -33,9 +33,9 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ./venv
-        key: ${{ matrix.name }}-pip-${{ hashFiles('requirements.txt') }}
+        key: ${{ matrix.name }}-v1-pip-${{ hashFiles('requirements.txt') }}
         restore-keys: |
-          ${{ matrix.name }}-pip-
+          ${{ matrix.name }}-v1-pip-
 
     - name: Install dependencies
       if: steps.cache.outputs.cache-hit != 'true'

build-a-blog-from-scratch-django/README.md

@@ -0,0 +1,57 @@
+# Create Your Own Blog With Django
+
+Follow the [step-by-step instructions](https://realpython.com/get-started-with-django-1/) on Real Python to build your own blog with Django.
+
+## Setup
+
+You can run the provided example project on your local machine by following the steps outlined below.
+
+Create a new virtual environment:
+
+```bash
+$ python3 -m venv venv
+```
+
+Activate the virtual environment:
+
+```bash
+$ source venv/bin/activate
+```
+
+Install the dependencies for this project if you haven't installed them yet:
+
+```bash
+(venv) $ python -m pip install -r requirements.txt
+```
+
+Make and apply the migrations for the project to build your local database:
+
+```bash
+(venv) $ python manage.py makemigrations
+(venv) $ python manage.py migrate
+```
+
+Run the Django development server:
+
+```bash
+(venv) $ python manage.py runserver
+```
+
+Navigate to `http://localhost:8000/` to see your blog in action.
+
+## Using the Django Admin site
+
+To create new posts, you need to create a superuser:
+
+```bash
+(venv) $ python manage.py createsuperuser
+Username (leave blank to use 'root'): admin
+Email address: [email protected]
+Password: RealPyth0n
+Password (again): RealPyth0n
+Superuser created successfully.
+```
+
+When running the `createsuperuser` managemant command you're prompted to choose a username, provide an email address, and set a password. Use your own data for these fields and make sure to remember them.
+
+Navigate to `http://localhost:8000/admin` and log in with the credentials you just used to create a superuser. 

rp-portfolio/blog/__init__.py …atch-django/django-blog/blog/__init__.pyrp-portfolio/blog/__init__.py renamed to build-a-blog-from-scratch-django/django-blog/blog/__init__.py rp-portfolio/blog/__init__.py renamed to build-a-blog-from-scratch-django/django-blog/blog/__init__.py

@@ -1,14 +1,19 @@
 from django.contrib import admin
-from blog.models import Post, Category
+from blog.models import Category, Comment, Post
+
+
+class CategoryAdmin(admin.ModelAdmin):
+    pass
 
 
 class PostAdmin(admin.ModelAdmin):
     pass
 
 
-class CategoryAdmin(admin.ModelAdmin):
+class CommentAdmin(admin.ModelAdmin):
     pass
 
 
-admin.site.register(Post, PostAdmin)
 admin.site.register(Category, CategoryAdmin)
+admin.site.register(Post, PostAdmin)
+admin.site.register(Comment, CommentAdmin)

rp-portfolio/blog/admin.py …scratch-django/django-blog/blog/admin.pyrp-portfolio/blog/admin.py renamed to build-a-blog-from-scratch-django/django-blog/blog/admin.py rp-portfolio/blog/admin.py renamed to build-a-blog-from-scratch-django/django-blog/blog/admin.py

@@ -2,4 +2,5 @@
 
 
 class BlogConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
     name = "blog"

rp-portfolio/blog/apps.py …-scratch-django/django-blog/blog/apps.pyrp-portfolio/blog/apps.py renamed to build-a-blog-from-scratch-django/django-blog/blog/apps.py rp-portfolio/blog/apps.py renamed to build-a-blog-from-scratch-django/django-blog/blog/apps.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.1.4 on 2018-12-16 19:11
+# Generated by Django 4.2.4 on 2023-08-29 12:43
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -15,40 +15,29 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Category',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True,
-                                        serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=20)),
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=30)),
             ],
         ),
         migrations.CreateModel(
-            name='Comment',
+            name='Post',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True,
-                                        serialize=False, verbose_name='ID')),
-                ('author', models.CharField(max_length=60)),
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255)),
                 ('body', models.TextField()),
                 ('created_on', models.DateTimeField(auto_now_add=True)),
+                ('last_modified', models.DateTimeField(auto_now=True)),
+                ('categories', models.ManyToManyField(related_name='posts', to='blog.category')),
             ],
         ),
         migrations.CreateModel(
-            name='Post',
+            name='Comment',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True,
-                                        serialize=False, verbose_name='ID')),
-                ('title', models.CharField(max_length=255)),
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('author', models.CharField(max_length=60)),
                 ('body', models.TextField()),
                 ('created_on', models.DateTimeField(auto_now_add=True)),
-                ('last_modified', models.DateTimeField(auto_now=True)),
-                ('categories', models.ManyToManyField(related_name='posts',
-                                                      to='blog.Category')),
+                ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='blog.post')),
             ],
         ),
-        migrations.AddField(
-            model_name='comment',
-            name='post',
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                to='blog.Post'
-            ),
-        ),
     ]

rp-portfolio/blog/forms.py …scratch-django/django-blog/blog/forms.pyrp-portfolio/blog/forms.py renamed to build-a-blog-from-scratch-django/django-blog/blog/forms.py rp-portfolio/blog/forms.py renamed to build-a-blog-from-scratch-django/django-blog/blog/forms.py

@@ -2,7 +2,13 @@
 
 
 class Category(models.Model):
-    name = models.CharField(max_length=20)
+    name = models.CharField(max_length=30)
+
+    class Meta:
+        verbose_name_plural = "categories"
+
+    def __str__(self):
+        return self.name
 
 
 class Post(models.Model):
@@ -12,9 +18,15 @@ class Post(models.Model):
     last_modified = models.DateTimeField(auto_now=True)
     categories = models.ManyToManyField("Category", related_name="posts")
 
+    def __str__(self):
+        return self.title
+
 
 class Comment(models.Model):
     author = models.CharField(max_length=60)
     body = models.TextField()
     created_on = models.DateTimeField(auto_now_add=True)
     post = models.ForeignKey("Post", on_delete=models.CASCADE)
+
+    def __str__(self):
+        return f"{self.author} on '{self.post}'"

…ortfolio/blog/migrations/0001_initial.py …ngo-blog/blog/migrations/0001_initial.pyrp-portfolio/blog/migrations/0001_initial.py renamed to build-a-blog-from-scratch-django/django-blog/blog/migrations/0001_initial.py rp-portfolio/blog/migrations/0001_initial.py renamed to build-a-blog-from-scratch-django/django-blog/blog/migrations/0001_initial.py

@@ -0,0 +1,5 @@
+{% extends "blog/index.html" %}
+
+{% block page_title %}
+<h2>{{ category }}</h2>
+{% endblock page_title %}