Merge branch 'master' into release

Author: gi0baro

.github/workflows/tests.yml

@@ -44,7 +44,7 @@ jobs:
         poetry run pytest -v tests
 
   MacOS:
-    runs-on: macos-latest
+    runs-on: macos-13
     strategy:
       matrix:
         python-version: [3.8, 3.9, '3.10', '3.11', '3.12']

emmett/__version__.py

@@ -1 +1 @@
-__version__ = "2.5.9"
+__version__ = "2.5.10"

emmett/orm/migrations/commands.py

@@ -122,13 +122,13 @@ def _store_current_revision_(self, ctx, source, dest):
         }
         source = to_tuple(source)
         dest = to_tuple(dest)
-        if source is None:
+        if not source and dest:
             _store_logs['new'](dest[0])
             ctx.db.Schema.insert(version=dest[0])
             ctx.db.commit()
             ctx._current_revision_ = [dest[0]]
             return
-        if dest is None:
+        if not dest and source:
             _store_logs['del'](source[0])
             ctx.db(ctx.db.Schema.version == source[0]).delete()
             ctx.db.commit()

pyproject.toml

@@ -3,7 +3,7 @@ name = "emmett"
 
 [tool.poetry]
 name = "emmett"
-version = "2.5.9"
+version = "2.5.10"
 description = "The web framework for inventors"
 authors = ["Giovanni Barillari <gi0baro@d4net.org>"]
 license = "BSD-3-Clause"
@@ -47,16 +47,16 @@ emmett = "emmett.cli:main"
 [tool.poetry.dependencies]
 python = "^3.8"
 click = ">=6.0"
-granian = "~1.0.2"
-emmett-crypto = "^0.5"
+granian = "~1.3.1"
+emmett-crypto = "^0.6"
 pendulum = "~3.0.0"
 pyDAL = "17.3"
 python-rapidjson = "^1.14"
 pyyaml = "^6.0"
 renoir = "^1.6"
 severus = "^1.1"
 
-orjson = { version = "~3.9", optional = true }
+orjson = { version = "~3.10", optional = true }
 
 uvicorn = { version = "^0.19.0", optional = true }
 h11 = { version = ">= 0.12.0", optional = true }