Merge branch 'master' into cse_new_fields

.github/workflows/publish-python-package.yml

@@ -12,12 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.8"
           architecture: "x64"
@@ -46,8 +46,8 @@ jobs:
         with:
           user: __token__
           password: ${{ secrets.PYPI_TOKEN }}
-          packages_dir: cfl_common/dist/
-          skip_existing: true
+          packages-dir: cfl_common/dist/
+          skip-existing: true
       - name: Trigger staging deployment
         uses: actions/github-script@v6
         with:

portal/__init__.py

@@ -1 +1 @@
-__version__ = "6.44.7"
+__version__ = "6.44.9"

setup.py

@@ -5,7 +5,9 @@
 from setuptools import find_packages, setup
 
 with open("portal/__init__.py", "r") as fd:
-    version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1)
+    version = re.search(
+        r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE
+    ).group(1)
 
 try:
     from semantic_release import setup_hook
@@ -17,6 +19,8 @@
 setup(
     name="codeforlife-portal",
     version=version,
+    long_description=open("README.md", "r").read(),
+    long_description_content_type="text/markdown",
     packages=find_packages(),
     include_package_data=True,
     install_requires=[
@@ -32,7 +36,7 @@
         "reportlab==3.6.13",
         "django-formtools==2.2",
         "django-otp==1.0.2",  # we needed to fix this due to a wide ranged dependency in django-two-factor-auth
-        "requests==2.32.0",
+        "requests==2.32.2",
         "django-treebeard==4.3.1",
         "django-sekizai==2.0.0",
         "django-classy-tags==2.0.0",
@@ -46,6 +50,10 @@
         "setuptools==65.5.1",
         "django-import-export",
     ],
-    classifiers=["Programming Language :: Python", "Programming Language :: Python :: 3.8", "Framework :: Django"],
+    classifiers=[
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3.8",
+        "Framework :: Django",
+    ],
     zip_safe=False,
 )