ssb-project-cli 1.7.2__tar.gz → 1.8.0__tar.gz

{ssb_project_cli-1.7.2 → ssb_project_cli-1.8.0}/PKG-INFO

@@ -1,28 +1,29 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: ssb-project-cli
-Version: 1.7.2
+Version: 1.8.0
 Summary: SSB Project CLI
-License: MIT
+License-Expression: MIT
+License-File: LICENSE
 Author: Statistics Norway
 Author-email: stat-dev@ssb.no
 Requires-Python: >=3.10
 Classifier: Development Status :: 4 - Beta
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: cruft (>=2.11.1)
-Requires-Dist: gitpython (>=3.1.27)
+Requires-Dist: gitpython (>=3.1.59)
 Requires-Dist: ipykernel (>=6.25.2)
 Requires-Dist: jupyter-client (>=8.3.1)
-Requires-Dist: kvakk-git-tools (>=2.5.1)
+Requires-Dist: kvakk-git-tools (>=2.6.1)
 Requires-Dist: poetry (>=2.0)
 Requires-Dist: psutil (>=5.9.4)
 Requires-Dist: pygithub (>=1.55)
 Requires-Dist: questionary (>=1.10.0)
-Requires-Dist: requests (>=2.32.3)
+Requires-Dist: requests (>=2.33.0)
 Requires-Dist: rich (>=12.5.1)
 Requires-Dist: tomli (>=2.0.1)
 Requires-Dist: typer (==0.19.2)

{ssb_project_cli-1.7.2 → ssb_project_cli-1.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ssb-project-cli"
-version = "1.7.2"
+version = "1.8.0"
 requires-python = ">=3.10"
 description = "SSB Project CLI"
 license = "MIT"
@@ -9,14 +9,14 @@ readme = "README.md"
 authors = [{ name = "Statistics Norway", email = "stat-dev@ssb.no" }]
 dependencies = [
     'typer (==0.19.2)',
-    'gitpython (>=3.1.27)',
+    'gitpython (>=3.1.59)',
     'pygithub (>=1.55)',
     'cruft (>=2.11.1)',
     'rich (>=12.5.1)',
-    'requests (>=2.32.3)',
+    'requests (>=2.33.0)',
     'questionary (>=1.10.0)',
     'psutil (>=5.9.4)',
-    'kvakk-git-tools (>=2.5.1)',
+    'kvakk-git-tools (>=2.6.1)',
     'poetry (>=2.0)',
     'jupyter-client (>=8.3.1)',
     'ipykernel (>=6.25.2)',      # Run as a module, not imported in code
@@ -41,8 +41,8 @@ ssb-project = "ssb_project_cli.__main__:main"
 python = ">=3.10,<4.0"
 
 [tool.poetry.group.dev.dependencies]
-pygments = ">=2.10.0"
-black = ">=24.4.2"
+pygments = ">=2.20.0"
+black = ">=26.3.1"
 coverage = { extras = ["toml"], version = ">=6.2" }
 darglint = ">=1.8.1"
 flake8 = ">=4.0.1"
@@ -55,7 +55,7 @@ mypy = ">=0.930"
 pep8-naming = ">=0.12.1"
 pre-commit = ">=2.16.0"
 pre-commit-hooks = ">=4.1.0"
-pytest = ">=7.2.0"
+pytest = ">=9.0.3"
 pyupgrade = ">=2.29.1"
 typeguard = ">=2.13.3"
 types-urllib3 = ">=1.26.25.10"
@@ -70,8 +70,8 @@ nox = ">=2025.02.09"
 nox-poetry = ">=1.1.0"
 tomli-w = ">=1.0.0"
 bandit = ">=1.7.9"
-cryptography = ">=42.0.8"
-idna = ">=3.7"
+cryptography = ">=50.0.0"
+idna = ">=3.15"
 deptry = "^0.23.1"
 
 [tool.poetry.group.docs.dependencies]
@@ -81,7 +81,7 @@ mkdocstrings-python = ">=1.3.0"
 mkdocstrings = "*"
 mkdocs-literate-nav = ">=0.5.0"
 mkdocs-section-index = ">=0.3.4"
-mkdocs-material = ">=9.5.27"
+mkdocs-material = ">=9.7.7"
 mkdocs-gen-files = ">=0.4.0"
 sphinx = ">=4.3.2"
 sphinx-autobuild = ">=2021.3.14"
@@ -112,7 +112,6 @@ fail_under = 80
 [tool.isort]
 profile = "black"
 force_single_line = true
-lines_after_imports = 2
 
 [tool.mypy]
 strict = true

{ssb_project_cli-1.7.2 → ssb_project_cli-1.8.0}/src/ssb_project_cli/ssb_project/__init__.py

@@ -2,7 +2,6 @@
 
 from questionary import Style
 
-
 prompt_autocomplete_style = Style(
     [
         ("answer", "fg:#000000 bold"),  # submitted answer text behind the question

{ssb_project_cli-1.7.2 → ssb_project_cli-1.8.0}/src/ssb_project_cli/ssb_project/app.py

@@ -21,7 +21,6 @@ from .settings import STAT_TEMPLATE_DEFAULT_REFERENCE
 from .settings import STAT_TEMPLATE_REPO_URL
 from .util import handle_no_kernel_argument
 
-
 # Don't print with color, it's difficult to read when run in Jupyter
 rich_utils.STYLE_OPTION = ""
 rich_utils.STYLE_SWITCH = ""

{ssb_project_cli-1.7.2 → ssb_project_cli-1.8.0}/src/ssb_project_cli/ssb_project/build/build.py

@@ -8,7 +8,7 @@ from pathlib import Path
 from typing import List
 from ..util import try_if_file_exists
 
-import kvakk_git_tools  # type: ignore
+import kvakk_git_tools
 from rich import print
 
 from ssb_project_cli.ssb_project.util import (
@@ -76,24 +76,24 @@ def validate_and_fix_git_config(
         project_root: The root directory of the project/repo.
     """
     valid_global_git_config: bool = try_if_file_exists(
-        lambda: kvakk_git_tools.validate_git_config()
+        lambda: kvakk_git_tools.validate_git_config()  # type: ignore[attr-defined]
     ).get_or_else(False)
     valid_project_git_files: bool = try_if_file_exists(
-        lambda: kvakk_git_tools.validate_local_git_files(cwd=Path(str(project_root)))
+        lambda: kvakk_git_tools.validate_local_git_files(  # type: ignore[attr-defined]
+            cwd=Path(str(project_root))
+        )
     ).get_or_else(False)
 
     if not (valid_global_git_config and valid_project_git_files):
 
-        print(
-            f"""
+        print(f"""
             :x:    Your project's Git configuration does not follow SSB recommendations,
             :x:    which may result in sensitive data being pushed to GitHub.
 
                 Git file validation status:
             {":white_check_mark:" if valid_global_git_config else ":x:"}      - Global .gitconfig file
             {":white_check_mark:" if valid_project_git_files else ":x:"}      - Project .gitignore and .gitattributes files
-            """
-        )
+            """)
         confirm_fix_ssb_git_config(
             project_name,
             template_repo_url,

{ssb_project_cli-1.7.2 → ssb_project_cli-1.8.0}/src/ssb_project_cli/ssb_project/build/environment.py

@@ -1,7 +1,7 @@
 """This module reads in environment variables."""
 
 import os
-from kvakk_git_tools import ssb_gitconfig  # type: ignore
+from kvakk_git_tools import ssb_gitconfig
 from rich import print
 
 JUPYTER_IMAGE_SPEC = os.environ.get("JUPYTER_IMAGE_SPEC", "")
@@ -32,7 +32,7 @@ def reset_global_gitconfig() -> None:
     try:
         ssb_gitconfig.main(test=False)
     except SystemExit:
-        platform = ssb_gitconfig.Platform()
+        platform = ssb_gitconfig.Platform()  # type: ignore[no-untyped-call]
         is_supported_bools = ("is", "is not")
         print(
             f"\n:x:\tYour global gitconfig was not fixed, your platform {is_supported_bools[platform.is_unsupported()]} supported."

{ssb_project_cli-1.7.2 → ssb_project_cli-1.8.0}/src/ssb_project_cli/ssb_project/build/poetry.py

@@ -4,15 +4,22 @@ import os
 from pathlib import Path
 
 from rich import print
-from rich.progress import Progress, SpinnerColumn, TextColumn
+from rich.progress import Progress
+from rich.progress import SpinnerColumn
+from rich.progress import TextColumn
 
 from ssb_project_cli.ssb_project.util import execute_command
 
-from .environment import (
-    JUPYTER_IMAGE_SPEC,
-    NEXUS_SOURCE_NAME,
-    running_onprem,
-)
+from .environment import JUPYTER_IMAGE_SPEC
+from .environment import NEXUS_SOURCE_NAME
+from .environment import running_onprem
+
+
+def poetry_environment() -> dict[str, str]:
+    """Return an environment where Poetry can create the project's own venv."""
+    env = os.environ.copy()
+    env.pop("VIRTUAL_ENV", None)
+    return env
 
 
 def poetry_install(project_directory: Path) -> None:
@@ -37,6 +44,7 @@ def poetry_install(project_directory: Path) -> None:
             ":white_check_mark:\tInstalled dependencies in the virtual environment",
             "Error: Something went wrong when installing packages with Poetry.",
             project_directory,
+            env=poetry_environment(),
         )
 
 
@@ -195,6 +203,7 @@ def install_ipykernel(project_directory: Path, project_name: str) -> None:
             f":white_check_mark:\tInstalled Jupyter Kernel ({project_name})",
             "Something went wrong while installing ipykernel.",
             project_directory,
+            env=poetry_environment(),
         )
 
 

{ssb_project_cli-1.7.2 → ssb_project_cli-1.8.0}/src/ssb_project_cli/ssb_project/settings.py

@@ -3,11 +3,10 @@
 import os
 from pathlib import Path
 
-
 GITHUB_ORG_NAME = "statisticsnorway"
 HOME_PATH = Path.home()
 CURRENT_WORKING_DIRECTORY = Path.cwd()
 STAT_TEMPLATE_REPO_URL = "https://github.com/statisticsnorway/ssb-project-template-stat"
 STAT_TEMPLATE_DEFAULT_REFERENCE = os.environ.get(
-    "STAT_TEMPLATE_DEFAULT_REFERENCE", "1.4.0"
+    "STAT_TEMPLATE_DEFAULT_REFERENCE", "1.8.0"
 )

{ssb_project_cli-1.7.2 → ssb_project_cli-1.8.0}/src/ssb_project_cli/ssb_project/util.py

@@ -20,7 +20,6 @@ from rich import print
 
 from .settings import HOME_PATH
 
-
 kernelspec_manager = jupyter_client.kernelspec.KernelSpecManager()
 
 T = TypeVar("T")
@@ -136,6 +135,7 @@ def execute_command(
     success_desc: Optional[str] = None,
     failure_desc: Optional[str] = None,
     cwd: Optional[Path] = None,
+    env: Optional[dict[str, str]] = None,
 ) -> subprocess.CompletedProcess[bytes]:
     """Execute command and handle failure/success cases.
 
@@ -145,6 +145,7 @@ def execute_command(
         success_desc: For example: "Poetry install ran successfully".
         failure_desc: For example: "Something went wrong while running poetry install".
         cwd: The current working directory.
+        env: Environment variables for the command.
 
     Returns:
         The result of the subprocess.
@@ -155,6 +156,7 @@ def execute_command(
         command,
         capture_output=True,
         cwd=cwd,
+        env=env,
     )
 
     if result.returncode != 0:
@@ -253,12 +255,10 @@ def handle_no_kernel_argument(no_kernel: bool) -> bool:
     if env_var_no_kernel is None:  # handle NO_KERNEL is undefined case
         return False
     elif env_var_no_kernel not in ["True", "False"]:
-        print(
-            f"""
+        print(f"""
               The value of the 'NO_KERNEL' environment variable is {os.environ["NO_KERNEL"]}.
               The only valid values are True and False.
-            """
-        )
+            """)
         exit(1)
     else:
         return bool(env_var_no_kernel)