chore: rename to datalayer_core

datalayer · Aug 13, 2024 · eb308b2 · eb308b2
1 parent 3864643
commit eb308b2
Show file tree

Hide file tree

Showing 69 changed files with 197 additions and 149 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,12 +7,12 @@ node_modules/
 *.egg-info/
 .ipynb_checkpoints
 *.tsbuildinfo
-datalayer/labextension
+datalayer_core/labextension
 # Version file is handled by hatchling
 datalayer/_version.py
 
-datalayer/static/*.js
-datalayer/static/*.css
+datalayer_core/static/*.js
+datalayer_core/static/*.css
 
 coverage
 

diff --git a/.licenserc.yaml b/.licenserc.yaml
@@ -0,0 +1,49 @@
+header:
+  license:
+    spdx-id: Datalayer
+    copyright-owner: Datalayer, Inc.
+    copyright-year: 2023-2024
+    content: |
+      Copyright (c) [year] [owner]
+
+      Datalayer License
+
+  paths-ignore:
+    - '**/*.apt'
+    - '**/*.cedar'
+    - '**/*.dash'
+    - '**/*.fga'
+    - '**/*.ipynb'
+    - '**/*.j2'
+    - '**/*.json'
+    - '**/*.mamba'
+    - '**/*.md'
+    - '**/*.mod'
+    - '**/*.nblink'
+    - '**/*.rego'
+    - '**/*.sum'
+    - '**/*.svg'
+    - '**/*.template'
+    - '**/*.tsbuildinfo'
+    - '**/*.txt'
+    - '**/*.yaml'
+    - '**/*.yml'
+    - '**/*_key'
+    - '**/*_key.pub'
+    - '**/.*'
+    - '**/LICENSE.txt'
+    - '**/MANIFEST.in'
+    - '**/build'
+    - '**/lib'
+    - '**/node_modules'
+    - '**/schemas'
+    - '**/ssh/*'
+    - '**/static'
+    - '**/themes'
+    - '**/typings'
+    - '**/*.patch'
+    - '**/*.bundle.js'
+    - '**/*.map.js'
+    - 'LICENSE'
+
+  comment: on-failure
diff --git a/README.md b/README.md
@@ -2,11 +2,9 @@
 
 [![Become a Sponsor](https://img.shields.io/static/v1?label=Become%20a%20Sponsor&message=%E2%9D%A4&logo=GitHub&style=flat&color=1ABC9C)](https://github.com/sponsors/datalayer)
 
-# Ξ Datalayer
+# Ξ Datalayer Core
 
-> Datalayer core.
-
-Datalayer is the base foundation package used by many other Datalayer packages. It contains base application classes and configuration inherited by other projects.
+Datalayer Core is the base foundation package used by many other Datalayer packages. It contains base application classes and configuration inherited by other projects.
 
 It is also the meta package to get the other Datalayer packages installed.
 

diff --git a/conftest.py b/conftest.py
@@ -5,4 +5,4 @@
 
 @pytest.fixture
 def jp_server_config(jp_server_config):
-    return {"ServerApp": {"jpserver_extensions": {"datalayer": True}}}
+    return {"ServerApp": {"jpserver_extensions": {"datalayer_core": True}}}
diff --git a/datalayer/static/README.md b/datalayer/static/README.md
diff --git a/datalayer/tests/__init__.py b/datalayer/tests/__init__.py
diff --git a/datalayer/__init__.py → datalayer_core/__init__.py b/datalayer/__init__.py → datalayer_core/__init__.py
@@ -1,7 +1,7 @@
 from typing import Any, Dict, List
 
-from datalayer._version import __version__
-from datalayer.serverapplication import DatalayerExtensionApp
+from datalayer_core._version import __version__
+from datalayer_core.serverapplication import DatalayerExtensionApp
 
 try:
     from .lab import DatalayerLabApp
@@ -12,11 +12,11 @@
 
 def _jupyter_server_extension_points() -> List[Dict[str, Any]]:
     return [{
-        "module": "datalayer",
+        "module": "datalayer_core",
         "app": DatalayerExtensionApp,
     },
     {
-        "module": "datalayer",
+        "module": "datalayer_core",
         "app": DatalayerLabApp,
     }]
 

diff --git a/datalayer/__main__.py → datalayer_core/__main__.py b/datalayer/__main__.py → datalayer_core/__main__.py
@@ -1,6 +1,6 @@
 """The main for Datalayer."""
 
-from datalayer.serverapplication import main
+from datalayer_core.serverapplication import main
 
 if __name__ == "__main__":
     main()
diff --git a/datalayer_core/_version.py b/datalayer_core/_version.py
@@ -0,0 +1,4 @@
+# This file is auto-generated by Hatchling. As such, do not:
+#   - modify
+#   - track in version control e.g. be sure to add to .gitignore
+__version__ = VERSION = '1.1.2'
diff --git a/datalayer/about/about.md → datalayer_core/about/about.md b/datalayer/about/about.md → datalayer_core/about/about.md
diff --git a/datalayer/about/aboutapp.py → datalayer_core/about/aboutapp.py b/datalayer/about/aboutapp.py → datalayer_core/about/aboutapp.py
@@ -3,11 +3,11 @@
 
 from pathlib import Path
 
-from datalayer.application import NoStart
+from datalayer_core.application import NoStart
 from rich.console import Console
 from rich.markdown import Markdown
 
-from datalayer.cli.base import DatalayerCLIBaseApp
+from datalayer_core.cli.base import DatalayerCLIBaseApp
 
 
 HERE = Path(__file__).parent

diff --git a/datalayer/application.py → datalayer_core/application.py b/datalayer/application.py → datalayer_core/application.py
@@ -66,7 +66,7 @@ class NoStart(Exception):  # noqa
 class DatalayerApp(Application):
     """Base class for Datalayer applications"""
 
-    name = "datalayer"  # override in subclasses
+    name = "datalayer_core"  # override in subclasses
     description = "A Datalayer Application"
 
     aliases = base_aliases

diff --git a/datalayer/authn/__init__.py → datalayer_core/authn/__init__.py b/datalayer/authn/__init__.py → datalayer_core/authn/__init__.py
diff --git a/datalayer/authn/__main__.py → datalayer_core/authn/__main__.py b/datalayer/authn/__main__.py → datalayer_core/authn/__main__.py
@@ -5,7 +5,7 @@
 
 import logging
 
-from datalayer.authn.http_server import get_token
+from datalayer_core.authn.http_server import get_token
 
 
 logging.basicConfig(level=logging.INFO)

diff --git a/datalayer/authn/apps/__init__.py → datalayer_core/authn/apps/__init__.py b/datalayer/authn/apps/__init__.py → datalayer_core/authn/apps/__init__.py
diff --git a/datalayer/authn/apps/loginapp.py → datalayer_core/authn/apps/loginapp.py b/datalayer/authn/apps/loginapp.py → datalayer_core/authn/apps/loginapp.py
@@ -3,7 +3,7 @@
 
 import warnings
 
-from datalayer.cli.base import DatalayerCLIBaseApp
+from datalayer_core.cli.base import DatalayerCLIBaseApp
 
 
 class DatalayerLoginApp(DatalayerCLIBaseApp):

diff --git a/datalayer/authn/apps/logoutapp.py → datalayer_core/authn/apps/logoutapp.py b/datalayer/authn/apps/logoutapp.py → datalayer_core/authn/apps/logoutapp.py
@@ -3,7 +3,7 @@
 
 import warnings
 
-from datalayer.cli.base import DatalayerCLIBaseApp
+from datalayer_core.cli.base import DatalayerCLIBaseApp
 
 
 class DatalayerLogoutApp(DatalayerCLIBaseApp):

diff --git a/datalayer/authn/apps/whoamiapp.py → datalayer_core/authn/apps/whoamiapp.py b/datalayer/authn/apps/whoamiapp.py → datalayer_core/authn/apps/whoamiapp.py
@@ -3,7 +3,7 @@
 
 import warnings
 
-from datalayer.cli.base import DatalayerCLIBaseApp
+from datalayer_core.cli.base import DatalayerCLIBaseApp
 from ...kernels.utils import display_me
 
 

diff --git a/datalayer/authn/http_server.py → datalayer_core/authn/http_server.py b/datalayer/authn/http_server.py → datalayer_core/authn/http_server.py
@@ -18,17 +18,17 @@
 from pathlib import Path
 from socketserver import BaseRequestHandler
 
-from datalayer.authn.state import set_server_port
-from datalayer.authn.keys import (
+from datalayer_core.authn.state import set_server_port
+from datalayer_core.authn.keys import (
     DATALAYER_IAM_TOKEN_KEY, DATALAYER_IAM_USER_KEY
 )
-from datalayer.authn.pages import (
+from datalayer_core.authn.pages import (
     LANDING_PAGE, AUTH_SUCCESS_PAGE, OAUTH_ERROR_PAGE
 )
 
-from datalayer.utils.utils import find_http_port
-from datalayer.serverapplication import launch_new_instance
-from datalayer._version import __version__
+from datalayer_core.utils.utils import find_http_port
+from datalayer_core.serverapplication import launch_new_instance
+from datalayer_core._version import __version__
 
 
 HERE = Path(__file__).parent

diff --git a/datalayer/authn/keys.py → datalayer_core/authn/keys.py b/datalayer/authn/keys.py → datalayer_core/authn/keys.py
diff --git a/datalayer/authn/pages.py → datalayer_core/authn/pages.py b/datalayer/authn/pages.py → datalayer_core/authn/pages.py
@@ -13,7 +13,7 @@
       {config}
     </script>
     <link rel="shortcut icon" href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAC7SURBVFiF7ZU9CgIxEIXfTHbPopfYc+pJ9AALtmJnZSOIoJWFoCTzLHazxh/Ebpt5EPIxM8XXTCKTxYyMCYwJFhOYCo4JFiMuu317PZwaqEBUIar4YMmskL73DytGjgu4gAt4PDJdzkkzMBloBhqBgcu69XW+1I+rNSQESNDuaMEhdP/Fj/7oW+ACLuACHk/3F5BAfuMLBjm8/ZnxNvNtHmY4b7Ztut0bqStoVSHfWj9Z6mr8LXABF3CBB3nvkDfEVN6PAAAAAElFTkSuQmCC" type="image/x-icon" />
-    <script defer src="/main.datalayer.js"></script>
+    <script defer src="/main.datalayer-core.js"></script>
   </head>
   <body>
   </body>

diff --git a/datalayer/authn/state.py → datalayer_core/authn/state.py b/datalayer/authn/state.py → datalayer_core/authn/state.py
diff --git a/datalayer/cli/__init__.py → datalayer_core/cli/__init__.py b/datalayer/cli/__init__.py → datalayer_core/cli/__init__.py
diff --git a/datalayer/cli/base.py → datalayer_core/cli/base.py b/datalayer/cli/base.py → datalayer_core/cli/base.py
@@ -15,13 +15,13 @@
 
 from rich.console import Console
 
-from datalayer.application import DatalayerApp, base_aliases, base_flags
+from datalayer_core.application import DatalayerApp, base_aliases, base_flags
 from traitlets import Bool, Unicode
 
-from datalayer.authn.http_server import get_token, USE_JUPYTER_SERVER
-from datalayer.utils.utils import fetch, find_http_port
+from datalayer_core.authn.http_server import get_token, USE_JUPYTER_SERVER
+from datalayer_core.utils.utils import fetch, find_http_port
 
-from datalayer._version import __version__
+from datalayer_core._version import __version__
 
 
 REQUEST_TIMEOUT = 5
@@ -44,7 +44,7 @@
 
 
 class DatalayerCLIBaseApp(DatalayerApp):
-    name = "datalayer"
+    name = "datalayer_core"
 
     version = __version__
 

diff --git a/datalayer/cli/datalayer.py → datalayer_core/cli/datalayer.py b/datalayer/cli/datalayer.py → datalayer_core/cli/datalayer.py
@@ -3,17 +3,17 @@
 
 from pathlib import Path
 
-from datalayer.authn.apps.loginapp import DatalayerLoginApp
-from datalayer.authn.apps.logoutapp import DatalayerLogoutApp
-from datalayer.authn.apps.whoamiapp import KernelWhoamiApp
+from datalayer_core.authn.apps.loginapp import DatalayerLoginApp
+from datalayer_core.authn.apps.logoutapp import DatalayerLogoutApp
+from datalayer_core.authn.apps.whoamiapp import KernelWhoamiApp
 
-from datalayer.about.aboutapp import DatalayerAboutApp
+from datalayer_core.about.aboutapp import DatalayerAboutApp
 
-from datalayer.kernels.kernelsapp import JupyterKernelsApp
+from datalayer_core.kernels.kernelsapp import JupyterKernelsApp
 
-from datalayer.cli.base import DatalayerCLIBaseApp
+from datalayer_core.cli.base import DatalayerCLIBaseApp
 
-from datalayer._version import __version__
+from datalayer_core._version import __version__
 
 
 HERE = Path(__file__).parent

diff --git a/datalayer/command.py → datalayer_core/command.py b/datalayer/command.py → datalayer_core/command.py
@@ -161,7 +161,7 @@ def _path_with_self():
     path_list = (os.environ.get("PATH") or os.defpath).split(os.pathsep)
 
     # Insert the "scripts" directory for this Python installation
-    # This allows the "datalayer" command to be relocated, while still
+    # This allows the "datalayer_core" command to be relocated, while still
     # finding subcommands that have been installed in the default
     # location.
     # We put the scripts directory at the *end* of PATH, so that
@@ -239,7 +239,7 @@ def main() -> None:  # noqa
         if args.version:
             print("Selected Datalayer core packages...")
             for package in [
-                "datalayer",
+                "datalayer_core",
                 "IPython",
                 "ipykernel",
                 "ipywidgets",
@@ -255,7 +255,7 @@ def main() -> None:  # noqa
                 "traitlets",
             ]:
                 try:
-                    if package == "datalayer":  # We're already here
+                    if package == "datalayer_core":  # We're already here
                         version = __version__
                     else:
                         mod = __import__(package)

diff --git a/datalayer/config.py → datalayer_core/config.py b/datalayer/config.py → datalayer_core/config.py
@@ -18,7 +18,7 @@ class DatalayerConfig(DatalayerApp):
 
     def start(self):
         """Start the application."""
-        with open(Path.home() / ".datalayer/datalayer.conf", "rb") as toml:
+        with open(Path.home() / ".datalayer/datalayer_core.conf", "rb") as toml:
             config = tomllib.load(toml)
         self.log.info(config)
         self.log.info(config["title"])

diff --git a/datalayer/handlers/__init__.py → datalayer_core/handlers/__init__.py b/datalayer/handlers/__init__.py → datalayer_core/handlers/__init__.py
diff --git a/datalayer/handlers/base.py → datalayer_core/handlers/base.py b/datalayer/handlers/base.py → datalayer_core/handlers/base.py
diff --git a/datalayer/handlers/config/__init__.py → datalayer_core/handlers/config/__init__.py b/datalayer/handlers/config/__init__.py → datalayer_core/handlers/config/__init__.py
diff --git a/datalayer/handlers/config/handler.py → datalayer_core/handlers/config/handler.py b/datalayer/handlers/config/handler.py → datalayer_core/handlers/config/handler.py
@@ -9,7 +9,7 @@
     ExtensionHandlerMixin,
 )
 
-from datalayer._version import __version__
+from datalayer_core._version import __version__
 
 
 
@@ -22,7 +22,7 @@ def get(self):
         settings = self.settings["datalayer_config"]
         res = json.dumps(
             {
-                "extension": "datalayer",
+                "extension": "datalayer_core",
                 "version": __version__,
                 "settings": dict(
                     run_url=settings.run_url,

diff --git a/datalayer/handlers/index/__init__.py → datalayer_core/handlers/index/__init__.py b/datalayer/handlers/index/__init__.py → datalayer_core/handlers/index/__init__.py
diff --git a/datalayer/handlers/index/handler.py → datalayer_core/handlers/index/handler.py b/datalayer/handlers/index/handler.py → datalayer_core/handlers/index/handler.py
@@ -5,7 +5,7 @@
 
 import tornado
 
-from datalayer.handlers.base import BaseTemplateHandler
+from datalayer_core.handlers.base import BaseTemplateHandler
 
 
 # pylint: disable=W0223

diff --git a/datalayer/handlers/login/__init__.py → datalayer_core/handlers/login/__init__.py b/datalayer/handlers/login/__init__.py → datalayer_core/handlers/login/__init__.py
diff --git a/datalayer/handlers/login/handler.py → datalayer_core/handlers/login/handler.py b/datalayer/handlers/login/handler.py → datalayer_core/handlers/login/handler.py
@@ -9,7 +9,7 @@
 from jupyter_server.base.handlers import APIHandler
 from jupyter_server.extension.handler import ExtensionHandlerMixin
 
-from datalayer._version import __version__
+from datalayer_core._version import __version__
 
 
 # pylint: disable=W0223

diff --git a/datalayer/kernels/__init__.py → datalayer_core/kernels/__init__.py b/datalayer/kernels/__init__.py → datalayer_core/kernels/__init__.py
diff --git a/datalayer/kernels/client.py → datalayer_core/kernels/client.py b/datalayer/kernels/client.py → datalayer_core/kernels/client.py
diff --git a/datalayer/kernels/console/__init__.py → datalayer_core/kernels/console/__init__.py b/datalayer/kernels/console/__init__.py → datalayer_core/kernels/console/__init__.py
diff --git a/datalayer/kernels/console/consoleapp.py → datalayer_core/kernels/console/consoleapp.py b/datalayer/kernels/console/consoleapp.py → datalayer_core/kernels/console/consoleapp.py
@@ -9,7 +9,7 @@
 
 
 from ..._version import __version__
-from datalayer.cli.base import (
+from datalayer_core.cli.base import (
     DatalayerCLIBaseApp,
     datalayer_aliases,
     datalayer_flags,

diff --git a/datalayer/kernels/console/shell.py → datalayer_core/kernels/console/shell.py b/datalayer/kernels/console/shell.py → datalayer_core/kernels/console/shell.py
@@ -14,10 +14,10 @@
 
 class WSTerminalInteractiveShell(ZMQTerminalInteractiveShell):
     manager = Instance(
-        "datalayer.kernels.manager.KernelManager", allow_none=True
+        "datalayer_core.kernels.manager.KernelManager", allow_none=True
     )
     client = Instance(
-        "datalayer.kernels.client.KernelClient", allow_none=True
+        "datalayer_core.kernels.client.KernelClient", allow_none=True
     )
 
     @default("banner")

diff --git a/datalayer/kernels/create/createapp.py → datalayer_core/kernels/create/createapp.py b/datalayer/kernels/create/createapp.py → datalayer_core/kernels/create/createapp.py
@@ -6,7 +6,7 @@
 from rich import print_json
 from traitlets import Dict, Float, Unicode
 
-from datalayer.cli.base import DatalayerCLIBaseApp, datalayer_aliases
+from datalayer_core.cli.base import DatalayerCLIBaseApp, datalayer_aliases
 from ..utils import display_kernels
 
 

diff --git a/datalayer/kernels/envs/envssapp.py → datalayer_core/kernels/envs/envssapp.py b/datalayer/kernels/envs/envssapp.py → datalayer_core/kernels/envs/envssapp.py
@@ -7,7 +7,7 @@
 from rich.console import Console
 from rich.table import Table
 
-from datalayer.cli.base import DatalayerCLIBaseApp
+from datalayer_core.cli.base import DatalayerCLIBaseApp
 
 
 def new_kernel_table():

diff --git a/datalayer/kernels/exec/execapp.py → datalayer_core/kernels/exec/execapp.py b/datalayer/kernels/exec/execapp.py → datalayer_core/kernels/exec/execapp.py
@@ -12,7 +12,7 @@
 
 
 from ..._version import __version__
-from datalayer.cli.base import (
+from datalayer_core.cli.base import (
     DatalayerCLIBaseApp,
     datalayer_aliases,
     datalayer_flags,