diff --git a/README.md b/README.md index f90ccd2..16535b2 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ mypy -p kaya.core mypy -p kaya.rsgi mypy -p kaya.session mypy -p kaya.session_redis -mypy -p kaya.session_memcache +mypy -p kaya.session.memcache mypy -p kaya.oidc ``` diff --git a/packages/kaya-session-memcache/README.md b/packages/kaya-session-memcache/README.md index cf27c23..cb363b9 100644 --- a/packages/kaya-session-memcache/README.md +++ b/packages/kaya-session-memcache/README.md @@ -13,7 +13,7 @@ import aiomcache from kaya.core import KayaApp, HttpContext from kaya.session import SessionMixin -from kaya.session_memcache import MemcacheSessionStore +from kaya.session.memcache import MemcacheSessionStore client = aiomcache.Client('127.0.0.1', 11211) session = SessionMixin(MemcacheSessionStore(client)) diff --git a/packages/kaya-session-memcache/pyproject.toml b/packages/kaya-session-memcache/pyproject.toml index cb6076f..6b56d5f 100644 --- a/packages/kaya-session-memcache/pyproject.toml +++ b/packages/kaya-session-memcache/pyproject.toml @@ -51,7 +51,7 @@ strict = true [tool.setuptools_scm] root = "../.." -version_file = "src/kaya/session_memcache/_version.py" +version_file = "src/kaya/session/memcache/_version.py" [tool.setuptools_scm.tag] prefix = "release/" diff --git a/packages/kaya-session-memcache/src/kaya/session_memcache/__init__.py b/packages/kaya-session-memcache/src/kaya/session/memcache/__init__.py similarity index 100% rename from packages/kaya-session-memcache/src/kaya/session_memcache/__init__.py rename to packages/kaya-session-memcache/src/kaya/session/memcache/__init__.py diff --git a/packages/kaya-session-memcache/src/kaya/session_memcache/_store.py b/packages/kaya-session-memcache/src/kaya/session/memcache/_store.py similarity index 100% rename from packages/kaya-session-memcache/src/kaya/session_memcache/_store.py rename to packages/kaya-session-memcache/src/kaya/session/memcache/_store.py diff --git a/packages/kaya-session-memcache/src/kaya/session_memcache/py.typed b/packages/kaya-session-memcache/src/kaya/session/memcache/py.typed similarity index 100% rename from packages/kaya-session-memcache/src/kaya/session_memcache/py.typed rename to packages/kaya-session-memcache/src/kaya/session/memcache/py.typed diff --git a/packages/kaya-session-memcache/tests/test_store.py b/packages/kaya-session-memcache/tests/test_store.py index 74ad9ed..9f07482 100644 --- a/packages/kaya-session-memcache/tests/test_store.py +++ b/packages/kaya-session-memcache/tests/test_store.py @@ -7,7 +7,7 @@ from pwo import async_test from kaya.core import KayaApp, HttpContext from kaya.session import Session, SessionMixin -from kaya.session_memcache import MemcacheSessionStore +from kaya.session.memcache import MemcacheSessionStore class FakeClock: diff --git a/packages/kaya-session/src/kaya/session/__init__.py b/packages/kaya-session/src/kaya/session/__init__.py index 21a729c..e302bb4 100644 --- a/packages/kaya-session/src/kaya/session/__init__.py +++ b/packages/kaya-session/src/kaya/session/__init__.py @@ -1,3 +1,7 @@ +from pkgutil import extend_path + +__path__ = extend_path(__path__, __name__) + from ._mixin import SessionMixin from ._session import Session from ._store import InMemorySessionStore, SessionStore