Merge pull request #174 from mekanix/cleanup

Cleanup

Author: mekanix

bin/common.sh

@@ -8,7 +8,7 @@ export VIRTUALENV=${VIRTUALENV:="${app_name}"}
 export FREENIT_ENV=${FREENIT_ENV:="prod"}
 export SYSPKG=${SYSPKG:="no"}
 export SYSPKG=`echo ${SYSPKG} | tr '[:lower:]' '[:upper:]'`
-export DB_TYPE=${DB_TYPE:="ormar"}
+export DB_TYPE=${DB_TYPE:="sql"}
 export PIP_INSTALL="pip install -U --upgrade-strategy eager"
 export OFFLINE=${OFFLINE:="no"}
 
@@ -27,7 +27,7 @@ setup() {
     fi
   fi
 
-  if [ "${DB_TYPE}" = "ormar" ]; then
+  if [ "${DB_TYPE}" = "sql" ]; then
     if [ ! -e "alembic/versions" ]; then
       mkdir alembic/versions
       alembic revision --autogenerate -m initial

freenit/config.py

@@ -2,16 +2,22 @@
 
 try:
     from .local_config import DevConfig
+except ModuleNotFoundError:
+    from .base_config import DevConfig
 except ImportError:
     from .base_config import DevConfig
 
 try:
     from .local_config import TestConfig
+except ModuleNotFoundError:
+    from .base_config import TestConfig
 except ImportError:
     from .base_config import TestConfig
 
 try:
     from .local_config import ProdConfig
+except ModuleNotFoundError:
+    from .base_config import ProdConfig
 except ImportError:
     from .base_config import ProdConfig
 

freenit/project/pyproject.toml

@@ -11,7 +11,7 @@ license = {file = "LICENSE"}
 requires-python = ">=3.8"
 dependencies = [
   "aiosqlite",
-  "freenit[ormar]",
+  "freenit[sql]",
 ]
 authors = [
   {name = "John Doe", email = "john@doe.com"},
@@ -25,10 +25,10 @@ classifiers = [
 ]
 
 [project.optional-dependencies]
-  beanie = ["freenit[beanie]"]
+  mongo = ["freenit[mongo]"]
   dev = ["freenit[dev]"]
   ldap = ["freenit[ldap]"]
-  ormar = ["freenit[ormar]"]
+  sql = ["freenit[sql]"]
   test = ["freenit[test]"]
 
 [project.urls]

pyproject.toml

@@ -28,7 +28,7 @@ classifiers = [
 ]
 
 [project.optional-dependencies]
-  beanie = ["beanie"]
+  mongo = ["beanie"]
   dev = [
     "aiosqlite",
     "ruff",
@@ -41,9 +41,9 @@ classifiers = [
   ]
   build = ["twine"]
   ldap = ["bonsai"]
-  ormar = [
+  sql = [
     "alembic",
-    "ormar",
+    "sql",
   ]
   test = [
     "aiosqlite",