diff --git a/.github/workflows/ci.yml b/.github/workflows/ci-dj-htmx.yml similarity index 98% rename from .github/workflows/ci.yml rename to .github/workflows/ci-dj-htmx.yml index dd4ed76..177962b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci-dj-htmx.yml @@ -1,4 +1,4 @@ -name: CI +name: CI-djnago-htmx # Enable Buildkit and let compose use it to speed up image building env: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 31d2f0f..d8e17e7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,4 +1,4 @@ -exclude: '^docs/|/migrations/' +exclude: '^docs/|/htmxdj/docs/|/migrations/|/flask_app/|/fastapi_app/|/task_queue/|/tests/' default_stages: [commit] repos: diff --git a/htmxdj/config/settings/base.py b/htmxdj/config/settings/base.py index 0087f25..c58fabf 100644 --- a/htmxdj/config/settings/base.py +++ b/htmxdj/config/settings/base.py @@ -23,7 +23,7 @@ # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # though not all of them may be available with every OS. # In Windows, this must be set to your system time zone. -TIME_ZONE = "UTC +2" +TIME_ZONE = "Europe/Berlin" # https://docs.djangoproject.com/en/dev/ref/settings/#language-code LANGUAGE_CODE = "en-us" # https://docs.djangoproject.com/en/dev/ref/settings/#languages @@ -47,10 +47,13 @@ # https://docs.djangoproject.com/en/dev/ref/settings/#databases DATABASES = { - "default": env.db( - "DATABASE_URL", - default="postgres://localhost/htmxdj", - ), + "default": { + "ENGINE": "django.db.backends.postgresql", + "NAME": "htmx_dj", + "USER": "postgres", + "PASSWORD": "123", + "HOST": "localhost", + } } DATABASES["default"]["ATOMIC_REQUESTS"] = True # https://docs.djangoproject.com/en/stable/ref/settings/#std:setting-DEFAULT_AUTO_FIELD @@ -119,14 +122,16 @@ # https://docs.djangoproject.com/en/dev/ref/settings/#password-hashers PASSWORD_HASHERS = [ # https://docs.djangoproject.com/en/dev/topics/auth/passwords/#using-argon2-with-django - "django.contrib.auth.hashers.Argon2PasswordHasher", + # "django.contrib.auth.hashers.Argon2PasswordHasher", "django.contrib.auth.hashers.PBKDF2PasswordHasher", "django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher", "django.contrib.auth.hashers.BCryptSHA256PasswordHasher", ] # https://docs.djangoproject.com/en/dev/ref/settings/#auth-password-validators AUTH_PASSWORD_VALIDATORS = [ - {"NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator"}, + { + "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator" + }, {"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator"}, {"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator"}, {"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator"}, diff --git a/htmxdj/requirements/base.txt b/htmxdj/requirements/base.txt index ee5bbf5..09b6f68 100644 --- a/htmxdj/requirements/base.txt +++ b/htmxdj/requirements/base.txt @@ -1,7 +1,7 @@ python-slugify==8.0.1 # https://github.com/un33k/python-slugify Pillow==10.0.1 # https://github.com/python-pillow/Pillow -rcssmin==1.1.0 --install-option="--without-c-extensions" # https://github.com/ndparker/rcssmin -argon2-cffi==23.1.0 # https://github.com/hynek/argon2_cffi +# rcssmin==1.1.1 --install-option="--without-c-extensions" # https://github.com/ndparker/rcssmin +# argon2-cffi==23.1.0 # https://github.com/hynek/argon2_cffi whitenoise==6.5.0 # https://github.com/evansd/whitenoise redis==5.0.0 # https://github.com/redis/redis-py