Merge branch 'main' into 339_packaging_for_nix

Author: chinyeungli

.github/workflows/run-unit-tests.yml

@@ -45,7 +45,12 @@ jobs:
       - name: Install python-ldap OS dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y libldap2-dev libsasl2-dev
+          sudo apt-get install -y libldap2-dev libsasl2-dev slapd ldap-utils
+
+      - name: Disable AppArmor for slapd
+        run: |
+          sudo ln -s /etc/apparmor.d/usr.sbin.slapd /etc/apparmor.d/disable/
+          sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.slapd
 
       - name: Install dependencies
         run: make dev envfile

CHANGELOG.rst

@@ -1,6 +1,18 @@
 Release notes
 =============
 
+### Version 5.4.2
+
+- Migrate the LDAP testing from using mockldap to slapdtest.
+  The mockldap and funcparserlib dependencies has been removed.
+  https://github.com/aboutcode-org/dejacode/issues/394
+
+### Version 5.4.1
+
+- Upgrade Django to latest security release 5.2.7
+  Also upgrade dependencies to latest releases.
+  https://github.com/aboutcode-org/dejacode/pull/389
+
 ### Version 5.4.0
 
 - Upgrade Python version to 3.13 and Django to 5.2.x

Dockerfile

@@ -36,6 +36,8 @@ RUN apt-get update \
       build-essential \
       libldap2-dev \
       libsasl2-dev \
+      slapd \
+      ldap-utils \
       libpq5 \
       git \
       wait-for-it \

dejacode/__init__.py

@@ -14,7 +14,7 @@
 
 import git
 
-VERSION = "5.4.0"
+VERSION = "5.4.1"
 
 PROJECT_DIR = Path(__file__).resolve().parent
 ROOT_DIR = PROJECT_DIR.parent

dejacode/static/css/dejacode_bootstrap.css

@@ -717,6 +717,9 @@ body.signup-form .nav-link.active {
 body.signup-form label {
   display: none;
 }
+body.signup-form label.altcha-label {
+  display: initial !important;
+}
 body.signup-form #div_id_updates_email_notification label {
   display: block;
   margin-bottom: 0!important;

dje/registration.py

@@ -88,8 +88,9 @@ class DejaCodeRegistrationForm(RegistrationFormUniqueEmail):
 
     use_required_attribute = True
     captcha = AltchaField(
-        floating=True,
+        floating="auto",
         hidefooter=True,
+        hidelogo=True,
     )
 
     class Meta(RegistrationFormUniqueEmail.Meta):