Merge branch 'main' into ottobot

dropseed · Aug 16, 2024 · cef9fee · cef9fee
2 parents 8aba1c4 + c26fdc1
commit cef9fee
Show file tree

Hide file tree

Showing 129 changed files with 3,919 additions and 5,334 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.11", "3.12"]
-        package: ["plain", "plain-worker", "plain-flags", "plain-sessions", "plain-staff"]
+        package: ["plain", "plain-worker", "plain-flags", "plain-sessions", "plain-staff", "plain-oauth"]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .venv
+.env
 *.egg-info
 *.py[co]
 __pycache__

diff --git a/plain-auth/README.md b/plain-auth/README.md
@@ -24,7 +24,6 @@ INSTALLED_PACKAGES = [
 
 MIDDLEWARE = [
     "plain.middleware.security.SecurityMiddleware",
-    "plain.assets.whitenoise.middleware.WhiteNoiseMiddleware",
     "plain.sessions.middleware.SessionMiddleware",  # <--
     "plain.middleware.common.CommonMiddleware",
     "plain.csrf.middleware.CsrfViewMiddleware",

diff --git a/plain-auth/plain/auth/README.md b/plain-auth/plain/auth/README.md
@@ -22,7 +22,6 @@ INSTALLED_PACKAGES = [
 
 MIDDLEWARE = [
     "plain.middleware.security.SecurityMiddleware",
-    "plain.assets.whitenoise.middleware.WhiteNoiseMiddleware",
     "plain.sessions.middleware.SessionMiddleware",  # <--
     "plain.middleware.common.CommonMiddleware",
     "plain.csrf.middleware.CsrfViewMiddleware",

diff --git a/plain-auth/poetry.lock b/plain-auth/poetry.lock
diff --git a/plain-auth/pyproject.toml b/plain-auth/pyproject.toml
@@ -3,17 +3,19 @@ name = "plain.auth"
 packages = [
     { include = "plain" },
 ]
-version = "0.1.0"
+version = "0.2.0"
 description = "User authentication and authorization for Plain."
 authors = ["Dave Gaeddert <[email protected]>"]
 # readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.11"
+plain = "<1.0.0"
 "plain.models" = "<1.0.0"
 "plain.sessions" = "<1.0.0"
 
 [tool.poetry.group.dev.dependencies]
+plain = { path = "../plain", develop = true }
 "plain.models" = { path = "../plain-models", develop = true }
 "plain.sessions" = { path = "../plain-sessions", develop = true }
 

diff --git a/plain-cache/plain/cache/migrations/0001_initial.py b/plain-cache/plain/cache/migrations/0001_initial.py
@@ -18,7 +18,6 @@ class Migration(migrations.Migration):
                     models.BigAutoField(
                         auto_created=True,
                         primary_key=True,
-                        serialize=False,
                     ),
                 ),
                 ("key", models.CharField(max_length=255, unique=True)),