From 74c8614ec841abbb8602ccc260c6f33f174e3401 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
<66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 19:29:03 +0000
Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
updates:
- [github.com/psf/black: 23.12.1 → 24.1.1](https://github.com/psf/black/compare/23.12.1...24.1.1)
- [github.com/astral-sh/ruff-pre-commit: v0.1.9 → v0.2.0](https://github.com/astral-sh/ruff-pre-commit/compare/v0.1.9...v0.2.0)
---
.pre-commit-config.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ccda1916e6..2427219a8e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -51,13 +51,13 @@ repos:
# python
- repo: https://github.com/psf/black
- rev: 23.12.1
+ rev: 24.1.1
hooks:
- id: black
args: ["--line-length=88", "--exclude=/src/_nebari/template/"]
- repo: https://github.com/astral-sh/ruff-pre-commit
- rev: v0.1.9
+ rev: v0.2.0
hooks:
- id: ruff
args: ["--fix"]
From ddbc6cc288a911ab02d66d33a15137edc28b77a5 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
<66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 19:29:12 +0000
Subject: [PATCH 2/2] [pre-commit.ci] Apply automatic pre-commit fixes
---
.../stages/kubernetes_ingress/__init__.py | 6 ++---
.../stages/kubernetes_services/__init__.py | 8 +++++--
.../files/jupyterhub/03-profiles.py | 22 +++++++++++--------
3 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/_nebari/stages/kubernetes_ingress/__init__.py b/src/_nebari/stages/kubernetes_ingress/__init__.py
index 2c55e0cae9..13cf3f9bfc 100644
--- a/src/_nebari/stages/kubernetes_ingress/__init__.py
+++ b/src/_nebari/stages/kubernetes_ingress/__init__.py
@@ -181,9 +181,9 @@ def input_vars(self, stage_outputs: Dict[str, Dict[str, Any]]):
cert_details["acme-email"] = self.config.certificate.acme_email
cert_details["acme-server"] = self.config.certificate.acme_server
elif cert_type == "existing":
- cert_details[
- "certificate-secret-name"
- ] = self.config.certificate.secret_name
+ cert_details["certificate-secret-name"] = (
+ self.config.certificate.secret_name
+ )
return {
**{
diff --git a/src/_nebari/stages/kubernetes_services/__init__.py b/src/_nebari/stages/kubernetes_services/__init__.py
index bde7163744..5e91d63d4c 100644
--- a/src/_nebari/stages/kubernetes_services/__init__.py
+++ b/src/_nebari/stages/kubernetes_services/__init__.py
@@ -51,8 +51,12 @@ class Storage(schema.Base):
class JupyterHubTheme(schema.Base):
hub_title: str = "Nebari"
hub_subtitle: str = "Your open source data science platform"
- welcome: str = """Welcome! Learn about Nebari's features and configurations in the documentation. If you have any questions or feedback, reach the team on Nebari's support forums."""
- logo: str = "https://raw.githubusercontent.com/nebari-dev/nebari-design/main/logo-mark/horizontal/Nebari-Logo-Horizontal-Lockup-White-text.svg"
+ welcome: str = (
+ """Welcome! Learn about Nebari's features and configurations in the documentation. If you have any questions or feedback, reach the team on Nebari's support forums."""
+ )
+ logo: str = (
+ "https://raw.githubusercontent.com/nebari-dev/nebari-design/main/logo-mark/horizontal/Nebari-Logo-Horizontal-Lockup-White-text.svg"
+ )
primary_color: str = "#4f4173"
primary_color_dark: str = "#4f4173"
secondary_color: str = "#957da6"
diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterhub/03-profiles.py b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterhub/03-profiles.py
index 06aa97287a..50d527b863 100644
--- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterhub/03-profiles.py
+++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterhub/03-profiles.py
@@ -208,12 +208,14 @@ def base_profile_extra_mounts():
extra_pod_config = {
"volumes": [
- {
- "name": volume["name"],
- "persistentVolumeClaim": {"claimName": volume["name"]},
- }
- if volume["kind"] == "persistentvolumeclaim"
- else {"name": volume["name"], "configMap": {"name": volume["name"]}}
+ (
+ {
+ "name": volume["name"],
+ "persistentVolumeClaim": {"claimName": volume["name"]},
+ }
+ if volume["kind"] == "persistentvolumeclaim"
+ else {"name": volume["name"], "configMap": {"name": volume["name"]}}
+ )
for mount_path, volume in extra_mounts.items()
]
}
@@ -367,9 +369,11 @@ def configure_user(username, groups, uid=1000, gid=100):
# mount the shared directories for user only if there are
# shared folders (groups) that the user is a member of
# else ensure that the `shared` folder symlink does not exist
- f"ln -sfn /shared /home/{username}/shared"
- if groups
- else f"rm -f /home/{username}/shared",
+ (
+ f"ln -sfn /shared /home/{username}/shared"
+ if groups
+ else f"rm -f /home/{username}/shared"
+ ),
# conda-store environment configuration
f"printf '{condarc}' > /home/{username}/.condarc",
# jupyter configuration